Merge branch 'ps/pack-bitmap-optim'
[git/gitster.git] / diffcore-rename.c
blobe2ed64817654ec04b2e2504010209fbb53a577b7
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 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;
375 unsigned setup;
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, '/');
387 if (!slash)
388 slash = filename;
389 *slash = '\0';
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,
411 char *old_dir,
412 char *new_dir)
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);
419 if (e) {
420 counts = e->value;
421 } else {
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,
433 const char *oldname,
434 const char *newname)
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;
441 if (!info->setup)
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.
461 return;
463 while (1) {
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))
468 break;
470 /* Get new_dir */
471 dirname_munge(new_dir);
474 * When renaming
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
481 * rename:
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;
491 if (!*new_dir) {
493 * Special case when renaming to root directory,
494 * i.e. when new_dir == "". In this case, we had
495 * something like
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))
505 break;
506 } else {
507 if (strcmp(old_sub_dir, new_sub_dir))
508 break;
512 if (strset_contains(dirs_removed, old_dir))
513 increment_count(info, old_dir, new_dir);
514 else
515 break;
517 /* If we hit toplevel directory ("") for old or new dir, quit */
518 if (!*old_dir || !*new_dir)
519 break;
521 first_time_in_loop = 0;
524 /* Free resources we don't need anymore */
525 free(old_dir);
526 free(new_dir);
529 static void initialize_dir_rename_info(struct dir_rename_info *info,
530 struct strset *dirs_removed,
531 struct strmap *dir_rename_count)
533 struct hashmap_iter iter;
534 struct strmap_entry *entry;
535 int i;
537 if (!dirs_removed) {
538 info->setup = 0;
539 return;
541 info->setup = 1;
543 info->dir_rename_count = dir_rename_count;
544 if (!info->dir_rename_count) {
545 info->dir_rename_count = xmalloc(sizeof(*dir_rename_count));
546 strmap_init(info->dir_rename_count);
548 strintmap_init_with_options(&info->idx_map, -1, NULL, 0);
549 strmap_init_with_options(&info->dir_rename_guess, NULL, 0);
551 /* Setup info->relevant_source_dirs */
552 info->relevant_source_dirs = dirs_removed;
555 * Loop setting up both info->idx_map, and doing setup of
556 * info->dir_rename_count.
558 for (i = 0; i < rename_dst_nr; ++i) {
560 * For non-renamed files, make idx_map contain mapping of
561 * filename -> index (index within rename_dst, that is)
563 if (!rename_dst[i].is_rename) {
564 char *filename = rename_dst[i].p->two->path;
565 strintmap_set(&info->idx_map, filename, i);
566 continue;
570 * For everything else (i.e. renamed files), make
571 * dir_rename_count contain a map of a map:
572 * old_directory -> {new_directory -> count}
573 * In other words, for every pair look at the directories for
574 * the old filename and the new filename and count how many
575 * times that pairing occurs.
577 update_dir_rename_counts(info, dirs_removed,
578 rename_dst[i].p->one->path,
579 rename_dst[i].p->two->path);
583 * Now we collapse
584 * dir_rename_count: old_directory -> {new_directory -> count}
585 * down to
586 * dir_rename_guess: old_directory -> best_new_directory
587 * where best_new_directory is the one with the highest count.
589 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
590 /* entry->key is source_dir */
591 struct strintmap *counts = entry->value;
592 char *best_newdir;
594 best_newdir = xstrdup(get_highest_rename_path(counts));
595 strmap_put(&info->dir_rename_guess, entry->key,
596 best_newdir);
600 void partial_clear_dir_rename_count(struct strmap *dir_rename_count)
602 struct hashmap_iter iter;
603 struct strmap_entry *entry;
605 strmap_for_each_entry(dir_rename_count, &iter, entry) {
606 struct strintmap *counts = entry->value;
607 strintmap_clear(counts);
609 strmap_partial_clear(dir_rename_count, 1);
612 static void cleanup_dir_rename_info(struct dir_rename_info *info,
613 struct strset *dirs_removed,
614 int keep_dir_rename_count)
616 struct hashmap_iter iter;
617 struct strmap_entry *entry;
618 struct string_list to_remove = STRING_LIST_INIT_NODUP;
619 int i;
621 if (!info->setup)
622 return;
624 /* idx_map */
625 strintmap_clear(&info->idx_map);
627 /* dir_rename_guess */
628 strmap_clear(&info->dir_rename_guess, 1);
630 /* dir_rename_count */
631 if (!keep_dir_rename_count) {
632 partial_clear_dir_rename_count(info->dir_rename_count);
633 strmap_clear(info->dir_rename_count, 1);
634 FREE_AND_NULL(info->dir_rename_count);
635 return;
639 * Although dir_rename_count was passed in
640 * diffcore_rename_extended() and we want to keep it around and
641 * return it to that caller, we first want to remove any data
642 * associated with directories that weren't renamed.
644 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
645 const char *source_dir = entry->key;
646 struct strintmap *counts = entry->value;
648 if (!strset_contains(dirs_removed, source_dir)) {
649 string_list_append(&to_remove, source_dir);
650 strintmap_clear(counts);
651 continue;
654 for (i = 0; i < to_remove.nr; ++i)
655 strmap_remove(info->dir_rename_count,
656 to_remove.items[i].string, 1);
657 string_list_clear(&to_remove, 0);
660 static const char *get_basename(const char *filename)
663 * gitbasename() has to worry about special drives, multiple
664 * directory separator characters, trailing slashes, NULL or
665 * empty strings, etc. We only work on filenames as stored in
666 * git, and thus get to ignore all those complications.
668 const char *base = strrchr(filename, '/');
669 return base ? base + 1 : filename;
672 static int idx_possible_rename(char *filename, struct dir_rename_info *info)
675 * Our comparison of files with the same basename (see
676 * find_basename_matches() below), is only helpful when after exact
677 * rename detection we have exactly one file with a given basename
678 * among the rename sources and also only exactly one file with
679 * that basename among the rename destinations. When we have
680 * multiple files with the same basename in either set, we do not
681 * know which to compare against. However, there are some
682 * filenames that occur in large numbers (particularly
683 * build-related filenames such as 'Makefile', '.gitignore', or
684 * 'build.gradle' that potentially exist within every single
685 * subdirectory), and for performance we want to be able to quickly
686 * find renames for these files too.
688 * The reason basename comparisons are a useful heuristic was that it
689 * is common for people to move files across directories while keeping
690 * their filename the same. If we had a way of determining or even
691 * making a good educated guess about which directory these non-unique
692 * basename files had moved the file to, we could check it.
693 * Luckily...
695 * When an entire directory is in fact renamed, we have two factors
696 * helping us out:
697 * (a) the original directory disappeared giving us a hint
698 * about when we can apply an extra heuristic.
699 * (a) we often have several files within that directory and
700 * subdirectories that are renamed without changes
701 * So, rules for a heuristic:
702 * (0) If there basename matches are non-unique (the condition under
703 * which this function is called) AND
704 * (1) the directory in which the file was found has disappeared
705 * (i.e. dirs_removed is non-NULL and has a relevant entry) THEN
706 * (2) use exact renames of files within the directory to determine
707 * where the directory is likely to have been renamed to. IF
708 * there is at least one exact rename from within that
709 * directory, we can proceed.
710 * (3) If there are multiple places the directory could have been
711 * renamed to based on exact renames, ignore all but one of them.
712 * Just use the destination with the most renames going to it.
713 * (4) Check if applying that directory rename to the original file
714 * would result in a destination filename that is in the
715 * potential rename set. If so, return the index of the
716 * destination file (the index within rename_dst).
717 * (5) Compare the original file and returned destination for
718 * similarity, and if they are sufficiently similar, record the
719 * rename.
721 * This function, idx_possible_rename(), is only responsible for (4).
722 * The conditions/steps in (1)-(3) are handled via setting up
723 * dir_rename_count and dir_rename_guess in
724 * initialize_dir_rename_info(). Steps (0) and (5) are handled by
725 * the caller of this function.
727 char *old_dir, *new_dir;
728 struct strbuf new_path = STRBUF_INIT;
729 int idx;
731 if (!info->setup)
732 return -1;
734 old_dir = get_dirname(filename);
735 new_dir = strmap_get(&info->dir_rename_guess, old_dir);
736 free(old_dir);
737 if (!new_dir)
738 return -1;
740 strbuf_addstr(&new_path, new_dir);
741 strbuf_addch(&new_path, '/');
742 strbuf_addstr(&new_path, get_basename(filename));
744 idx = strintmap_get(&info->idx_map, new_path.buf);
745 strbuf_release(&new_path);
746 return idx;
749 static int find_basename_matches(struct diff_options *options,
750 int minimum_score,
751 struct dir_rename_info *info,
752 struct strset *dirs_removed)
755 * When I checked in early 2020, over 76% of file renames in linux
756 * just moved files to a different directory but kept the same
757 * basename. gcc did that with over 64% of renames, gecko did it
758 * with over 79%, and WebKit did it with over 89%.
760 * Therefore we can bypass the normal exhaustive NxM matrix
761 * comparison of similarities between all potential rename sources
762 * and destinations by instead using file basename as a hint (i.e.
763 * the portion of the filename after the last '/'), checking for
764 * similarity between files with the same basename, and if we find
765 * a pair that are sufficiently similar, record the rename pair and
766 * exclude those two from the NxM matrix.
768 * This *might* cause us to find a less than optimal pairing (if
769 * there is another file that we are even more similar to but has a
770 * different basename). Given the huge performance advantage
771 * basename matching provides, and given the frequency with which
772 * people use the same basename in real world projects, that's a
773 * trade-off we are willing to accept when doing just rename
774 * detection.
776 * If someone wants copy detection that implies they are willing to
777 * spend more cycles to find similarities between files, so it may
778 * be less likely that this heuristic is wanted. If someone is
779 * doing break detection, that means they do not want filename
780 * similarity to imply any form of content similiarity, and thus
781 * this heuristic would definitely be incompatible.
784 int i, renames = 0;
785 struct strintmap sources;
786 struct strintmap dests;
789 * The prefeteching stuff wants to know if it can skip prefetching
790 * blobs that are unmodified...and will then do a little extra work
791 * to verify that the oids are indeed different before prefetching.
792 * Unmodified blobs are only relevant when doing copy detection;
793 * when limiting to rename detection, diffcore_rename[_extended]()
794 * will never be called with unmodified source paths fed to us, so
795 * the extra work necessary to check if rename_src entries are
796 * unmodified would be a small waste.
798 int skip_unmodified = 0;
801 * Create maps of basename -> fullname(s) for remaining sources and
802 * dests.
804 strintmap_init_with_options(&sources, -1, NULL, 0);
805 strintmap_init_with_options(&dests, -1, NULL, 0);
806 for (i = 0; i < rename_src_nr; ++i) {
807 char *filename = rename_src[i].p->one->path;
808 const char *base;
810 /* exact renames removed in remove_unneeded_paths_from_src() */
811 assert(!rename_src[i].p->one->rename_used);
813 /* Record index within rename_src (i) if basename is unique */
814 base = get_basename(filename);
815 if (strintmap_contains(&sources, base))
816 strintmap_set(&sources, base, -1);
817 else
818 strintmap_set(&sources, base, i);
820 for (i = 0; i < rename_dst_nr; ++i) {
821 char *filename = rename_dst[i].p->two->path;
822 const char *base;
824 if (rename_dst[i].is_rename)
825 continue; /* involved in exact match already. */
827 /* Record index within rename_dst (i) if basename is unique */
828 base = get_basename(filename);
829 if (strintmap_contains(&dests, base))
830 strintmap_set(&dests, base, -1);
831 else
832 strintmap_set(&dests, base, i);
835 /* Now look for basename matchups and do similarity estimation */
836 for (i = 0; i < rename_src_nr; ++i) {
837 char *filename = rename_src[i].p->one->path;
838 const char *base = NULL;
839 intptr_t src_index;
840 intptr_t dst_index;
843 * If the basename is unique among remaining sources, then
844 * src_index will equal 'i' and we can attempt to match it
845 * to a unique basename in the destinations. Otherwise,
846 * use directory rename heuristics, if possible.
848 base = get_basename(filename);
849 src_index = strintmap_get(&sources, base);
850 assert(src_index == -1 || src_index == i);
852 if (strintmap_contains(&dests, base)) {
853 struct diff_filespec *one, *two;
854 int score;
856 /* Find a matching destination, if possible */
857 dst_index = strintmap_get(&dests, base);
858 if (src_index == -1 || dst_index == -1) {
859 src_index = i;
860 dst_index = idx_possible_rename(filename, info);
862 if (dst_index == -1)
863 continue;
865 /* Ignore this dest if already used in a rename */
866 if (rename_dst[dst_index].is_rename)
867 continue; /* already used previously */
869 /* Estimate the similarity */
870 one = rename_src[src_index].p->one;
871 two = rename_dst[dst_index].p->two;
872 score = estimate_similarity(options->repo, one, two,
873 minimum_score, skip_unmodified);
875 /* If sufficiently similar, record as rename pair */
876 if (score < minimum_score)
877 continue;
878 record_rename_pair(dst_index, src_index, score);
879 renames++;
880 update_dir_rename_counts(info, dirs_removed,
881 one->path, two->path);
884 * Found a rename so don't need text anymore; if we
885 * didn't find a rename, the filespec_blob would get
886 * re-used when doing the matrix of comparisons.
888 diff_free_filespec_blob(one);
889 diff_free_filespec_blob(two);
893 strintmap_clear(&sources);
894 strintmap_clear(&dests);
896 return renames;
899 #define NUM_CANDIDATE_PER_DST 4
900 static void record_if_better(struct diff_score m[], struct diff_score *o)
902 int i, worst;
904 /* find the worst one */
905 worst = 0;
906 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
907 if (score_compare(&m[i], &m[worst]) > 0)
908 worst = i;
910 /* is it better than the worst one? */
911 if (score_compare(&m[worst], o) > 0)
912 m[worst] = *o;
916 * Returns:
917 * 0 if we are under the limit;
918 * 1 if we need to disable inexact rename detection;
919 * 2 if we would be under the limit if we were given -C instead of -C -C.
921 static int too_many_rename_candidates(int num_destinations, int num_sources,
922 struct diff_options *options)
924 int rename_limit = options->rename_limit;
925 int i, limited_sources;
927 options->needed_rename_limit = 0;
930 * This basically does a test for the rename matrix not
931 * growing larger than a "rename_limit" square matrix, ie:
933 * num_destinations * num_sources > rename_limit * rename_limit
935 * We use st_mult() to check overflow conditions; in the
936 * exceptional circumstance that size_t isn't large enough to hold
937 * the multiplication, the system won't be able to allocate enough
938 * memory for the matrix anyway.
940 if (rename_limit <= 0)
941 rename_limit = 32767;
942 if (st_mult(num_destinations, num_sources)
943 <= st_mult(rename_limit, rename_limit))
944 return 0;
946 options->needed_rename_limit =
947 num_sources > num_destinations ? num_sources : num_destinations;
949 /* Are we running under -C -C? */
950 if (!options->flags.find_copies_harder)
951 return 1;
953 /* Would we bust the limit if we were running under -C? */
954 for (limited_sources = i = 0; i < num_sources; i++) {
955 if (diff_unmodified_pair(rename_src[i].p))
956 continue;
957 limited_sources++;
959 if (st_mult(num_destinations, limited_sources)
960 <= st_mult(rename_limit, rename_limit))
961 return 2;
962 return 1;
965 static int find_renames(struct diff_score *mx,
966 int dst_cnt,
967 int minimum_score,
968 int copies,
969 struct dir_rename_info *info,
970 struct strset *dirs_removed)
972 int count = 0, i;
974 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
975 struct diff_rename_dst *dst;
977 if ((mx[i].dst < 0) ||
978 (mx[i].score < minimum_score))
979 break; /* there is no more usable pair. */
980 dst = &rename_dst[mx[i].dst];
981 if (dst->is_rename)
982 continue; /* already done, either exact or fuzzy. */
983 if (!copies && rename_src[mx[i].src].p->one->rename_used)
984 continue;
985 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
986 count++;
987 update_dir_rename_counts(info, dirs_removed,
988 rename_src[mx[i].src].p->one->path,
989 rename_dst[mx[i].dst].p->two->path);
991 return count;
994 static void remove_unneeded_paths_from_src(int detecting_copies)
996 int i, new_num_src;
998 if (detecting_copies)
999 return; /* nothing to remove */
1000 if (break_idx)
1001 return; /* culling incompatible with break detection */
1004 * Note on reasons why we cull unneeded sources but not destinations:
1005 * 1) Pairings are stored in rename_dst (not rename_src), which we
1006 * need to keep around. So, we just can't cull rename_dst even
1007 * if we wanted to. But doing so wouldn't help because...
1009 * 2) There is a matrix pairwise comparison that follows the
1010 * "Performing inexact rename detection" progress message.
1011 * Iterating over the destinations is done in the outer loop,
1012 * hence we only iterate over each of those once and we can
1013 * easily skip the outer loop early if the destination isn't
1014 * relevant. That's only one check per destination path to
1015 * skip.
1017 * By contrast, the sources are iterated in the inner loop; if
1018 * we check whether a source can be skipped, then we'll be
1019 * checking it N separate times, once for each destination.
1020 * We don't want to have to iterate over known-not-needed
1021 * sources N times each, so avoid that by removing the sources
1022 * from rename_src here.
1024 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
1026 * renames are stored in rename_dst, so if a rename has
1027 * already been detected using this source, we can just
1028 * remove the source knowing rename_dst has its info.
1030 if (rename_src[i].p->one->rename_used)
1031 continue;
1033 if (new_num_src < i)
1034 memcpy(&rename_src[new_num_src], &rename_src[i],
1035 sizeof(struct diff_rename_src));
1036 new_num_src++;
1039 rename_src_nr = new_num_src;
1042 void diffcore_rename_extended(struct diff_options *options,
1043 struct strset *dirs_removed,
1044 struct strmap *dir_rename_count)
1046 int detect_rename = options->detect_rename;
1047 int minimum_score = options->rename_score;
1048 struct diff_queue_struct *q = &diff_queued_diff;
1049 struct diff_queue_struct outq;
1050 struct diff_score *mx;
1051 int i, j, rename_count, skip_unmodified = 0;
1052 int num_destinations, dst_cnt;
1053 int num_sources, want_copies;
1054 struct progress *progress = NULL;
1055 struct dir_rename_info info;
1057 trace2_region_enter("diff", "setup", options->repo);
1058 info.setup = 0;
1059 assert(!dir_rename_count || strmap_empty(dir_rename_count));
1060 want_copies = (detect_rename == DIFF_DETECT_COPY);
1061 if (dirs_removed && (break_idx || want_copies))
1062 BUG("dirs_removed incompatible with break/copy detection");
1063 if (!minimum_score)
1064 minimum_score = DEFAULT_RENAME_SCORE;
1066 for (i = 0; i < q->nr; i++) {
1067 struct diff_filepair *p = q->queue[i];
1068 if (!DIFF_FILE_VALID(p->one)) {
1069 if (!DIFF_FILE_VALID(p->two))
1070 continue; /* unmerged */
1071 else if (options->single_follow &&
1072 strcmp(options->single_follow, p->two->path))
1073 continue; /* not interested */
1074 else if (!options->flags.rename_empty &&
1075 is_empty_blob_oid(&p->two->oid))
1076 continue;
1077 else if (add_rename_dst(p) < 0) {
1078 warning("skipping rename detection, detected"
1079 " duplicate destination '%s'",
1080 p->two->path);
1081 goto cleanup;
1084 else if (!options->flags.rename_empty &&
1085 is_empty_blob_oid(&p->one->oid))
1086 continue;
1087 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
1089 * If the source is a broken "delete", and
1090 * they did not really want to get broken,
1091 * that means the source actually stays.
1092 * So we increment the "rename_used" score
1093 * by one, to indicate ourselves as a user
1095 if (p->broken_pair && !p->score)
1096 p->one->rename_used++;
1097 register_rename_src(p);
1099 else if (want_copies) {
1101 * Increment the "rename_used" score by
1102 * one, to indicate ourselves as a user.
1104 p->one->rename_used++;
1105 register_rename_src(p);
1108 trace2_region_leave("diff", "setup", options->repo);
1109 if (rename_dst_nr == 0 || rename_src_nr == 0)
1110 goto cleanup; /* nothing to do */
1112 trace2_region_enter("diff", "exact renames", options->repo);
1114 * We really want to cull the candidates list early
1115 * with cheap tests in order to avoid doing deltas.
1117 rename_count = find_exact_renames(options);
1118 trace2_region_leave("diff", "exact renames", options->repo);
1120 /* Did we only want exact renames? */
1121 if (minimum_score == MAX_SCORE)
1122 goto cleanup;
1124 num_sources = rename_src_nr;
1126 if (want_copies || break_idx) {
1128 * Cull sources:
1129 * - remove ones corresponding to exact renames
1131 trace2_region_enter("diff", "cull after exact", options->repo);
1132 remove_unneeded_paths_from_src(want_copies);
1133 trace2_region_leave("diff", "cull after exact", options->repo);
1134 } else {
1135 /* Determine minimum score to match basenames */
1136 double factor = 0.5;
1137 char *basename_factor = getenv("GIT_BASENAME_FACTOR");
1138 int min_basename_score;
1140 if (basename_factor)
1141 factor = strtol(basename_factor, NULL, 10)/100.0;
1142 assert(factor >= 0.0 && factor <= 1.0);
1143 min_basename_score = minimum_score +
1144 (int)(factor * (MAX_SCORE - minimum_score));
1147 * Cull sources:
1148 * - remove ones involved in renames (found via exact match)
1150 trace2_region_enter("diff", "cull after exact", options->repo);
1151 remove_unneeded_paths_from_src(want_copies);
1152 trace2_region_leave("diff", "cull after exact", options->repo);
1154 /* Preparation for basename-driven matching. */
1155 trace2_region_enter("diff", "dir rename setup", options->repo);
1156 initialize_dir_rename_info(&info,
1157 dirs_removed, dir_rename_count);
1158 trace2_region_leave("diff", "dir rename setup", options->repo);
1160 /* Utilize file basenames to quickly find renames. */
1161 trace2_region_enter("diff", "basename matches", options->repo);
1162 rename_count += find_basename_matches(options,
1163 min_basename_score,
1164 &info, dirs_removed);
1165 trace2_region_leave("diff", "basename matches", options->repo);
1168 * Cull sources, again:
1169 * - remove ones involved in renames (found via basenames)
1171 trace2_region_enter("diff", "cull basename", options->repo);
1172 remove_unneeded_paths_from_src(want_copies);
1173 trace2_region_leave("diff", "cull basename", options->repo);
1176 /* Calculate how many rename destinations are left */
1177 num_destinations = (rename_dst_nr - rename_count);
1178 num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
1180 /* All done? */
1181 if (!num_destinations || !num_sources)
1182 goto cleanup;
1184 switch (too_many_rename_candidates(num_destinations, num_sources,
1185 options)) {
1186 case 1:
1187 goto cleanup;
1188 case 2:
1189 options->degraded_cc_to_c = 1;
1190 skip_unmodified = 1;
1191 break;
1192 default:
1193 break;
1196 trace2_region_enter("diff", "inexact renames", options->repo);
1197 if (options->show_rename_progress) {
1198 progress = start_delayed_progress(
1199 _("Performing inexact rename detection"),
1200 (uint64_t)num_destinations * (uint64_t)num_sources);
1203 CALLOC_ARRAY(mx, st_mult(NUM_CANDIDATE_PER_DST, num_destinations));
1204 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
1205 struct diff_filespec *two = rename_dst[i].p->two;
1206 struct diff_score *m;
1208 if (rename_dst[i].is_rename)
1209 continue; /* exact or basename match already handled */
1211 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
1212 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
1213 m[j].dst = -1;
1215 for (j = 0; j < rename_src_nr; j++) {
1216 struct diff_filespec *one = rename_src[j].p->one;
1217 struct diff_score this_src;
1219 assert(!one->rename_used || want_copies || break_idx);
1221 if (skip_unmodified &&
1222 diff_unmodified_pair(rename_src[j].p))
1223 continue;
1225 this_src.score = estimate_similarity(options->repo,
1226 one, two,
1227 minimum_score,
1228 skip_unmodified);
1229 this_src.name_score = basename_same(one, two);
1230 this_src.dst = i;
1231 this_src.src = j;
1232 record_if_better(m, &this_src);
1234 * Once we run estimate_similarity,
1235 * We do not need the text anymore.
1237 diff_free_filespec_blob(one);
1238 diff_free_filespec_blob(two);
1240 dst_cnt++;
1241 display_progress(progress,
1242 (uint64_t)dst_cnt * (uint64_t)num_sources);
1244 stop_progress(&progress);
1246 /* cost matrix sorted by most to least similar pair */
1247 STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
1249 rename_count += find_renames(mx, dst_cnt, minimum_score, 0,
1250 &info, dirs_removed);
1251 if (want_copies)
1252 rename_count += find_renames(mx, dst_cnt, minimum_score, 1,
1253 &info, dirs_removed);
1254 free(mx);
1255 trace2_region_leave("diff", "inexact renames", options->repo);
1257 cleanup:
1258 /* At this point, we have found some renames and copies and they
1259 * are recorded in rename_dst. The original list is still in *q.
1261 trace2_region_enter("diff", "write back to queue", options->repo);
1262 DIFF_QUEUE_CLEAR(&outq);
1263 for (i = 0; i < q->nr; i++) {
1264 struct diff_filepair *p = q->queue[i];
1265 struct diff_filepair *pair_to_free = NULL;
1267 if (DIFF_PAIR_UNMERGED(p)) {
1268 diff_q(&outq, p);
1270 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1271 /* Creation */
1272 diff_q(&outq, p);
1274 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
1276 * Deletion
1278 * We would output this delete record if:
1280 * (1) this is a broken delete and the counterpart
1281 * broken create remains in the output; or
1282 * (2) this is not a broken delete, and rename_dst
1283 * does not have a rename/copy to move p->one->path
1284 * out of existence.
1286 * Otherwise, the counterpart broken create
1287 * has been turned into a rename-edit; or
1288 * delete did not have a matching create to
1289 * begin with.
1291 if (DIFF_PAIR_BROKEN(p)) {
1292 /* broken delete */
1293 struct diff_rename_dst *dst = locate_rename_dst(p);
1294 if (!dst)
1295 BUG("tracking failed somehow; failed to find associated dst for broken pair");
1296 if (dst->is_rename)
1297 /* counterpart is now rename/copy */
1298 pair_to_free = p;
1300 else {
1301 if (p->one->rename_used)
1302 /* this path remains */
1303 pair_to_free = p;
1306 if (!pair_to_free)
1307 diff_q(&outq, p);
1309 else if (!diff_unmodified_pair(p))
1310 /* all the usual ones need to be kept */
1311 diff_q(&outq, p);
1312 else
1313 /* no need to keep unmodified pairs; FIXME: remove earlier? */
1314 pair_to_free = p;
1316 if (pair_to_free)
1317 diff_free_filepair(pair_to_free);
1319 diff_debug_queue("done copying original", &outq);
1321 free(q->queue);
1322 *q = outq;
1323 diff_debug_queue("done collapsing", q);
1325 for (i = 0; i < rename_dst_nr; i++)
1326 if (rename_dst[i].filespec_to_free)
1327 free_filespec(rename_dst[i].filespec_to_free);
1329 cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
1330 FREE_AND_NULL(rename_dst);
1331 rename_dst_nr = rename_dst_alloc = 0;
1332 FREE_AND_NULL(rename_src);
1333 rename_src_nr = rename_src_alloc = 0;
1334 if (break_idx) {
1335 strintmap_clear(break_idx);
1336 FREE_AND_NULL(break_idx);
1338 trace2_region_leave("diff", "write back to queue", options->repo);
1339 return;
1342 void diffcore_rename(struct diff_options *options)
1344 diffcore_rename_extended(options, NULL, NULL);