diffcore-rename: complete find_basename_matches()
[git.git] / diffcore-rename.c
blob266d4fae48c7642f4655d44b407b6d35a41325b9
1 /*
3 * Copyright (C) 2005 Junio C Hamano
4 */
5 #include "cache.h"
6 #include "diff.h"
7 #include "diffcore.h"
8 #include "object-store.h"
9 #include "hashmap.h"
10 #include "progress.h"
11 #include "promisor-remote.h"
12 #include "strmap.h"
14 /* Table of rename/copy destinations */
16 static struct diff_rename_dst {
17 struct diff_filepair *p;
18 struct diff_filespec *filespec_to_free;
19 int is_rename; /* false -> just a create; true -> rename or copy */
20 } *rename_dst;
21 static int rename_dst_nr, rename_dst_alloc;
22 /* Mapping from break source pathname to break destination index */
23 static struct strintmap *break_idx = NULL;
25 static struct diff_rename_dst *locate_rename_dst(struct diff_filepair *p)
27 /* Lookup by p->ONE->path */
28 int idx = break_idx ? strintmap_get(break_idx, p->one->path) : -1;
29 return (idx == -1) ? NULL : &rename_dst[idx];
33 * Returns 0 on success, -1 if we found a duplicate.
35 static int add_rename_dst(struct diff_filepair *p)
37 ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
38 rename_dst[rename_dst_nr].p = p;
39 rename_dst[rename_dst_nr].filespec_to_free = NULL;
40 rename_dst[rename_dst_nr].is_rename = 0;
41 rename_dst_nr++;
42 return 0;
45 /* Table of rename/copy src files */
46 static struct diff_rename_src {
47 struct diff_filepair *p;
48 unsigned short score; /* to remember the break score */
49 } *rename_src;
50 static int rename_src_nr, rename_src_alloc;
52 static void register_rename_src(struct diff_filepair *p)
54 if (p->broken_pair) {
55 if (!break_idx) {
56 break_idx = xmalloc(sizeof(*break_idx));
57 strintmap_init(break_idx, -1);
59 strintmap_set(break_idx, p->one->path, rename_dst_nr);
62 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
63 rename_src[rename_src_nr].p = p;
64 rename_src[rename_src_nr].score = p->score;
65 rename_src_nr++;
68 static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
70 int src_len = strlen(src->path), dst_len = strlen(dst->path);
71 while (src_len && dst_len) {
72 char c1 = src->path[--src_len];
73 char c2 = dst->path[--dst_len];
74 if (c1 != c2)
75 return 0;
76 if (c1 == '/')
77 return 1;
79 return (!src_len || src->path[src_len - 1] == '/') &&
80 (!dst_len || dst->path[dst_len - 1] == '/');
83 struct diff_score {
84 int src; /* index in rename_src */
85 int dst; /* index in rename_dst */
86 unsigned short score;
87 short name_score;
90 struct prefetch_options {
91 struct repository *repo;
92 int skip_unmodified;
94 static void prefetch(void *prefetch_options)
96 struct prefetch_options *options = prefetch_options;
97 int i;
98 struct oid_array to_fetch = OID_ARRAY_INIT;
100 for (i = 0; i < rename_dst_nr; i++) {
101 if (rename_dst[i].p->renamed_pair)
103 * The loop in diffcore_rename() will not need these
104 * blobs, so skip prefetching.
106 continue; /* already found exact match */
107 diff_add_if_missing(options->repo, &to_fetch,
108 rename_dst[i].p->two);
110 for (i = 0; i < rename_src_nr; i++) {
111 if (options->skip_unmodified &&
112 diff_unmodified_pair(rename_src[i].p))
114 * The loop in diffcore_rename() will not need these
115 * blobs, so skip prefetching.
117 continue;
118 diff_add_if_missing(options->repo, &to_fetch,
119 rename_src[i].p->one);
121 promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
122 oid_array_clear(&to_fetch);
125 static int estimate_similarity(struct repository *r,
126 struct diff_filespec *src,
127 struct diff_filespec *dst,
128 int minimum_score,
129 int skip_unmodified)
131 /* src points at a file that existed in the original tree (or
132 * optionally a file in the destination tree) and dst points
133 * at a newly created file. They may be quite similar, in which
134 * case we want to say src is renamed to dst or src is copied into
135 * dst, and then some edit has been applied to dst.
137 * Compare them and return how similar they are, representing
138 * the score as an integer between 0 and MAX_SCORE.
140 * When there is an exact match, it is considered a better
141 * match than anything else; the destination does not even
142 * call into this function in that case.
144 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
145 int score;
146 struct diff_populate_filespec_options dpf_options = {
147 .check_size_only = 1
149 struct prefetch_options prefetch_options = {r, skip_unmodified};
151 if (r == the_repository && has_promisor_remote()) {
152 dpf_options.missing_object_cb = prefetch;
153 dpf_options.missing_object_data = &prefetch_options;
156 /* We deal only with regular files. Symlink renames are handled
157 * only when they are exact matches --- in other words, no edits
158 * after renaming.
160 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
161 return 0;
164 * Need to check that source and destination sizes are
165 * filled in before comparing them.
167 * If we already have "cnt_data" filled in, we know it's
168 * all good (avoid checking the size for zero, as that
169 * is a possible size - we really should have a flag to
170 * say whether the size is valid or not!)
172 if (!src->cnt_data &&
173 diff_populate_filespec(r, src, &dpf_options))
174 return 0;
175 if (!dst->cnt_data &&
176 diff_populate_filespec(r, dst, &dpf_options))
177 return 0;
179 max_size = ((src->size > dst->size) ? src->size : dst->size);
180 base_size = ((src->size < dst->size) ? src->size : dst->size);
181 delta_size = max_size - base_size;
183 /* We would not consider edits that change the file size so
184 * drastically. delta_size must be smaller than
185 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
187 * Note that base_size == 0 case is handled here already
188 * and the final score computation below would not have a
189 * divide-by-zero issue.
191 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
192 return 0;
194 dpf_options.check_size_only = 0;
196 if (!src->cnt_data && diff_populate_filespec(r, src, &dpf_options))
197 return 0;
198 if (!dst->cnt_data && diff_populate_filespec(r, dst, &dpf_options))
199 return 0;
201 if (diffcore_count_changes(r, src, dst,
202 &src->cnt_data, &dst->cnt_data,
203 &src_copied, &literal_added))
204 return 0;
206 /* How similar are they?
207 * what percentage of material in dst are from source?
209 if (!dst->size)
210 score = 0; /* should not happen */
211 else
212 score = (int)(src_copied * MAX_SCORE / max_size);
213 return score;
216 static void record_rename_pair(int dst_index, int src_index, int score)
218 struct diff_filepair *src = rename_src[src_index].p;
219 struct diff_filepair *dst = rename_dst[dst_index].p;
221 if (dst->renamed_pair)
222 die("internal error: dst already matched.");
224 src->one->rename_used++;
225 src->one->count++;
227 rename_dst[dst_index].filespec_to_free = dst->one;
228 rename_dst[dst_index].is_rename = 1;
230 dst->one = src->one;
231 dst->renamed_pair = 1;
232 if (!strcmp(dst->one->path, dst->two->path))
233 dst->score = rename_src[src_index].score;
234 else
235 dst->score = score;
239 * We sort the rename similarity matrix with the score, in descending
240 * order (the most similar first).
242 static int score_compare(const void *a_, const void *b_)
244 const struct diff_score *a = a_, *b = b_;
246 /* sink the unused ones to the bottom */
247 if (a->dst < 0)
248 return (0 <= b->dst);
249 else if (b->dst < 0)
250 return -1;
252 if (a->score == b->score)
253 return b->name_score - a->name_score;
255 return b->score - a->score;
258 struct file_similarity {
259 struct hashmap_entry entry;
260 int index;
261 struct diff_filespec *filespec;
264 static unsigned int hash_filespec(struct repository *r,
265 struct diff_filespec *filespec)
267 if (!filespec->oid_valid) {
268 if (diff_populate_filespec(r, filespec, NULL))
269 return 0;
270 hash_object_file(r->hash_algo, filespec->data, filespec->size,
271 "blob", &filespec->oid);
273 return oidhash(&filespec->oid);
276 static int find_identical_files(struct hashmap *srcs,
277 int dst_index,
278 struct diff_options *options)
280 int renames = 0;
281 struct diff_filespec *target = rename_dst[dst_index].p->two;
282 struct file_similarity *p, *best = NULL;
283 int i = 100, best_score = -1;
284 unsigned int hash = hash_filespec(options->repo, target);
287 * Find the best source match for specified destination.
289 p = hashmap_get_entry_from_hash(srcs, hash, NULL,
290 struct file_similarity, entry);
291 hashmap_for_each_entry_from(srcs, p, entry) {
292 int score;
293 struct diff_filespec *source = p->filespec;
295 /* False hash collision? */
296 if (!oideq(&source->oid, &target->oid))
297 continue;
298 /* Non-regular files? If so, the modes must match! */
299 if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
300 if (source->mode != target->mode)
301 continue;
303 /* Give higher scores to sources that haven't been used already */
304 score = !source->rename_used;
305 if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
306 continue;
307 score += basename_same(source, target);
308 if (score > best_score) {
309 best = p;
310 best_score = score;
311 if (score == 2)
312 break;
315 /* Too many identical alternatives? Pick one */
316 if (!--i)
317 break;
319 if (best) {
320 record_rename_pair(dst_index, best->index, MAX_SCORE);
321 renames++;
323 return renames;
326 static void insert_file_table(struct repository *r,
327 struct hashmap *table, int index,
328 struct diff_filespec *filespec)
330 struct file_similarity *entry = xmalloc(sizeof(*entry));
332 entry->index = index;
333 entry->filespec = filespec;
335 hashmap_entry_init(&entry->entry, hash_filespec(r, filespec));
336 hashmap_add(table, &entry->entry);
340 * Find exact renames first.
342 * The first round matches up the up-to-date entries,
343 * and then during the second round we try to match
344 * cache-dirty entries as well.
346 static int find_exact_renames(struct diff_options *options)
348 int i, renames = 0;
349 struct hashmap file_table;
351 /* Add all sources to the hash table in reverse order, because
352 * later on they will be retrieved in LIFO order.
354 hashmap_init(&file_table, NULL, NULL, rename_src_nr);
355 for (i = rename_src_nr-1; i >= 0; i--)
356 insert_file_table(options->repo,
357 &file_table, i,
358 rename_src[i].p->one);
360 /* Walk the destinations and find best source match */
361 for (i = 0; i < rename_dst_nr; i++)
362 renames += find_identical_files(&file_table, i, options);
364 /* Free the hash data structure and entries */
365 hashmap_clear_and_free(&file_table, struct file_similarity, entry);
367 return renames;
370 static const char *get_basename(const char *filename)
373 * gitbasename() has to worry about special drives, multiple
374 * directory separator characters, trailing slashes, NULL or
375 * empty strings, etc. We only work on filenames as stored in
376 * git, and thus get to ignore all those complications.
378 const char *base = strrchr(filename, '/');
379 return base ? base + 1 : filename;
382 MAYBE_UNUSED
383 static int find_basename_matches(struct diff_options *options,
384 int minimum_score)
387 * When I checked in early 2020, over 76% of file renames in linux
388 * just moved files to a different directory but kept the same
389 * basename. gcc did that with over 64% of renames, gecko did it
390 * with over 79%, and WebKit did it with over 89%.
392 * Therefore we can bypass the normal exhaustive NxM matrix
393 * comparison of similarities between all potential rename sources
394 * and destinations by instead using file basename as a hint (i.e.
395 * the portion of the filename after the last '/'), checking for
396 * similarity between files with the same basename, and if we find
397 * a pair that are sufficiently similar, record the rename pair and
398 * exclude those two from the NxM matrix.
400 * This *might* cause us to find a less than optimal pairing (if
401 * there is another file that we are even more similar to but has a
402 * different basename). Given the huge performance advantage
403 * basename matching provides, and given the frequency with which
404 * people use the same basename in real world projects, that's a
405 * trade-off we are willing to accept when doing just rename
406 * detection.
408 * If someone wants copy detection that implies they are willing to
409 * spend more cycles to find similarities between files, so it may
410 * be less likely that this heuristic is wanted. If someone is
411 * doing break detection, that means they do not want filename
412 * similarity to imply any form of content similiarity, and thus
413 * this heuristic would definitely be incompatible.
416 int i, renames = 0;
417 struct strintmap sources;
418 struct strintmap dests;
419 struct hashmap_iter iter;
420 struct strmap_entry *entry;
423 * The prefeteching stuff wants to know if it can skip prefetching
424 * blobs that are unmodified...and will then do a little extra work
425 * to verify that the oids are indeed different before prefetching.
426 * Unmodified blobs are only relevant when doing copy detection;
427 * when limiting to rename detection, diffcore_rename[_extended]()
428 * will never be called with unmodified source paths fed to us, so
429 * the extra work necessary to check if rename_src entries are
430 * unmodified would be a small waste.
432 int skip_unmodified = 0;
435 * Create maps of basename -> fullname(s) for remaining sources and
436 * dests.
438 strintmap_init_with_options(&sources, -1, NULL, 0);
439 strintmap_init_with_options(&dests, -1, NULL, 0);
440 for (i = 0; i < rename_src_nr; ++i) {
441 char *filename = rename_src[i].p->one->path;
442 const char *base;
444 /* exact renames removed in remove_unneeded_paths_from_src() */
445 assert(!rename_src[i].p->one->rename_used);
447 /* Record index within rename_src (i) if basename is unique */
448 base = get_basename(filename);
449 if (strintmap_contains(&sources, base))
450 strintmap_set(&sources, base, -1);
451 else
452 strintmap_set(&sources, base, i);
454 for (i = 0; i < rename_dst_nr; ++i) {
455 char *filename = rename_dst[i].p->two->path;
456 const char *base;
458 if (rename_dst[i].is_rename)
459 continue; /* involved in exact match already. */
461 /* Record index within rename_dst (i) if basename is unique */
462 base = get_basename(filename);
463 if (strintmap_contains(&dests, base))
464 strintmap_set(&dests, base, -1);
465 else
466 strintmap_set(&dests, base, i);
469 /* Now look for basename matchups and do similarity estimation */
470 strintmap_for_each_entry(&sources, &iter, entry) {
471 const char *base = entry->key;
472 intptr_t src_index = (intptr_t)entry->value;
473 intptr_t dst_index;
474 if (src_index == -1)
475 continue;
477 if (0 <= (dst_index = strintmap_get(&dests, base))) {
478 struct diff_filespec *one, *two;
479 int score;
481 /* Estimate the similarity */
482 one = rename_src[src_index].p->one;
483 two = rename_dst[dst_index].p->two;
484 score = estimate_similarity(options->repo, one, two,
485 minimum_score, skip_unmodified);
487 /* If sufficiently similar, record as rename pair */
488 if (score < minimum_score)
489 continue;
490 record_rename_pair(dst_index, src_index, score);
491 renames++;
494 * Found a rename so don't need text anymore; if we
495 * didn't find a rename, the filespec_blob would get
496 * re-used when doing the matrix of comparisons.
498 diff_free_filespec_blob(one);
499 diff_free_filespec_blob(two);
503 strintmap_clear(&sources);
504 strintmap_clear(&dests);
506 return renames;
509 #define NUM_CANDIDATE_PER_DST 4
510 static void record_if_better(struct diff_score m[], struct diff_score *o)
512 int i, worst;
514 /* find the worst one */
515 worst = 0;
516 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
517 if (score_compare(&m[i], &m[worst]) > 0)
518 worst = i;
520 /* is it better than the worst one? */
521 if (score_compare(&m[worst], o) > 0)
522 m[worst] = *o;
526 * Returns:
527 * 0 if we are under the limit;
528 * 1 if we need to disable inexact rename detection;
529 * 2 if we would be under the limit if we were given -C instead of -C -C.
531 static int too_many_rename_candidates(int num_destinations, int num_sources,
532 struct diff_options *options)
534 int rename_limit = options->rename_limit;
535 int i, limited_sources;
537 options->needed_rename_limit = 0;
540 * This basically does a test for the rename matrix not
541 * growing larger than a "rename_limit" square matrix, ie:
543 * num_destinations * num_sources > rename_limit * rename_limit
545 * We use st_mult() to check overflow conditions; in the
546 * exceptional circumstance that size_t isn't large enough to hold
547 * the multiplication, the system won't be able to allocate enough
548 * memory for the matrix anyway.
550 if (rename_limit <= 0)
551 rename_limit = 32767;
552 if (st_mult(num_destinations, num_sources)
553 <= st_mult(rename_limit, rename_limit))
554 return 0;
556 options->needed_rename_limit =
557 num_sources > num_destinations ? num_sources : num_destinations;
559 /* Are we running under -C -C? */
560 if (!options->flags.find_copies_harder)
561 return 1;
563 /* Would we bust the limit if we were running under -C? */
564 for (limited_sources = i = 0; i < num_sources; i++) {
565 if (diff_unmodified_pair(rename_src[i].p))
566 continue;
567 limited_sources++;
569 if (st_mult(num_destinations, limited_sources)
570 <= st_mult(rename_limit, rename_limit))
571 return 2;
572 return 1;
575 static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
577 int count = 0, i;
579 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
580 struct diff_rename_dst *dst;
582 if ((mx[i].dst < 0) ||
583 (mx[i].score < minimum_score))
584 break; /* there is no more usable pair. */
585 dst = &rename_dst[mx[i].dst];
586 if (dst->is_rename)
587 continue; /* already done, either exact or fuzzy. */
588 if (!copies && rename_src[mx[i].src].p->one->rename_used)
589 continue;
590 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
591 count++;
593 return count;
596 static void remove_unneeded_paths_from_src(int detecting_copies)
598 int i, new_num_src;
600 if (detecting_copies)
601 return; /* nothing to remove */
602 if (break_idx)
603 return; /* culling incompatible with break detection */
606 * Note on reasons why we cull unneeded sources but not destinations:
607 * 1) Pairings are stored in rename_dst (not rename_src), which we
608 * need to keep around. So, we just can't cull rename_dst even
609 * if we wanted to. But doing so wouldn't help because...
611 * 2) There is a matrix pairwise comparison that follows the
612 * "Performing inexact rename detection" progress message.
613 * Iterating over the destinations is done in the outer loop,
614 * hence we only iterate over each of those once and we can
615 * easily skip the outer loop early if the destination isn't
616 * relevant. That's only one check per destination path to
617 * skip.
619 * By contrast, the sources are iterated in the inner loop; if
620 * we check whether a source can be skipped, then we'll be
621 * checking it N separate times, once for each destination.
622 * We don't want to have to iterate over known-not-needed
623 * sources N times each, so avoid that by removing the sources
624 * from rename_src here.
626 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
628 * renames are stored in rename_dst, so if a rename has
629 * already been detected using this source, we can just
630 * remove the source knowing rename_dst has its info.
632 if (rename_src[i].p->one->rename_used)
633 continue;
635 if (new_num_src < i)
636 memcpy(&rename_src[new_num_src], &rename_src[i],
637 sizeof(struct diff_rename_src));
638 new_num_src++;
641 rename_src_nr = new_num_src;
644 void diffcore_rename(struct diff_options *options)
646 int detect_rename = options->detect_rename;
647 int minimum_score = options->rename_score;
648 struct diff_queue_struct *q = &diff_queued_diff;
649 struct diff_queue_struct outq;
650 struct diff_score *mx;
651 int i, j, rename_count, skip_unmodified = 0;
652 int num_destinations, dst_cnt;
653 int num_sources, want_copies;
654 struct progress *progress = NULL;
656 trace2_region_enter("diff", "setup", options->repo);
657 want_copies = (detect_rename == DIFF_DETECT_COPY);
658 if (!minimum_score)
659 minimum_score = DEFAULT_RENAME_SCORE;
661 for (i = 0; i < q->nr; i++) {
662 struct diff_filepair *p = q->queue[i];
663 if (!DIFF_FILE_VALID(p->one)) {
664 if (!DIFF_FILE_VALID(p->two))
665 continue; /* unmerged */
666 else if (options->single_follow &&
667 strcmp(options->single_follow, p->two->path))
668 continue; /* not interested */
669 else if (!options->flags.rename_empty &&
670 is_empty_blob_oid(&p->two->oid))
671 continue;
672 else if (add_rename_dst(p) < 0) {
673 warning("skipping rename detection, detected"
674 " duplicate destination '%s'",
675 p->two->path);
676 goto cleanup;
679 else if (!options->flags.rename_empty &&
680 is_empty_blob_oid(&p->one->oid))
681 continue;
682 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
684 * If the source is a broken "delete", and
685 * they did not really want to get broken,
686 * that means the source actually stays.
687 * So we increment the "rename_used" score
688 * by one, to indicate ourselves as a user
690 if (p->broken_pair && !p->score)
691 p->one->rename_used++;
692 register_rename_src(p);
694 else if (want_copies) {
696 * Increment the "rename_used" score by
697 * one, to indicate ourselves as a user.
699 p->one->rename_used++;
700 register_rename_src(p);
703 trace2_region_leave("diff", "setup", options->repo);
704 if (rename_dst_nr == 0 || rename_src_nr == 0)
705 goto cleanup; /* nothing to do */
707 trace2_region_enter("diff", "exact renames", options->repo);
709 * We really want to cull the candidates list early
710 * with cheap tests in order to avoid doing deltas.
712 rename_count = find_exact_renames(options);
713 trace2_region_leave("diff", "exact renames", options->repo);
715 /* Did we only want exact renames? */
716 if (minimum_score == MAX_SCORE)
717 goto cleanup;
719 /* Calculate how many renames are left */
720 num_destinations = (rename_dst_nr - rename_count);
721 remove_unneeded_paths_from_src(want_copies);
722 num_sources = rename_src_nr;
724 /* All done? */
725 if (!num_destinations || !num_sources)
726 goto cleanup;
728 switch (too_many_rename_candidates(num_destinations, num_sources,
729 options)) {
730 case 1:
731 goto cleanup;
732 case 2:
733 options->degraded_cc_to_c = 1;
734 skip_unmodified = 1;
735 break;
736 default:
737 break;
740 trace2_region_enter("diff", "inexact renames", options->repo);
741 if (options->show_rename_progress) {
742 progress = start_delayed_progress(
743 _("Performing inexact rename detection"),
744 (uint64_t)num_destinations * (uint64_t)num_sources);
747 mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_destinations),
748 sizeof(*mx));
749 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
750 struct diff_filespec *two = rename_dst[i].p->two;
751 struct diff_score *m;
753 if (rename_dst[i].is_rename)
754 continue; /* dealt with exact match already. */
756 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
757 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
758 m[j].dst = -1;
760 for (j = 0; j < rename_src_nr; j++) {
761 struct diff_filespec *one = rename_src[j].p->one;
762 struct diff_score this_src;
764 assert(!one->rename_used || want_copies || break_idx);
766 if (skip_unmodified &&
767 diff_unmodified_pair(rename_src[j].p))
768 continue;
770 this_src.score = estimate_similarity(options->repo,
771 one, two,
772 minimum_score,
773 skip_unmodified);
774 this_src.name_score = basename_same(one, two);
775 this_src.dst = i;
776 this_src.src = j;
777 record_if_better(m, &this_src);
779 * Once we run estimate_similarity,
780 * We do not need the text anymore.
782 diff_free_filespec_blob(one);
783 diff_free_filespec_blob(two);
785 dst_cnt++;
786 display_progress(progress,
787 (uint64_t)dst_cnt * (uint64_t)num_sources);
789 stop_progress(&progress);
791 /* cost matrix sorted by most to least similar pair */
792 STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
794 rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
795 if (want_copies)
796 rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
797 free(mx);
798 trace2_region_leave("diff", "inexact renames", options->repo);
800 cleanup:
801 /* At this point, we have found some renames and copies and they
802 * are recorded in rename_dst. The original list is still in *q.
804 trace2_region_enter("diff", "write back to queue", options->repo);
805 DIFF_QUEUE_CLEAR(&outq);
806 for (i = 0; i < q->nr; i++) {
807 struct diff_filepair *p = q->queue[i];
808 struct diff_filepair *pair_to_free = NULL;
810 if (DIFF_PAIR_UNMERGED(p)) {
811 diff_q(&outq, p);
813 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
814 /* Creation */
815 diff_q(&outq, p);
817 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
819 * Deletion
821 * We would output this delete record if:
823 * (1) this is a broken delete and the counterpart
824 * broken create remains in the output; or
825 * (2) this is not a broken delete, and rename_dst
826 * does not have a rename/copy to move p->one->path
827 * out of existence.
829 * Otherwise, the counterpart broken create
830 * has been turned into a rename-edit; or
831 * delete did not have a matching create to
832 * begin with.
834 if (DIFF_PAIR_BROKEN(p)) {
835 /* broken delete */
836 struct diff_rename_dst *dst = locate_rename_dst(p);
837 if (!dst)
838 BUG("tracking failed somehow; failed to find associated dst for broken pair");
839 if (dst->is_rename)
840 /* counterpart is now rename/copy */
841 pair_to_free = p;
843 else {
844 if (p->one->rename_used)
845 /* this path remains */
846 pair_to_free = p;
849 if (!pair_to_free)
850 diff_q(&outq, p);
852 else if (!diff_unmodified_pair(p))
853 /* all the usual ones need to be kept */
854 diff_q(&outq, p);
855 else
856 /* no need to keep unmodified pairs; FIXME: remove earlier? */
857 pair_to_free = p;
859 if (pair_to_free)
860 diff_free_filepair(pair_to_free);
862 diff_debug_queue("done copying original", &outq);
864 free(q->queue);
865 *q = outq;
866 diff_debug_queue("done collapsing", q);
868 for (i = 0; i < rename_dst_nr; i++)
869 if (rename_dst[i].filespec_to_free)
870 free_filespec(rename_dst[i].filespec_to_free);
872 FREE_AND_NULL(rename_dst);
873 rename_dst_nr = rename_dst_alloc = 0;
874 FREE_AND_NULL(rename_src);
875 rename_src_nr = rename_src_alloc = 0;
876 if (break_idx) {
877 strintmap_clear(break_idx);
878 FREE_AND_NULL(break_idx);
880 trace2_region_leave("diff", "write back to queue", options->repo);
881 return;