3 * Copyright (C) 2005 Junio C Hamano
8 #include "object-store.h"
11 #include "promisor-remote.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 */
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;
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 */
50 static int rename_src_nr, rename_src_alloc;
52 static void register_rename_src(struct diff_filepair *p)
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;
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];
79 return (!src_len || src->path[src_len - 1] == '/') &&
80 (!dst_len || dst->path[dst_len - 1] == '/');
84 int src; /* index in rename_src */
85 int dst; /* index in rename_dst */
90 struct prefetch_options {
91 struct repository *repo;
94 static void prefetch(void *prefetch_options)
96 struct prefetch_options *options = prefetch_options;
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.
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,
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;
146 struct diff_populate_filespec_options dpf_options = {
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
160 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
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))
175 if (!dst->cnt_data &&
176 diff_populate_filespec(r, dst, &dpf_options))
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)
194 dpf_options.check_size_only = 0;
196 if (!src->cnt_data && diff_populate_filespec(r, src, &dpf_options))
198 if (!dst->cnt_data && diff_populate_filespec(r, dst, &dpf_options))
201 if (diffcore_count_changes(r, src, dst,
202 &src->cnt_data, &dst->cnt_data,
203 &src_copied, &literal_added))
206 /* How similar are they?
207 * what percentage of material in dst are from source?
210 score = 0; /* should not happen */
212 score = (int)(src_copied * MAX_SCORE / max_size);
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++;
227 rename_dst[dst_index].filespec_to_free = dst->one;
228 rename_dst[dst_index].is_rename = 1;
231 dst->renamed_pair = 1;
232 if (!strcmp(dst->one->path, dst->two->path))
233 dst->score = rename_src[src_index].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 */
248 return (0 <= b->dst);
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;
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))
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,
278 struct diff_options *options)
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) {
293 struct diff_filespec *source = p->filespec;
295 /* False hash collision? */
296 if (!oideq(&source->oid, &target->oid))
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)
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)
307 score += basename_same(source, target);
308 if (score > best_score) {
315 /* Too many identical alternatives? Pick one */
320 record_rename_pair(dst_index, best->index, MAX_SCORE);
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)
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,
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);
370 struct dir_rename_info {
371 struct strintmap idx_map;
372 struct strmap dir_rename_guess;
373 struct strmap *dir_rename_count;
374 struct strset *relevant_source_dirs;
378 static char *get_dirname(const char *filename)
380 char *slash = strrchr(filename, '/');
381 return slash ? xstrndup(filename, slash - filename) : xstrdup("");
384 static void dirname_munge(char *filename)
386 char *slash = strrchr(filename, '/');
392 static const char *get_highest_rename_path(struct strintmap *counts)
394 int highest_count = 0;
395 const char *highest_destination_dir = NULL;
396 struct hashmap_iter iter;
397 struct strmap_entry *entry;
399 strintmap_for_each_entry(counts, &iter, entry) {
400 const char *destination_dir = entry->key;
401 intptr_t count = (intptr_t)entry->value;
402 if (count > highest_count) {
403 highest_count = count;
404 highest_destination_dir = destination_dir;
407 return highest_destination_dir;
410 static void increment_count(struct dir_rename_info *info,
414 struct strintmap *counts;
415 struct strmap_entry *e;
417 /* Get the {new_dirs -> counts} mapping using old_dir */
418 e = strmap_get_entry(info->dir_rename_count, old_dir);
422 counts = xmalloc(sizeof(*counts));
423 strintmap_init_with_options(counts, 0, NULL, 1);
424 strmap_put(info->dir_rename_count, old_dir, counts);
427 /* Increment the count for new_dir */
428 strintmap_incr(counts, new_dir, 1);
431 static void update_dir_rename_counts(struct dir_rename_info *info,
432 struct strset *dirs_removed,
436 char *old_dir = xstrdup(oldname);
437 char *new_dir = xstrdup(newname);
438 char new_dir_first_char = new_dir[0];
439 int first_time_in_loop = 1;
443 * info->setup is 0 here in two cases: (1) all auxiliary
444 * vars (like dirs_removed) were NULL so
445 * initialize_dir_rename_info() returned early, or (2)
446 * either break detection or copy detection are active so
447 * that we never called initialize_dir_rename_info(). In
448 * the former case, we don't have enough info to know if
449 * directories were renamed (because dirs_removed lets us
450 * know about a necessary prerequisite, namely if they were
451 * removed), and in the latter, we don't care about
452 * directory renames or find_basename_matches.
454 * This matters because both basename and inexact matching
455 * will also call update_dir_rename_counts(). In either of
456 * the above two cases info->dir_rename_counts will not
457 * have been properly initialized which prevents us from
458 * updating it, but in these two cases we don't care about
459 * dir_rename_counts anyway, so we can just exit early.
464 /* Get old_dir, skip if its directory isn't relevant. */
465 dirname_munge(old_dir);
466 if (info->relevant_source_dirs &&
467 !strset_contains(info->relevant_source_dirs, old_dir))
471 dirname_munge(new_dir);
475 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
476 * then this suggests that both
477 * a/b/c/d/e/ => a/b/some/thing/else/e/
478 * a/b/c/d/ => a/b/some/thing/else/
479 * so we want to increment counters for both. We do NOT,
480 * however, also want to suggest that there was the following
482 * a/b/c/ => a/b/some/thing/
483 * so we need to quit at that point.
485 * Note the when first_time_in_loop, we only strip off the
486 * basename, and we don't care if that's different.
488 if (!first_time_in_loop) {
489 char *old_sub_dir = strchr(old_dir, '\0')+1;
490 char *new_sub_dir = strchr(new_dir, '\0')+1;
493 * Special case when renaming to root directory,
494 * i.e. when new_dir == "". In this case, we had
496 * a/b/subdir => subdir
497 * and so dirname_munge() sets things up so that
498 * old_dir = "a/b\0subdir\0"
499 * new_dir = "\0ubdir\0"
500 * We didn't have a '/' to overwrite a '\0' onto
501 * in new_dir, so we have to compare differently.
503 if (new_dir_first_char != old_sub_dir[0] ||
504 strcmp(old_sub_dir+1, new_sub_dir))
507 if (strcmp(old_sub_dir, new_sub_dir))
512 if (strset_contains(dirs_removed, old_dir))
513 increment_count(info, old_dir, new_dir);
517 /* If we hit toplevel directory ("") for old or new dir, quit */
518 if (!*old_dir || !*new_dir)
521 first_time_in_loop = 0;
524 /* Free resources we don't need anymore */
529 static void initialize_dir_rename_info(struct dir_rename_info *info,
530 struct strset *relevant_sources,
531 struct strset *dirs_removed,
532 struct strmap *dir_rename_count)
534 struct hashmap_iter iter;
535 struct strmap_entry *entry;
538 if (!dirs_removed && !relevant_sources) {
544 info->dir_rename_count = dir_rename_count;
545 if (!info->dir_rename_count) {
546 info->dir_rename_count = xmalloc(sizeof(*dir_rename_count));
547 strmap_init(info->dir_rename_count);
549 strintmap_init_with_options(&info->idx_map, -1, NULL, 0);
550 strmap_init_with_options(&info->dir_rename_guess, NULL, 0);
552 /* Setup info->relevant_source_dirs */
553 info->relevant_source_dirs = NULL;
554 if (dirs_removed || !relevant_sources) {
555 info->relevant_source_dirs = dirs_removed; /* might be NULL */
557 info->relevant_source_dirs = xmalloc(sizeof(struct strintmap));
558 strset_init(info->relevant_source_dirs);
559 strset_for_each_entry(relevant_sources, &iter, entry) {
560 char *dirname = get_dirname(entry->key);
562 strset_contains(dirs_removed, dirname))
563 strset_add(info->relevant_source_dirs, dirname);
569 * Loop setting up both info->idx_map, and doing setup of
570 * info->dir_rename_count.
572 for (i = 0; i < rename_dst_nr; ++i) {
574 * For non-renamed files, make idx_map contain mapping of
575 * filename -> index (index within rename_dst, that is)
577 if (!rename_dst[i].is_rename) {
578 char *filename = rename_dst[i].p->two->path;
579 strintmap_set(&info->idx_map, filename, i);
584 * For everything else (i.e. renamed files), make
585 * dir_rename_count contain a map of a map:
586 * old_directory -> {new_directory -> count}
587 * In other words, for every pair look at the directories for
588 * the old filename and the new filename and count how many
589 * times that pairing occurs.
591 update_dir_rename_counts(info, dirs_removed,
592 rename_dst[i].p->one->path,
593 rename_dst[i].p->two->path);
598 * dir_rename_count: old_directory -> {new_directory -> count}
600 * dir_rename_guess: old_directory -> best_new_directory
601 * where best_new_directory is the one with the highest count.
603 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
604 /* entry->key is source_dir */
605 struct strintmap *counts = entry->value;
608 best_newdir = xstrdup(get_highest_rename_path(counts));
609 strmap_put(&info->dir_rename_guess, entry->key,
614 void partial_clear_dir_rename_count(struct strmap *dir_rename_count)
616 struct hashmap_iter iter;
617 struct strmap_entry *entry;
619 strmap_for_each_entry(dir_rename_count, &iter, entry) {
620 struct strintmap *counts = entry->value;
621 strintmap_clear(counts);
623 strmap_partial_clear(dir_rename_count, 1);
626 static void cleanup_dir_rename_info(struct dir_rename_info *info,
627 struct strset *dirs_removed,
628 int keep_dir_rename_count)
630 struct hashmap_iter iter;
631 struct strmap_entry *entry;
632 struct string_list to_remove = STRING_LIST_INIT_NODUP;
639 strintmap_clear(&info->idx_map);
641 /* dir_rename_guess */
642 strmap_clear(&info->dir_rename_guess, 1);
644 /* relevant_source_dirs */
645 if (info->relevant_source_dirs &&
646 info->relevant_source_dirs != dirs_removed) {
647 strset_clear(info->relevant_source_dirs);
648 FREE_AND_NULL(info->relevant_source_dirs);
651 /* dir_rename_count */
652 if (!keep_dir_rename_count) {
653 partial_clear_dir_rename_count(info->dir_rename_count);
654 strmap_clear(info->dir_rename_count, 1);
655 FREE_AND_NULL(info->dir_rename_count);
660 * Although dir_rename_count was passed in
661 * diffcore_rename_extended() and we want to keep it around and
662 * return it to that caller, we first want to remove any data
663 * associated with directories that weren't renamed.
665 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
666 const char *source_dir = entry->key;
667 struct strintmap *counts = entry->value;
669 if (!strset_contains(dirs_removed, source_dir)) {
670 string_list_append(&to_remove, source_dir);
671 strintmap_clear(counts);
675 for (i = 0; i < to_remove.nr; ++i)
676 strmap_remove(info->dir_rename_count,
677 to_remove.items[i].string, 1);
678 string_list_clear(&to_remove, 0);
681 static const char *get_basename(const char *filename)
684 * gitbasename() has to worry about special drives, multiple
685 * directory separator characters, trailing slashes, NULL or
686 * empty strings, etc. We only work on filenames as stored in
687 * git, and thus get to ignore all those complications.
689 const char *base = strrchr(filename, '/');
690 return base ? base + 1 : filename;
693 static int idx_possible_rename(char *filename, struct dir_rename_info *info)
696 * Our comparison of files with the same basename (see
697 * find_basename_matches() below), is only helpful when after exact
698 * rename detection we have exactly one file with a given basename
699 * among the rename sources and also only exactly one file with
700 * that basename among the rename destinations. When we have
701 * multiple files with the same basename in either set, we do not
702 * know which to compare against. However, there are some
703 * filenames that occur in large numbers (particularly
704 * build-related filenames such as 'Makefile', '.gitignore', or
705 * 'build.gradle' that potentially exist within every single
706 * subdirectory), and for performance we want to be able to quickly
707 * find renames for these files too.
709 * The reason basename comparisons are a useful heuristic was that it
710 * is common for people to move files across directories while keeping
711 * their filename the same. If we had a way of determining or even
712 * making a good educated guess about which directory these non-unique
713 * basename files had moved the file to, we could check it.
716 * When an entire directory is in fact renamed, we have two factors
718 * (a) the original directory disappeared giving us a hint
719 * about when we can apply an extra heuristic.
720 * (a) we often have several files within that directory and
721 * subdirectories that are renamed without changes
722 * So, rules for a heuristic:
723 * (0) If there basename matches are non-unique (the condition under
724 * which this function is called) AND
725 * (1) the directory in which the file was found has disappeared
726 * (i.e. dirs_removed is non-NULL and has a relevant entry) THEN
727 * (2) use exact renames of files within the directory to determine
728 * where the directory is likely to have been renamed to. IF
729 * there is at least one exact rename from within that
730 * directory, we can proceed.
731 * (3) If there are multiple places the directory could have been
732 * renamed to based on exact renames, ignore all but one of them.
733 * Just use the destination with the most renames going to it.
734 * (4) Check if applying that directory rename to the original file
735 * would result in a destination filename that is in the
736 * potential rename set. If so, return the index of the
737 * destination file (the index within rename_dst).
738 * (5) Compare the original file and returned destination for
739 * similarity, and if they are sufficiently similar, record the
742 * This function, idx_possible_rename(), is only responsible for (4).
743 * The conditions/steps in (1)-(3) are handled via setting up
744 * dir_rename_count and dir_rename_guess in
745 * initialize_dir_rename_info(). Steps (0) and (5) are handled by
746 * the caller of this function.
748 char *old_dir, *new_dir;
749 struct strbuf new_path = STRBUF_INIT;
755 old_dir = get_dirname(filename);
756 new_dir = strmap_get(&info->dir_rename_guess, old_dir);
761 strbuf_addstr(&new_path, new_dir);
762 strbuf_addch(&new_path, '/');
763 strbuf_addstr(&new_path, get_basename(filename));
765 idx = strintmap_get(&info->idx_map, new_path.buf);
766 strbuf_release(&new_path);
770 static int find_basename_matches(struct diff_options *options,
772 struct dir_rename_info *info,
773 struct strset *relevant_sources,
774 struct strset *dirs_removed)
777 * When I checked in early 2020, over 76% of file renames in linux
778 * just moved files to a different directory but kept the same
779 * basename. gcc did that with over 64% of renames, gecko did it
780 * with over 79%, and WebKit did it with over 89%.
782 * Therefore we can bypass the normal exhaustive NxM matrix
783 * comparison of similarities between all potential rename sources
784 * and destinations by instead using file basename as a hint (i.e.
785 * the portion of the filename after the last '/'), checking for
786 * similarity between files with the same basename, and if we find
787 * a pair that are sufficiently similar, record the rename pair and
788 * exclude those two from the NxM matrix.
790 * This *might* cause us to find a less than optimal pairing (if
791 * there is another file that we are even more similar to but has a
792 * different basename). Given the huge performance advantage
793 * basename matching provides, and given the frequency with which
794 * people use the same basename in real world projects, that's a
795 * trade-off we are willing to accept when doing just rename
798 * If someone wants copy detection that implies they are willing to
799 * spend more cycles to find similarities between files, so it may
800 * be less likely that this heuristic is wanted. If someone is
801 * doing break detection, that means they do not want filename
802 * similarity to imply any form of content similiarity, and thus
803 * this heuristic would definitely be incompatible.
807 struct strintmap sources;
808 struct strintmap dests;
811 * The prefeteching stuff wants to know if it can skip prefetching
812 * blobs that are unmodified...and will then do a little extra work
813 * to verify that the oids are indeed different before prefetching.
814 * Unmodified blobs are only relevant when doing copy detection;
815 * when limiting to rename detection, diffcore_rename[_extended]()
816 * will never be called with unmodified source paths fed to us, so
817 * the extra work necessary to check if rename_src entries are
818 * unmodified would be a small waste.
820 int skip_unmodified = 0;
823 * Create maps of basename -> fullname(s) for remaining sources and
826 strintmap_init_with_options(&sources, -1, NULL, 0);
827 strintmap_init_with_options(&dests, -1, NULL, 0);
828 for (i = 0; i < rename_src_nr; ++i) {
829 char *filename = rename_src[i].p->one->path;
832 /* exact renames removed in remove_unneeded_paths_from_src() */
833 assert(!rename_src[i].p->one->rename_used);
835 /* Record index within rename_src (i) if basename is unique */
836 base = get_basename(filename);
837 if (strintmap_contains(&sources, base))
838 strintmap_set(&sources, base, -1);
840 strintmap_set(&sources, base, i);
842 for (i = 0; i < rename_dst_nr; ++i) {
843 char *filename = rename_dst[i].p->two->path;
846 if (rename_dst[i].is_rename)
847 continue; /* involved in exact match already. */
849 /* Record index within rename_dst (i) if basename is unique */
850 base = get_basename(filename);
851 if (strintmap_contains(&dests, base))
852 strintmap_set(&dests, base, -1);
854 strintmap_set(&dests, base, i);
857 /* Now look for basename matchups and do similarity estimation */
858 for (i = 0; i < rename_src_nr; ++i) {
859 char *filename = rename_src[i].p->one->path;
860 const char *base = NULL;
864 /* Skip irrelevant sources */
865 if (relevant_sources &&
866 !strset_contains(relevant_sources, filename))
870 * If the basename is unique among remaining sources, then
871 * src_index will equal 'i' and we can attempt to match it
872 * to a unique basename in the destinations. Otherwise,
873 * use directory rename heuristics, if possible.
875 base = get_basename(filename);
876 src_index = strintmap_get(&sources, base);
877 assert(src_index == -1 || src_index == i);
879 if (strintmap_contains(&dests, base)) {
880 struct diff_filespec *one, *two;
883 /* Find a matching destination, if possible */
884 dst_index = strintmap_get(&dests, base);
885 if (src_index == -1 || dst_index == -1) {
887 dst_index = idx_possible_rename(filename, info);
892 /* Ignore this dest if already used in a rename */
893 if (rename_dst[dst_index].is_rename)
894 continue; /* already used previously */
896 /* Estimate the similarity */
897 one = rename_src[src_index].p->one;
898 two = rename_dst[dst_index].p->two;
899 score = estimate_similarity(options->repo, one, two,
900 minimum_score, skip_unmodified);
902 /* If sufficiently similar, record as rename pair */
903 if (score < minimum_score)
905 record_rename_pair(dst_index, src_index, score);
907 update_dir_rename_counts(info, dirs_removed,
908 one->path, two->path);
911 * Found a rename so don't need text anymore; if we
912 * didn't find a rename, the filespec_blob would get
913 * re-used when doing the matrix of comparisons.
915 diff_free_filespec_blob(one);
916 diff_free_filespec_blob(two);
920 strintmap_clear(&sources);
921 strintmap_clear(&dests);
926 #define NUM_CANDIDATE_PER_DST 4
927 static void record_if_better(struct diff_score m[], struct diff_score *o)
931 /* find the worst one */
933 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
934 if (score_compare(&m[i], &m[worst]) > 0)
937 /* is it better than the worst one? */
938 if (score_compare(&m[worst], o) > 0)
944 * 0 if we are under the limit;
945 * 1 if we need to disable inexact rename detection;
946 * 2 if we would be under the limit if we were given -C instead of -C -C.
948 static int too_many_rename_candidates(int num_destinations, int num_sources,
949 struct diff_options *options)
951 int rename_limit = options->rename_limit;
952 int i, limited_sources;
954 options->needed_rename_limit = 0;
957 * This basically does a test for the rename matrix not
958 * growing larger than a "rename_limit" square matrix, ie:
960 * num_destinations * num_sources > rename_limit * rename_limit
962 * We use st_mult() to check overflow conditions; in the
963 * exceptional circumstance that size_t isn't large enough to hold
964 * the multiplication, the system won't be able to allocate enough
965 * memory for the matrix anyway.
967 if (rename_limit <= 0)
968 rename_limit = 32767;
969 if (st_mult(num_destinations, num_sources)
970 <= st_mult(rename_limit, rename_limit))
973 options->needed_rename_limit =
974 num_sources > num_destinations ? num_sources : num_destinations;
976 /* Are we running under -C -C? */
977 if (!options->flags.find_copies_harder)
980 /* Would we bust the limit if we were running under -C? */
981 for (limited_sources = i = 0; i < num_sources; i++) {
982 if (diff_unmodified_pair(rename_src[i].p))
986 if (st_mult(num_destinations, limited_sources)
987 <= st_mult(rename_limit, rename_limit))
992 static int find_renames(struct diff_score *mx,
996 struct dir_rename_info *info,
997 struct strset *dirs_removed)
1001 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
1002 struct diff_rename_dst *dst;
1004 if ((mx[i].dst < 0) ||
1005 (mx[i].score < minimum_score))
1006 break; /* there is no more usable pair. */
1007 dst = &rename_dst[mx[i].dst];
1009 continue; /* already done, either exact or fuzzy. */
1010 if (!copies && rename_src[mx[i].src].p->one->rename_used)
1012 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
1014 update_dir_rename_counts(info, dirs_removed,
1015 rename_src[mx[i].src].p->one->path,
1016 rename_dst[mx[i].dst].p->two->path);
1021 static void remove_unneeded_paths_from_src(int detecting_copies,
1022 struct strset *interesting)
1026 if (detecting_copies && !interesting)
1027 return; /* nothing to remove */
1029 return; /* culling incompatible with break detection */
1032 * Note on reasons why we cull unneeded sources but not destinations:
1033 * 1) Pairings are stored in rename_dst (not rename_src), which we
1034 * need to keep around. So, we just can't cull rename_dst even
1035 * if we wanted to. But doing so wouldn't help because...
1037 * 2) There is a matrix pairwise comparison that follows the
1038 * "Performing inexact rename detection" progress message.
1039 * Iterating over the destinations is done in the outer loop,
1040 * hence we only iterate over each of those once and we can
1041 * easily skip the outer loop early if the destination isn't
1042 * relevant. That's only one check per destination path to
1045 * By contrast, the sources are iterated in the inner loop; if
1046 * we check whether a source can be skipped, then we'll be
1047 * checking it N separate times, once for each destination.
1048 * We don't want to have to iterate over known-not-needed
1049 * sources N times each, so avoid that by removing the sources
1050 * from rename_src here.
1052 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
1053 struct diff_filespec *one = rename_src[i].p->one;
1056 * renames are stored in rename_dst, so if a rename has
1057 * already been detected using this source, we can just
1058 * remove the source knowing rename_dst has its info.
1060 if (!detecting_copies && one->rename_used)
1063 /* If we don't care about the source path, skip it */
1064 if (interesting && !strset_contains(interesting, one->path))
1067 if (new_num_src < i)
1068 memcpy(&rename_src[new_num_src], &rename_src[i],
1069 sizeof(struct diff_rename_src));
1073 rename_src_nr = new_num_src;
1076 void diffcore_rename_extended(struct diff_options *options,
1077 struct strset *relevant_sources,
1078 struct strset *dirs_removed,
1079 struct strmap *dir_rename_count)
1081 int detect_rename = options->detect_rename;
1082 int minimum_score = options->rename_score;
1083 struct diff_queue_struct *q = &diff_queued_diff;
1084 struct diff_queue_struct outq;
1085 struct diff_score *mx;
1086 int i, j, rename_count, skip_unmodified = 0;
1087 int num_destinations, dst_cnt;
1088 int num_sources, want_copies;
1089 struct progress *progress = NULL;
1090 struct dir_rename_info info;
1092 trace2_region_enter("diff", "setup", options->repo);
1094 assert(!dir_rename_count || strmap_empty(dir_rename_count));
1095 want_copies = (detect_rename == DIFF_DETECT_COPY);
1096 if (dirs_removed && (break_idx || want_copies))
1097 BUG("dirs_removed incompatible with break/copy detection");
1098 if (break_idx && relevant_sources)
1099 BUG("break detection incompatible with source specification");
1101 minimum_score = DEFAULT_RENAME_SCORE;
1103 for (i = 0; i < q->nr; i++) {
1104 struct diff_filepair *p = q->queue[i];
1105 if (!DIFF_FILE_VALID(p->one)) {
1106 if (!DIFF_FILE_VALID(p->two))
1107 continue; /* unmerged */
1108 else if (options->single_follow &&
1109 strcmp(options->single_follow, p->two->path))
1110 continue; /* not interested */
1111 else if (!options->flags.rename_empty &&
1112 is_empty_blob_oid(&p->two->oid))
1114 else if (add_rename_dst(p) < 0) {
1115 warning("skipping rename detection, detected"
1116 " duplicate destination '%s'",
1121 else if (!options->flags.rename_empty &&
1122 is_empty_blob_oid(&p->one->oid))
1124 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
1126 * If the source is a broken "delete", and
1127 * they did not really want to get broken,
1128 * that means the source actually stays.
1129 * So we increment the "rename_used" score
1130 * by one, to indicate ourselves as a user
1132 if (p->broken_pair && !p->score)
1133 p->one->rename_used++;
1134 register_rename_src(p);
1136 else if (want_copies) {
1138 * Increment the "rename_used" score by
1139 * one, to indicate ourselves as a user.
1141 p->one->rename_used++;
1142 register_rename_src(p);
1145 trace2_region_leave("diff", "setup", options->repo);
1146 if (rename_dst_nr == 0 || rename_src_nr == 0)
1147 goto cleanup; /* nothing to do */
1149 trace2_region_enter("diff", "exact renames", options->repo);
1151 * We really want to cull the candidates list early
1152 * with cheap tests in order to avoid doing deltas.
1154 rename_count = find_exact_renames(options);
1155 trace2_region_leave("diff", "exact renames", options->repo);
1157 /* Did we only want exact renames? */
1158 if (minimum_score == MAX_SCORE)
1161 num_sources = rename_src_nr;
1163 if (want_copies || break_idx) {
1166 * - remove ones corresponding to exact renames
1167 * - remove ones not found in relevant_sources
1169 trace2_region_enter("diff", "cull after exact", options->repo);
1170 remove_unneeded_paths_from_src(want_copies, relevant_sources);
1171 trace2_region_leave("diff", "cull after exact", options->repo);
1173 /* Determine minimum score to match basenames */
1174 double factor = 0.5;
1175 char *basename_factor = getenv("GIT_BASENAME_FACTOR");
1176 int min_basename_score;
1178 if (basename_factor)
1179 factor = strtol(basename_factor, NULL, 10)/100.0;
1180 assert(factor >= 0.0 && factor <= 1.0);
1181 min_basename_score = minimum_score +
1182 (int)(factor * (MAX_SCORE - minimum_score));
1186 * - remove ones involved in renames (found via exact match)
1188 trace2_region_enter("diff", "cull after exact", options->repo);
1189 remove_unneeded_paths_from_src(want_copies, NULL);
1190 trace2_region_leave("diff", "cull after exact", options->repo);
1192 /* Preparation for basename-driven matching. */
1193 trace2_region_enter("diff", "dir rename setup", options->repo);
1194 initialize_dir_rename_info(&info, relevant_sources,
1195 dirs_removed, dir_rename_count);
1196 trace2_region_leave("diff", "dir rename setup", options->repo);
1198 /* Utilize file basenames to quickly find renames. */
1199 trace2_region_enter("diff", "basename matches", options->repo);
1200 rename_count += find_basename_matches(options,
1205 trace2_region_leave("diff", "basename matches", options->repo);
1208 * Cull sources, again:
1209 * - remove ones involved in renames (found via basenames)
1210 * - remove ones not found in relevant_sources
1212 trace2_region_enter("diff", "cull basename", options->repo);
1213 remove_unneeded_paths_from_src(want_copies, relevant_sources);
1214 trace2_region_leave("diff", "cull basename", options->repo);
1217 /* Calculate how many rename destinations are left */
1218 num_destinations = (rename_dst_nr - rename_count);
1219 num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
1222 if (!num_destinations || !num_sources)
1225 switch (too_many_rename_candidates(num_destinations, num_sources,
1230 options->degraded_cc_to_c = 1;
1231 skip_unmodified = 1;
1237 trace2_region_enter("diff", "inexact renames", options->repo);
1238 if (options->show_rename_progress) {
1239 progress = start_delayed_progress(
1240 _("Performing inexact rename detection"),
1241 (uint64_t)num_destinations * (uint64_t)num_sources);
1244 CALLOC_ARRAY(mx, st_mult(NUM_CANDIDATE_PER_DST, num_destinations));
1245 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
1246 struct diff_filespec *two = rename_dst[i].p->two;
1247 struct diff_score *m;
1249 if (rename_dst[i].is_rename)
1250 continue; /* exact or basename match already handled */
1252 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
1253 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
1256 for (j = 0; j < rename_src_nr; j++) {
1257 struct diff_filespec *one = rename_src[j].p->one;
1258 struct diff_score this_src;
1260 assert(!one->rename_used || want_copies || break_idx);
1262 if (skip_unmodified &&
1263 diff_unmodified_pair(rename_src[j].p))
1266 this_src.score = estimate_similarity(options->repo,
1270 this_src.name_score = basename_same(one, two);
1273 record_if_better(m, &this_src);
1275 * Once we run estimate_similarity,
1276 * We do not need the text anymore.
1278 diff_free_filespec_blob(one);
1279 diff_free_filespec_blob(two);
1282 display_progress(progress,
1283 (uint64_t)dst_cnt * (uint64_t)num_sources);
1285 stop_progress(&progress);
1287 /* cost matrix sorted by most to least similar pair */
1288 STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
1290 rename_count += find_renames(mx, dst_cnt, minimum_score, 0,
1291 &info, dirs_removed);
1293 rename_count += find_renames(mx, dst_cnt, minimum_score, 1,
1294 &info, dirs_removed);
1296 trace2_region_leave("diff", "inexact renames", options->repo);
1299 /* At this point, we have found some renames and copies and they
1300 * are recorded in rename_dst. The original list is still in *q.
1302 trace2_region_enter("diff", "write back to queue", options->repo);
1303 DIFF_QUEUE_CLEAR(&outq);
1304 for (i = 0; i < q->nr; i++) {
1305 struct diff_filepair *p = q->queue[i];
1306 struct diff_filepair *pair_to_free = NULL;
1308 if (DIFF_PAIR_UNMERGED(p)) {
1311 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1315 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
1319 * We would output this delete record if:
1321 * (1) this is a broken delete and the counterpart
1322 * broken create remains in the output; or
1323 * (2) this is not a broken delete, and rename_dst
1324 * does not have a rename/copy to move p->one->path
1327 * Otherwise, the counterpart broken create
1328 * has been turned into a rename-edit; or
1329 * delete did not have a matching create to
1332 if (DIFF_PAIR_BROKEN(p)) {
1334 struct diff_rename_dst *dst = locate_rename_dst(p);
1336 BUG("tracking failed somehow; failed to find associated dst for broken pair");
1338 /* counterpart is now rename/copy */
1342 if (p->one->rename_used)
1343 /* this path remains */
1350 else if (!diff_unmodified_pair(p))
1351 /* all the usual ones need to be kept */
1354 /* no need to keep unmodified pairs; FIXME: remove earlier? */
1358 diff_free_filepair(pair_to_free);
1360 diff_debug_queue("done copying original", &outq);
1364 diff_debug_queue("done collapsing", q);
1366 for (i = 0; i < rename_dst_nr; i++)
1367 if (rename_dst[i].filespec_to_free)
1368 free_filespec(rename_dst[i].filespec_to_free);
1370 cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
1371 FREE_AND_NULL(rename_dst);
1372 rename_dst_nr = rename_dst_alloc = 0;
1373 FREE_AND_NULL(rename_src);
1374 rename_src_nr = rename_src_alloc = 0;
1376 strintmap_clear(break_idx);
1377 FREE_AND_NULL(break_idx);
1379 trace2_region_leave("diff", "write back to queue", options->repo);
1383 void diffcore_rename(struct diff_options *options)
1385 diffcore_rename_extended(options, NULL, NULL, NULL);