diffcore-rename: guide inexact rename detection based on basenames

Make use of the new find_basename_matches() function added in the last
two patches, to find renames more rapidly in cases where we can match up
files based on basenames.  As a quick reminder (see the last two commit
messages for more details), this means for example that
docs/extensions.txt and docs/config/extensions.txt are considered likely
renames if there are no remaining 'extensions.txt' files elsewhere among
the added and deleted files, and if a similarity check confirms they are
similar, then they are marked as a rename without looking for a better
similarity match among other files.  This is a behavioral change, as
covered in more detail in the previous commit message.

We do not use this heuristic together with either break or copy
detection.  The point of break detection is to say that filename
similarity does not imply file content similarity, and we only want to
know about file content similarity.  The point of copy detection is to
use more resources to check for additional similarities, while this is
an optimization that uses far less resources but which might also result
in finding slightly fewer similarities.  So the idea behind this
optimization goes against both of those features, and will be turned off
for both.

For the testcases mentioned in commit 557ac0350d ("merge-ort: begin
performance work; instrument with trace2_region_* calls", 2020-10-28),
this change improves the performance as follows:

                            Before                  After
    no-renames:       13.815 s ±  0.062 s    13.294 s ±  0.103 s
    mega-renames:   1799.937 s ±  0.493 s   187.248 s ±  0.882 s
    just-one-mega:    51.289 s ±  0.019 s     5.557 s ±  0.017 s

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 266d4fae48c7642f4655d44b407b6d35a41325b9..41558185ae1d940cc74d348a00a00d5e641a5f4c 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -379,7 +379,6 @@ static const char *get_basename(const char *filename)
        return base ? base + 1 : filename;
 }
 
-MAYBE_UNUSED
 static int find_basename_matches(struct diff_options *options,
                                 int minimum_score)
 {
@@ -716,11 +715,55 @@ void diffcore_rename(struct diff_options *options)
        if (minimum_score == MAX_SCORE)
                goto cleanup;
 
-       /* Calculate how many renames are left */
-       num_destinations = (rename_dst_nr - rename_count);
-       remove_unneeded_paths_from_src(want_copies);
        num_sources = rename_src_nr;
 
+       if (want_copies || break_idx) {
+               /*
+                * Cull sources:
+                *   - remove ones corresponding to exact renames
+                */
+               trace2_region_enter("diff", "cull after exact", options->repo);
+               remove_unneeded_paths_from_src(want_copies);
+               trace2_region_leave("diff", "cull after exact", options->repo);
+       } else {
+               /* Determine minimum score to match basenames */
+               double factor = 0.5;
+               char *basename_factor = getenv("GIT_BASENAME_FACTOR");
+               int min_basename_score;
+
+               if (basename_factor)
+                       factor = strtol(basename_factor, NULL, 10)/100.0;
+               assert(factor >= 0.0 && factor <= 1.0);
+               min_basename_score = minimum_score +
+                       (int)(factor * (MAX_SCORE - minimum_score));
+
+               /*
+                * Cull sources:
+                *   - remove ones involved in renames (found via exact match)
+                */
+               trace2_region_enter("diff", "cull after exact", options->repo);
+               remove_unneeded_paths_from_src(want_copies);
+               trace2_region_leave("diff", "cull after exact", options->repo);
+
+               /* Utilize file basenames to quickly find renames. */
+               trace2_region_enter("diff", "basename matches", options->repo);
+               rename_count += find_basename_matches(options,
+                                                     min_basename_score);
+               trace2_region_leave("diff", "basename matches", options->repo);
+
+               /*
+                * Cull sources, again:
+                *   - remove ones involved in renames (found via basenames)
+                */
+               trace2_region_enter("diff", "cull basename", options->repo);
+               remove_unneeded_paths_from_src(want_copies);
+               trace2_region_leave("diff", "cull basename", options->repo);
+       }
+
+       /* Calculate how many rename destinations are left */
+       num_destinations = (rename_dst_nr - rename_count);
+       num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
+
        /* All done? */
        if (!num_destinations || !num_sources)
                goto cleanup;
@@ -751,7 +794,7 @@ void diffcore_rename(struct diff_options *options)
                struct diff_score *m;
 
                if (rename_dst[i].is_rename)
-                       continue; /* dealt with exact match already. */
+                       continue; /* exact or basename match already handled */
 
                m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
                for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 0f97858197e1ff03626372f6f3d57036e59bbdc0..99a5d1bd1c3a30f90f86922befd4618a411d97f1 100755 (executable)
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -277,10 +277,11 @@ test_expect_success 'basename similarity vs best similarity' '
        git add file.txt file.md &&
        git commit -a -m "rename" &&
        git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
-       # subdir/file.txt is 88% similar to file.md and 78% similar to file.txt
+       # subdir/file.txt is 88% similar to file.md, 78% similar to file.txt,
+       # but since same basenames are checked first...
        cat >expected <<-\EOF &&
-       R088    subdir/file.txt file.md
-       A       file.txt
+       A       file.md
+       R078    subdir/file.txt file.txt
        EOF
        test_cmp expected actual
 '