diffcore-pickaxe: port optimization from has_changes() to diff_grep()

These two functions are called in the same codeflow to implement
"log -S<block>" and "log -G<pattern>", respectively, but the latter
lacked two obvious optimizations the former implemented, namely:

- When a pickaxe limit is not given at all, they should return
without wasting any cycle;

- When both sides of the filepair are the same, and the same
textconv conversion apply to them, return early, as there will be
no interesting differences between the two anyway.

Also release the filespec data once the processing is done (this is
not about leaking memory--it is about releasing data we finished
looking at as early as possible).

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 26ddf00aa3d8977d9366d1a7ec2b794551c1a5c1..bfaababbe5d836d8b1fa53215bca3c0f405f1ecc 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -83,7 +83,7 @@ static int diff_grep(struct diff_filepair *p, struct diff_options *o,
        mmfile_t mf1, mf2;
        int hit;
 
-       if (diff_unmodified_pair(p))
+       if (!o->pickaxe[0])
                return 0;
 
        if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
@@ -91,6 +91,9 @@ static int diff_grep(struct diff_filepair *p, struct diff_options *o,
                textconv_two = get_textconv(p->two);
        }
 
+       if (textconv_one == textconv_two && diff_unmodified_pair(p))
+               return 0;
+
        mf1.size = fill_textconv(textconv_one, p->one, &mf1.ptr);
        mf2.size = fill_textconv(textconv_two, p->two, &mf2.ptr);
 
@@ -125,6 +128,8 @@ static int diff_grep(struct diff_filepair *p, struct diff_options *o,
                free(mf1.ptr);
        if (textconv_two)
                free(mf2.ptr);
+       diff_free_filespec_data(p->one);
+       diff_free_filespec_data(p->two);
        return hit;
 }