]> git.ipfire.org Git - thirdparty/git.git/blame - diffcore-rename.c
diffcore-rename: check if we have enough renames for directories early on
[thirdparty/git.git] / diffcore-rename.c
CommitLineData
427dcb4b 1/*
95acf11a 2 *
427dcb4b
JH
3 * Copyright (C) 2005 Junio C Hamano
4 */
5#include "cache.h"
6#include "diff.h"
7#include "diffcore.h"
cbd53a21 8#include "object-store.h"
f79d9c58 9#include "hashmap.h"
3ac942d4 10#include "progress.h"
95acf11a 11#include "promisor-remote.h"
9db2ac56 12#include "strmap.h"
427dcb4b 13
25d5ea41
JH
14/* Table of rename/copy destinations */
15
16static struct diff_rename_dst {
9db2ac56
EN
17 struct diff_filepair *p;
18 struct diff_filespec *filespec_to_free;
19 int is_rename; /* false -> just a create; true -> rename or copy */
25d5ea41
JH
20} *rename_dst;
21static int rename_dst_nr, rename_dst_alloc;
9db2ac56
EN
22/* Mapping from break source pathname to break destination index */
23static struct strintmap *break_idx = NULL;
427dcb4b 24
9db2ac56 25static struct diff_rename_dst *locate_rename_dst(struct diff_filepair *p)
f98c2f7e 26{
9db2ac56
EN
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];
f98c2f7e
JK
30}
31
32/*
33 * Returns 0 on success, -1 if we found a duplicate.
34 */
9db2ac56 35static int add_rename_dst(struct diff_filepair *p)
f98c2f7e 36{
337ce247 37 ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
9db2ac56
EN
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;
25d5ea41 41 rename_dst_nr++;
f98c2f7e 42 return 0;
427dcb4b
JH
43}
44
15d061b4 45/* Table of rename/copy src files */
25d5ea41 46static struct diff_rename_src {
e88d6bc6 47 struct diff_filepair *p;
fc580719 48 unsigned short score; /* to remember the break score */
25d5ea41
JH
49} *rename_src;
50static int rename_src_nr, rename_src_alloc;
427dcb4b 51
b970b4ef 52static void register_rename_src(struct diff_filepair *p)
25d5ea41 53{
9db2ac56
EN
54 if (p->broken_pair) {
55 if (!break_idx) {
56 break_idx = xmalloc(sizeof(*break_idx));
57 strintmap_init(break_idx, -1);
58 }
59 strintmap_set(break_idx, p->one->path, rename_dst_nr);
60 }
61
337ce247 62 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
b970b4ef
EN
63 rename_src[rename_src_nr].p = p;
64 rename_src[rename_src_nr].score = p->score;
25d5ea41 65 rename_src_nr++;
427dcb4b
JH
66}
67
0ce39643
JS
68static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
69{
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;
78 }
79 return (!src_len || src->path[src_len - 1] == '/') &&
80 (!dst_len || dst->path[dst_len - 1] == '/');
81}
82
427dcb4b 83struct diff_score {
25d5ea41
JH
84 int src; /* index in rename_src */
85 int dst; /* index in rename_dst */
6d24ad97
JH
86 unsigned short score;
87 short name_score;
427dcb4b
JH
88};
89
95acf11a
JT
90struct prefetch_options {
91 struct repository *repo;
92 int skip_unmodified;
93};
94static void prefetch(void *prefetch_options)
95{
96 struct prefetch_options *options = prefetch_options;
97 int i;
98 struct oid_array to_fetch = OID_ARRAY_INIT;
99
100 for (i = 0; i < rename_dst_nr; i++) {
9db2ac56 101 if (rename_dst[i].p->renamed_pair)
95acf11a
JT
102 /*
103 * The loop in diffcore_rename() will not need these
104 * blobs, so skip prefetching.
105 */
106 continue; /* already found exact match */
107 diff_add_if_missing(options->repo, &to_fetch,
9db2ac56 108 rename_dst[i].p->two);
95acf11a
JT
109 }
110 for (i = 0; i < rename_src_nr; i++) {
111 if (options->skip_unmodified &&
112 diff_unmodified_pair(rename_src[i].p))
113 /*
114 * The loop in diffcore_rename() will not need these
115 * blobs, so skip prefetching.
116 */
117 continue;
118 diff_add_if_missing(options->repo, &to_fetch,
119 rename_src[i].p->one);
120 }
121 promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
122 oid_array_clear(&to_fetch);
123}
124
b78ea5fc
NTND
125static int estimate_similarity(struct repository *r,
126 struct diff_filespec *src,
427dcb4b 127 struct diff_filespec *dst,
95acf11a
JT
128 int minimum_score,
129 int skip_unmodified)
427dcb4b
JH
130{
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.
136 *
137 * Compare them and return how similar they are, representing
f0c6b2a2
JH
138 * the score as an integer between 0 and MAX_SCORE.
139 *
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.
427dcb4b 143 */
90bd932c 144 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
427dcb4b 145 int score;
1c37e86a
JT
146 struct diff_populate_filespec_options dpf_options = {
147 .check_size_only = 1
148 };
95acf11a
JT
149 struct prefetch_options prefetch_options = {r, skip_unmodified};
150
151 if (r == the_repository && has_promisor_remote()) {
152 dpf_options.missing_object_cb = prefetch;
153 dpf_options.missing_object_data = &prefetch_options;
154 }
427dcb4b 155
60896c7b
JH
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.
159 */
160 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
161 return 0;
162
81ac051d
LT
163 /*
164 * Need to check that source and destination sizes are
165 * filled in before comparing them.
166 *
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!)
171 */
8e5dd3d6 172 if (!src->cnt_data &&
1c37e86a 173 diff_populate_filespec(r, src, &dpf_options))
81ac051d 174 return 0;
8e5dd3d6 175 if (!dst->cnt_data &&
1c37e86a 176 diff_populate_filespec(r, dst, &dpf_options))
81ac051d
LT
177 return 0;
178
90bd932c 179 max_size = ((src->size > dst->size) ? src->size : dst->size);
58b103f5 180 base_size = ((src->size < dst->size) ? src->size : dst->size);
90bd932c 181 delta_size = max_size - base_size;
427dcb4b 182
58b103f5
JH
183 /* We would not consider edits that change the file size so
184 * drastically. delta_size must be smaller than
cd1870ed 185 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
f0c6b2a2 186 *
58b103f5
JH
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.
427dcb4b 190 */
3a4d6769 191 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
427dcb4b
JH
192 return 0;
193
95acf11a
JT
194 dpf_options.check_size_only = 0;
195
196 if (!src->cnt_data && diff_populate_filespec(r, src, &dpf_options))
885c716f 197 return 0;
95acf11a 198 if (!dst->cnt_data && diff_populate_filespec(r, dst, &dpf_options))
885c716f
BS
199 return 0;
200
b78ea5fc 201 if (diffcore_count_changes(r, src, dst,
c06c7966 202 &src->cnt_data, &dst->cnt_data,
65416758 203 &src_copied, &literal_added))
85976974 204 return 0;
355e76a4 205
1706306a
JH
206 /* How similar are they?
207 * what percentage of material in dst are from source?
427dcb4b 208 */
90bd932c 209 if (!dst->size)
1706306a 210 score = 0; /* should not happen */
cfc0aef1 211 else
dc49cd76 212 score = (int)(src_copied * MAX_SCORE / max_size);
427dcb4b
JH
213 return score;
214}
215
5098bafb 216static void record_rename_pair(int dst_index, int src_index, int score)
427dcb4b 217{
9db2ac56
EN
218 struct diff_filepair *src = rename_src[src_index].p;
219 struct diff_filepair *dst = rename_dst[dst_index].p;
f7c1512a 220
9db2ac56 221 if (dst->renamed_pair)
25d5ea41 222 die("internal error: dst already matched.");
427dcb4b 223
9db2ac56
EN
224 src->one->rename_used++;
225 src->one->count++;
427dcb4b 226
9db2ac56
EN
227 rename_dst[dst_index].filespec_to_free = dst->one;
228 rename_dst[dst_index].is_rename = 1;
427dcb4b 229
9db2ac56
EN
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;
fc580719 234 else
9db2ac56 235 dst->score = score;
427dcb4b
JH
236}
237
238/*
239 * We sort the rename similarity matrix with the score, in descending
15d061b4 240 * order (the most similar first).
427dcb4b
JH
241 */
242static int score_compare(const void *a_, const void *b_)
243{
244 const struct diff_score *a = a_, *b = b_;
cfc0aef1 245
6d24ad97
JH
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;
251
cfc0aef1
RS
252 if (a->score == b->score)
253 return b->name_score - a->name_score;
254
427dcb4b
JH
255 return b->score - a->score;
256}
257
9027f53c 258struct file_similarity {
f79d9c58 259 struct hashmap_entry entry;
7c85f8ac 260 int index;
9027f53c 261 struct diff_filespec *filespec;
9027f53c
LT
262};
263
b78ea5fc
NTND
264static unsigned int hash_filespec(struct repository *r,
265 struct diff_filespec *filespec)
48f6407f 266{
41c9560e 267 if (!filespec->oid_valid) {
1c37e86a 268 if (diff_populate_filespec(r, filespec, NULL))
48f6407f 269 return 0;
2dcde20e
MT
270 hash_object_file(r->hash_algo, filespec->data, filespec->size,
271 "blob", &filespec->oid);
48f6407f 272 }
d40abc8e 273 return oidhash(&filespec->oid);
48f6407f
KB
274}
275
f79d9c58 276static int find_identical_files(struct hashmap *srcs,
7c85f8ac 277 int dst_index,
11f944dd 278 struct diff_options *options)
9027f53c
LT
279{
280 int renames = 0;
9db2ac56 281 struct diff_filespec *target = rename_dst[dst_index].p->two;
ab73a9d1 282 struct file_similarity *p, *best = NULL;
48f6407f 283 int i = 100, best_score = -1;
f0e63c41 284 unsigned int hash = hash_filespec(options->repo, target);
48f6407f
KB
285
286 /*
7c85f8ac 287 * Find the best source match for specified destination.
48f6407f 288 */
f0e63c41
EW
289 p = hashmap_get_entry_from_hash(srcs, hash, NULL,
290 struct file_similarity, entry);
23dee69f 291 hashmap_for_each_entry_from(srcs, p, entry) {
48f6407f
KB
292 int score;
293 struct diff_filespec *source = p->filespec;
294
295 /* False hash collision? */
9001dc2a 296 if (!oideq(&source->oid, &target->oid))
48f6407f
KB
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)
0940e5f2 301 continue;
9027f53c 302 }
48f6407f
KB
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;
9027f53c 313 }
48f6407f
KB
314
315 /* Too many identical alternatives? Pick one */
316 if (!--i)
317 break;
318 }
319 if (best) {
7c85f8ac 320 record_rename_pair(dst_index, best->index, MAX_SCORE);
48f6407f
KB
321 renames++;
322 }
9027f53c
LT
323 return renames;
324}
325
b78ea5fc
NTND
326static void insert_file_table(struct repository *r,
327 struct hashmap *table, int index,
328 struct diff_filespec *filespec)
9027f53c 329{
9027f53c
LT
330 struct file_similarity *entry = xmalloc(sizeof(*entry));
331
9027f53c
LT
332 entry->index = index;
333 entry->filespec = filespec;
9027f53c 334
d22245a2 335 hashmap_entry_init(&entry->entry, hash_filespec(r, filespec));
b94e5c1d 336 hashmap_add(table, &entry->entry);
9027f53c
LT
337}
338
cb1491b6
LT
339/*
340 * Find exact renames first.
341 *
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.
cb1491b6 345 */
11f944dd 346static int find_exact_renames(struct diff_options *options)
cb1491b6 347{
7c85f8ac 348 int i, renames = 0;
f79d9c58 349 struct hashmap file_table;
cb1491b6 350
ca4e3ca0
SG
351 /* Add all sources to the hash table in reverse order, because
352 * later on they will be retrieved in LIFO order.
353 */
7663cdc8 354 hashmap_init(&file_table, NULL, NULL, rename_src_nr);
ca4e3ca0 355 for (i = rename_src_nr-1; i >= 0; i--)
b78ea5fc
NTND
356 insert_file_table(options->repo,
357 &file_table, i,
358 rename_src[i].p->one);
9027f53c 359
7c85f8ac 360 /* Walk the destinations and find best source match */
9027f53c 361 for (i = 0; i < rename_dst_nr; i++)
7c85f8ac 362 renames += find_identical_files(&file_table, i, options);
9027f53c 363
f79d9c58 364 /* Free the hash data structure and entries */
6da1a258 365 hashmap_clear_and_free(&file_table, struct file_similarity, entry);
9027f53c 366
7c85f8ac 367 return renames;
cb1491b6
LT
368}
369
bde8b9f3
EN
370struct dir_rename_info {
371 struct strintmap idx_map;
372 struct strmap dir_rename_guess;
373 struct strmap *dir_rename_count;
a49b55d5 374 struct strintmap *relevant_source_dirs;
bde8b9f3
EN
375 unsigned setup;
376};
377
378static char *get_dirname(const char *filename)
379{
380 char *slash = strrchr(filename, '/');
381 return slash ? xstrndup(filename, slash - filename) : xstrdup("");
382}
383
0c4fd732
EN
384static void dirname_munge(char *filename)
385{
386 char *slash = strrchr(filename, '/');
387 if (!slash)
388 slash = filename;
389 *slash = '\0';
390}
391
81afdf7a
EN
392static const char *get_highest_rename_path(struct strintmap *counts)
393{
394 int highest_count = 0;
395 const char *highest_destination_dir = NULL;
396 struct hashmap_iter iter;
397 struct strmap_entry *entry;
398
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;
405 }
406 }
407 return highest_destination_dir;
408}
409
0491d392
EN
410static char *UNKNOWN_DIR = "/"; /* placeholder -- short, illegal directory */
411
412static int dir_rename_already_determinable(struct strintmap *counts)
413{
414 struct hashmap_iter iter;
415 struct strmap_entry *entry;
416 int first = 0, second = 0, unknown = 0;
417 strintmap_for_each_entry(counts, &iter, entry) {
418 const char *destination_dir = entry->key;
419 intptr_t count = (intptr_t)entry->value;
420 if (!strcmp(destination_dir, UNKNOWN_DIR)) {
421 unknown = count;
422 } else if (count >= first) {
423 second = first;
424 first = count;
425 } else if (count >= second) {
426 second = count;
427 }
428 }
429 return first > second + unknown;
430}
431
b6e3d274 432static void increment_count(struct dir_rename_info *info,
0c4fd732
EN
433 char *old_dir,
434 char *new_dir)
435{
436 struct strintmap *counts;
437 struct strmap_entry *e;
438
439 /* Get the {new_dirs -> counts} mapping using old_dir */
b6e3d274 440 e = strmap_get_entry(info->dir_rename_count, old_dir);
0c4fd732
EN
441 if (e) {
442 counts = e->value;
443 } else {
444 counts = xmalloc(sizeof(*counts));
445 strintmap_init_with_options(counts, 0, NULL, 1);
b6e3d274 446 strmap_put(info->dir_rename_count, old_dir, counts);
0c4fd732
EN
447 }
448
449 /* Increment the count for new_dir */
450 strintmap_incr(counts, new_dir, 1);
451}
452
b6e3d274 453static void update_dir_rename_counts(struct dir_rename_info *info,
a49b55d5 454 struct strintmap *dirs_removed,
0c4fd732
EN
455 const char *oldname,
456 const char *newname)
457{
458 char *old_dir = xstrdup(oldname);
459 char *new_dir = xstrdup(newname);
460 char new_dir_first_char = new_dir[0];
461 int first_time_in_loop = 1;
462
1ad69eb0
EN
463 if (!info->setup)
464 /*
465 * info->setup is 0 here in two cases: (1) all auxiliary
466 * vars (like dirs_removed) were NULL so
467 * initialize_dir_rename_info() returned early, or (2)
468 * either break detection or copy detection are active so
469 * that we never called initialize_dir_rename_info(). In
470 * the former case, we don't have enough info to know if
471 * directories were renamed (because dirs_removed lets us
472 * know about a necessary prerequisite, namely if they were
473 * removed), and in the latter, we don't care about
474 * directory renames or find_basename_matches.
475 *
476 * This matters because both basename and inexact matching
477 * will also call update_dir_rename_counts(). In either of
478 * the above two cases info->dir_rename_counts will not
479 * have been properly initialized which prevents us from
480 * updating it, but in these two cases we don't care about
481 * dir_rename_counts anyway, so we can just exit early.
482 */
483 return;
484
0c4fd732 485 while (1) {
e54385b9
EN
486 int drd_flag = NOT_RELEVANT;
487
333899e1 488 /* Get old_dir, skip if its directory isn't relevant. */
0c4fd732 489 dirname_munge(old_dir);
333899e1 490 if (info->relevant_source_dirs &&
a49b55d5 491 !strintmap_contains(info->relevant_source_dirs, old_dir))
333899e1
EN
492 break;
493
494 /* Get new_dir */
0c4fd732
EN
495 dirname_munge(new_dir);
496
497 /*
498 * When renaming
499 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
500 * then this suggests that both
501 * a/b/c/d/e/ => a/b/some/thing/else/e/
502 * a/b/c/d/ => a/b/some/thing/else/
503 * so we want to increment counters for both. We do NOT,
504 * however, also want to suggest that there was the following
505 * rename:
506 * a/b/c/ => a/b/some/thing/
507 * so we need to quit at that point.
508 *
509 * Note the when first_time_in_loop, we only strip off the
510 * basename, and we don't care if that's different.
511 */
512 if (!first_time_in_loop) {
513 char *old_sub_dir = strchr(old_dir, '\0')+1;
514 char *new_sub_dir = strchr(new_dir, '\0')+1;
515 if (!*new_dir) {
516 /*
517 * Special case when renaming to root directory,
518 * i.e. when new_dir == "". In this case, we had
519 * something like
520 * a/b/subdir => subdir
521 * and so dirname_munge() sets things up so that
522 * old_dir = "a/b\0subdir\0"
523 * new_dir = "\0ubdir\0"
524 * We didn't have a '/' to overwrite a '\0' onto
525 * in new_dir, so we have to compare differently.
526 */
527 if (new_dir_first_char != old_sub_dir[0] ||
528 strcmp(old_sub_dir+1, new_sub_dir))
529 break;
530 } else {
531 if (strcmp(old_sub_dir, new_sub_dir))
532 break;
533 }
534 }
535
e54385b9
EN
536 /*
537 * Above we suggested that we'd keep recording renames for
538 * all ancestor directories where the trailing directories
539 * matched, i.e. for
540 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
541 * we'd increment rename counts for each of
542 * a/b/c/d/e/ => a/b/some/thing/else/e/
543 * a/b/c/d/ => a/b/some/thing/else/
544 * However, we only need the rename counts for directories
545 * in dirs_removed whose value is RELEVANT_FOR_SELF.
546 * However, we add one special case of also recording it for
547 * first_time_in_loop because find_basename_matches() can
548 * use that as a hint to find a good pairing.
549 */
550 if (dirs_removed)
551 drd_flag = strintmap_get(dirs_removed, old_dir);
552 if (drd_flag == RELEVANT_FOR_SELF || first_time_in_loop)
b6e3d274 553 increment_count(info, old_dir, new_dir);
0c4fd732 554
e54385b9
EN
555 first_time_in_loop = 0;
556 if (drd_flag == NOT_RELEVANT)
557 break;
0c4fd732
EN
558 /* If we hit toplevel directory ("") for old or new dir, quit */
559 if (!*old_dir || !*new_dir)
560 break;
0c4fd732
EN
561 }
562
563 /* Free resources we don't need anymore */
564 free(old_dir);
565 free(new_dir);
566}
567
1ad69eb0 568static void initialize_dir_rename_info(struct dir_rename_info *info,
a49b55d5
EN
569 struct strintmap *relevant_sources,
570 struct strintmap *dirs_removed,
1ad69eb0 571 struct strmap *dir_rename_count)
0c4fd732 572{
81afdf7a
EN
573 struct hashmap_iter iter;
574 struct strmap_entry *entry;
0c4fd732
EN
575 int i;
576
e4fd06e7 577 if (!dirs_removed && !relevant_sources) {
1ad69eb0
EN
578 info->setup = 0;
579 return;
0c4fd732 580 }
ae8cf74d
EN
581 info->setup = 1;
582
1ad69eb0
EN
583 info->dir_rename_count = dir_rename_count;
584 if (!info->dir_rename_count) {
585 info->dir_rename_count = xmalloc(sizeof(*dir_rename_count));
586 strmap_init(info->dir_rename_count);
587 }
ae8cf74d
EN
588 strintmap_init_with_options(&info->idx_map, -1, NULL, 0);
589 strmap_init_with_options(&info->dir_rename_guess, NULL, 0);
ae8cf74d 590
333899e1 591 /* Setup info->relevant_source_dirs */
e4fd06e7
EN
592 info->relevant_source_dirs = NULL;
593 if (dirs_removed || !relevant_sources) {
594 info->relevant_source_dirs = dirs_removed; /* might be NULL */
595 } else {
596 info->relevant_source_dirs = xmalloc(sizeof(struct strintmap));
a49b55d5
EN
597 strintmap_init(info->relevant_source_dirs, 0 /* unused */);
598 strintmap_for_each_entry(relevant_sources, &iter, entry) {
e4fd06e7
EN
599 char *dirname = get_dirname(entry->key);
600 if (!dirs_removed ||
a49b55d5
EN
601 strintmap_contains(dirs_removed, dirname))
602 strintmap_set(info->relevant_source_dirs,
603 dirname, 0 /* value irrelevant */);
e4fd06e7
EN
604 free(dirname);
605 }
606 }
333899e1 607
ae8cf74d 608 /*
1ad69eb0
EN
609 * Loop setting up both info->idx_map, and doing setup of
610 * info->dir_rename_count.
ae8cf74d
EN
611 */
612 for (i = 0; i < rename_dst_nr; ++i) {
613 /*
614 * For non-renamed files, make idx_map contain mapping of
615 * filename -> index (index within rename_dst, that is)
616 */
617 if (!rename_dst[i].is_rename) {
618 char *filename = rename_dst[i].p->two->path;
619 strintmap_set(&info->idx_map, filename, i);
1ad69eb0 620 continue;
ae8cf74d 621 }
1ad69eb0
EN
622
623 /*
624 * For everything else (i.e. renamed files), make
625 * dir_rename_count contain a map of a map:
626 * old_directory -> {new_directory -> count}
627 * In other words, for every pair look at the directories for
628 * the old filename and the new filename and count how many
629 * times that pairing occurs.
630 */
631 update_dir_rename_counts(info, dirs_removed,
632 rename_dst[i].p->one->path,
633 rename_dst[i].p->two->path);
ae8cf74d 634 }
81afdf7a
EN
635
636 /*
637 * Now we collapse
638 * dir_rename_count: old_directory -> {new_directory -> count}
639 * down to
640 * dir_rename_guess: old_directory -> best_new_directory
641 * where best_new_directory is the one with the highest count.
642 */
643 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
644 /* entry->key is source_dir */
645 struct strintmap *counts = entry->value;
646 char *best_newdir;
647
648 best_newdir = xstrdup(get_highest_rename_path(counts));
649 strmap_put(&info->dir_rename_guess, entry->key,
650 best_newdir);
651 }
ae8cf74d
EN
652}
653
cd52e005
EN
654void partial_clear_dir_rename_count(struct strmap *dir_rename_count)
655{
656 struct hashmap_iter iter;
657 struct strmap_entry *entry;
658
659 strmap_for_each_entry(dir_rename_count, &iter, entry) {
660 struct strintmap *counts = entry->value;
661 strintmap_clear(counts);
662 }
663 strmap_partial_clear(dir_rename_count, 1);
664}
665
b1473019 666static void cleanup_dir_rename_info(struct dir_rename_info *info,
a49b55d5 667 struct strintmap *dirs_removed,
b1473019 668 int keep_dir_rename_count)
ae8cf74d 669{
b1473019
EN
670 struct hashmap_iter iter;
671 struct strmap_entry *entry;
672 struct string_list to_remove = STRING_LIST_INIT_NODUP;
673 int i;
674
ae8cf74d
EN
675 if (!info->setup)
676 return;
677
678 /* idx_map */
679 strintmap_clear(&info->idx_map);
680
681 /* dir_rename_guess */
682 strmap_clear(&info->dir_rename_guess, 1);
683
e4fd06e7
EN
684 /* relevant_source_dirs */
685 if (info->relevant_source_dirs &&
686 info->relevant_source_dirs != dirs_removed) {
a49b55d5 687 strintmap_clear(info->relevant_source_dirs);
e4fd06e7
EN
688 FREE_AND_NULL(info->relevant_source_dirs);
689 }
690
b6e3d274 691 /* dir_rename_count */
b1473019
EN
692 if (!keep_dir_rename_count) {
693 partial_clear_dir_rename_count(info->dir_rename_count);
694 strmap_clear(info->dir_rename_count, 1);
695 FREE_AND_NULL(info->dir_rename_count);
696 return;
697 }
698
699 /*
700 * Although dir_rename_count was passed in
701 * diffcore_rename_extended() and we want to keep it around and
702 * return it to that caller, we first want to remove any data
703 * associated with directories that weren't renamed.
704 */
705 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
706 const char *source_dir = entry->key;
707 struct strintmap *counts = entry->value;
708
fb52938e 709 if (!strintmap_get(dirs_removed, source_dir)) {
b1473019
EN
710 string_list_append(&to_remove, source_dir);
711 strintmap_clear(counts);
712 continue;
713 }
714 }
715 for (i = 0; i < to_remove.nr; ++i)
716 strmap_remove(info->dir_rename_count,
717 to_remove.items[i].string, 1);
718 string_list_clear(&to_remove, 0);
ae8cf74d
EN
719}
720
a35df337
EN
721static const char *get_basename(const char *filename)
722{
723 /*
724 * gitbasename() has to worry about special drives, multiple
725 * directory separator characters, trailing slashes, NULL or
726 * empty strings, etc. We only work on filenames as stored in
727 * git, and thus get to ignore all those complications.
728 */
729 const char *base = strrchr(filename, '/');
730 return base ? base + 1 : filename;
731}
732
bde8b9f3 733static int idx_possible_rename(char *filename, struct dir_rename_info *info)
37a25143 734{
bde8b9f3
EN
735 /*
736 * Our comparison of files with the same basename (see
737 * find_basename_matches() below), is only helpful when after exact
738 * rename detection we have exactly one file with a given basename
739 * among the rename sources and also only exactly one file with
740 * that basename among the rename destinations. When we have
741 * multiple files with the same basename in either set, we do not
742 * know which to compare against. However, there are some
743 * filenames that occur in large numbers (particularly
744 * build-related filenames such as 'Makefile', '.gitignore', or
745 * 'build.gradle' that potentially exist within every single
746 * subdirectory), and for performance we want to be able to quickly
747 * find renames for these files too.
748 *
749 * The reason basename comparisons are a useful heuristic was that it
750 * is common for people to move files across directories while keeping
751 * their filename the same. If we had a way of determining or even
752 * making a good educated guess about which directory these non-unique
753 * basename files had moved the file to, we could check it.
754 * Luckily...
755 *
756 * When an entire directory is in fact renamed, we have two factors
757 * helping us out:
758 * (a) the original directory disappeared giving us a hint
759 * about when we can apply an extra heuristic.
760 * (a) we often have several files within that directory and
761 * subdirectories that are renamed without changes
762 * So, rules for a heuristic:
763 * (0) If there basename matches are non-unique (the condition under
764 * which this function is called) AND
765 * (1) the directory in which the file was found has disappeared
766 * (i.e. dirs_removed is non-NULL and has a relevant entry) THEN
767 * (2) use exact renames of files within the directory to determine
768 * where the directory is likely to have been renamed to. IF
769 * there is at least one exact rename from within that
770 * directory, we can proceed.
771 * (3) If there are multiple places the directory could have been
772 * renamed to based on exact renames, ignore all but one of them.
773 * Just use the destination with the most renames going to it.
774 * (4) Check if applying that directory rename to the original file
775 * would result in a destination filename that is in the
776 * potential rename set. If so, return the index of the
777 * destination file (the index within rename_dst).
778 * (5) Compare the original file and returned destination for
779 * similarity, and if they are sufficiently similar, record the
780 * rename.
781 *
782 * This function, idx_possible_rename(), is only responsible for (4).
81afdf7a
EN
783 * The conditions/steps in (1)-(3) are handled via setting up
784 * dir_rename_count and dir_rename_guess in
785 * initialize_dir_rename_info(). Steps (0) and (5) are handled by
786 * the caller of this function.
bde8b9f3
EN
787 */
788 char *old_dir, *new_dir;
789 struct strbuf new_path = STRBUF_INIT;
790 int idx;
791
792 if (!info->setup)
793 return -1;
794
795 old_dir = get_dirname(filename);
796 new_dir = strmap_get(&info->dir_rename_guess, old_dir);
797 free(old_dir);
798 if (!new_dir)
799 return -1;
800
801 strbuf_addstr(&new_path, new_dir);
802 strbuf_addch(&new_path, '/');
803 strbuf_addstr(&new_path, get_basename(filename));
804
805 idx = strintmap_get(&info->idx_map, new_path.buf);
806 strbuf_release(&new_path);
807 return idx;
37a25143
EN
808}
809
a35df337 810static int find_basename_matches(struct diff_options *options,
bde8b9f3 811 int minimum_score,
1ad69eb0 812 struct dir_rename_info *info,
a49b55d5
EN
813 struct strintmap *relevant_sources,
814 struct strintmap *dirs_removed)
a35df337 815{
da09f651
EN
816 /*
817 * When I checked in early 2020, over 76% of file renames in linux
818 * just moved files to a different directory but kept the same
819 * basename. gcc did that with over 64% of renames, gecko did it
820 * with over 79%, and WebKit did it with over 89%.
821 *
822 * Therefore we can bypass the normal exhaustive NxM matrix
823 * comparison of similarities between all potential rename sources
824 * and destinations by instead using file basename as a hint (i.e.
825 * the portion of the filename after the last '/'), checking for
826 * similarity between files with the same basename, and if we find
827 * a pair that are sufficiently similar, record the rename pair and
828 * exclude those two from the NxM matrix.
829 *
830 * This *might* cause us to find a less than optimal pairing (if
831 * there is another file that we are even more similar to but has a
832 * different basename). Given the huge performance advantage
833 * basename matching provides, and given the frequency with which
834 * people use the same basename in real world projects, that's a
835 * trade-off we are willing to accept when doing just rename
836 * detection.
837 *
838 * If someone wants copy detection that implies they are willing to
839 * spend more cycles to find similarities between files, so it may
840 * be less likely that this heuristic is wanted. If someone is
841 * doing break detection, that means they do not want filename
842 * similarity to imply any form of content similiarity, and thus
843 * this heuristic would definitely be incompatible.
844 */
845
846 int i, renames = 0;
a35df337
EN
847 struct strintmap sources;
848 struct strintmap dests;
da09f651
EN
849
850 /*
851 * The prefeteching stuff wants to know if it can skip prefetching
852 * blobs that are unmodified...and will then do a little extra work
853 * to verify that the oids are indeed different before prefetching.
854 * Unmodified blobs are only relevant when doing copy detection;
855 * when limiting to rename detection, diffcore_rename[_extended]()
856 * will never be called with unmodified source paths fed to us, so
857 * the extra work necessary to check if rename_src entries are
858 * unmodified would be a small waste.
859 */
860 int skip_unmodified = 0;
a35df337
EN
861
862 /*
863 * Create maps of basename -> fullname(s) for remaining sources and
864 * dests.
865 */
866 strintmap_init_with_options(&sources, -1, NULL, 0);
867 strintmap_init_with_options(&dests, -1, NULL, 0);
868 for (i = 0; i < rename_src_nr; ++i) {
869 char *filename = rename_src[i].p->one->path;
870 const char *base;
871
872 /* exact renames removed in remove_unneeded_paths_from_src() */
873 assert(!rename_src[i].p->one->rename_used);
874
875 /* Record index within rename_src (i) if basename is unique */
876 base = get_basename(filename);
877 if (strintmap_contains(&sources, base))
878 strintmap_set(&sources, base, -1);
879 else
880 strintmap_set(&sources, base, i);
881 }
882 for (i = 0; i < rename_dst_nr; ++i) {
883 char *filename = rename_dst[i].p->two->path;
884 const char *base;
885
886 if (rename_dst[i].is_rename)
887 continue; /* involved in exact match already. */
888
889 /* Record index within rename_dst (i) if basename is unique */
890 base = get_basename(filename);
891 if (strintmap_contains(&dests, base))
892 strintmap_set(&dests, base, -1);
893 else
894 strintmap_set(&dests, base, i);
895 }
896
da09f651 897 /* Now look for basename matchups and do similarity estimation */
37a25143
EN
898 for (i = 0; i < rename_src_nr; ++i) {
899 char *filename = rename_src[i].p->one->path;
900 const char *base = NULL;
901 intptr_t src_index;
da09f651 902 intptr_t dst_index;
da09f651 903
e4fd06e7
EN
904 /* Skip irrelevant sources */
905 if (relevant_sources &&
a49b55d5 906 !strintmap_contains(relevant_sources, filename))
e4fd06e7
EN
907 continue;
908
37a25143
EN
909 /*
910 * If the basename is unique among remaining sources, then
911 * src_index will equal 'i' and we can attempt to match it
912 * to a unique basename in the destinations. Otherwise,
913 * use directory rename heuristics, if possible.
914 */
915 base = get_basename(filename);
916 src_index = strintmap_get(&sources, base);
917 assert(src_index == -1 || src_index == i);
918
919 if (strintmap_contains(&dests, base)) {
da09f651
EN
920 struct diff_filespec *one, *two;
921 int score;
922
37a25143
EN
923 /* Find a matching destination, if possible */
924 dst_index = strintmap_get(&dests, base);
925 if (src_index == -1 || dst_index == -1) {
926 src_index = i;
bde8b9f3 927 dst_index = idx_possible_rename(filename, info);
37a25143
EN
928 }
929 if (dst_index == -1)
930 continue;
931
932 /* Ignore this dest if already used in a rename */
933 if (rename_dst[dst_index].is_rename)
934 continue; /* already used previously */
935
da09f651
EN
936 /* Estimate the similarity */
937 one = rename_src[src_index].p->one;
938 two = rename_dst[dst_index].p->two;
939 score = estimate_similarity(options->repo, one, two,
940 minimum_score, skip_unmodified);
941
942 /* If sufficiently similar, record as rename pair */
943 if (score < minimum_score)
944 continue;
945 record_rename_pair(dst_index, src_index, score);
946 renames++;
1ad69eb0
EN
947 update_dir_rename_counts(info, dirs_removed,
948 one->path, two->path);
da09f651
EN
949
950 /*
951 * Found a rename so don't need text anymore; if we
952 * didn't find a rename, the filespec_blob would get
953 * re-used when doing the matrix of comparisons.
954 */
955 diff_free_filespec_blob(one);
956 diff_free_filespec_blob(two);
957 }
958 }
a35df337
EN
959
960 strintmap_clear(&sources);
961 strintmap_clear(&dests);
962
da09f651 963 return renames;
a35df337
EN
964}
965
6d24ad97
JH
966#define NUM_CANDIDATE_PER_DST 4
967static void record_if_better(struct diff_score m[], struct diff_score *o)
968{
969 int i, worst;
970
971 /* find the worst one */
972 worst = 0;
973 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
974 if (score_compare(&m[i], &m[worst]) > 0)
975 worst = i;
976
977 /* is it better than the worst one? */
978 if (score_compare(&m[worst], o) > 0)
979 m[worst] = *o;
980}
981
f31027c9
JH
982/*
983 * Returns:
984 * 0 if we are under the limit;
985 * 1 if we need to disable inexact rename detection;
986 * 2 if we would be under the limit if we were given -C instead of -C -C.
987 */
00b8cccd 988static int too_many_rename_candidates(int num_destinations, int num_sources,
9d8a5a50
JH
989 struct diff_options *options)
990{
991 int rename_limit = options->rename_limit;
00b8cccd 992 int i, limited_sources;
9d8a5a50
JH
993
994 options->needed_rename_limit = 0;
995
996 /*
997 * This basically does a test for the rename matrix not
998 * growing larger than a "rename_limit" square matrix, ie:
999 *
00b8cccd 1000 * num_destinations * num_sources > rename_limit * rename_limit
ad8a1be5
EN
1001 *
1002 * We use st_mult() to check overflow conditions; in the
1003 * exceptional circumstance that size_t isn't large enough to hold
1004 * the multiplication, the system won't be able to allocate enough
1005 * memory for the matrix anyway.
9d8a5a50 1006 */
89973554
JT
1007 if (rename_limit <= 0)
1008 rename_limit = 32767;
ad8a1be5
EN
1009 if (st_mult(num_destinations, num_sources)
1010 <= st_mult(rename_limit, rename_limit))
9d8a5a50
JH
1011 return 0;
1012
1013 options->needed_rename_limit =
00b8cccd 1014 num_sources > num_destinations ? num_sources : num_destinations;
f31027c9
JH
1015
1016 /* Are we running under -C -C? */
0d1e0e78 1017 if (!options->flags.find_copies_harder)
f31027c9
JH
1018 return 1;
1019
1020 /* Would we bust the limit if we were running under -C? */
00b8cccd 1021 for (limited_sources = i = 0; i < num_sources; i++) {
f31027c9
JH
1022 if (diff_unmodified_pair(rename_src[i].p))
1023 continue;
00b8cccd 1024 limited_sources++;
f31027c9 1025 }
ad8a1be5
EN
1026 if (st_mult(num_destinations, limited_sources)
1027 <= st_mult(rename_limit, rename_limit))
f31027c9 1028 return 2;
9d8a5a50
JH
1029 return 1;
1030}
1031
1ad69eb0
EN
1032static int find_renames(struct diff_score *mx,
1033 int dst_cnt,
1034 int minimum_score,
1035 int copies,
1036 struct dir_rename_info *info,
a49b55d5 1037 struct strintmap *dirs_removed)
0940e5f2
LT
1038{
1039 int count = 0, i;
1040
1041 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
1042 struct diff_rename_dst *dst;
1043
1044 if ((mx[i].dst < 0) ||
1045 (mx[i].score < minimum_score))
1046 break; /* there is no more usable pair. */
1047 dst = &rename_dst[mx[i].dst];
9db2ac56 1048 if (dst->is_rename)
0940e5f2 1049 continue; /* already done, either exact or fuzzy. */
e88d6bc6 1050 if (!copies && rename_src[mx[i].src].p->one->rename_used)
0940e5f2
LT
1051 continue;
1052 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
1053 count++;
1ad69eb0
EN
1054 update_dir_rename_counts(info, dirs_removed,
1055 rename_src[mx[i].src].p->one->path,
1056 rename_dst[mx[i].dst].p->two->path);
0940e5f2
LT
1057 }
1058 return count;
1059}
1060
9799889f 1061static void remove_unneeded_paths_from_src(int detecting_copies,
a49b55d5 1062 struct strintmap *interesting)
829514c5
EN
1063{
1064 int i, new_num_src;
1065
9799889f 1066 if (detecting_copies && !interesting)
829514c5
EN
1067 return; /* nothing to remove */
1068 if (break_idx)
1069 return; /* culling incompatible with break detection */
1070
1071 /*
1072 * Note on reasons why we cull unneeded sources but not destinations:
1073 * 1) Pairings are stored in rename_dst (not rename_src), which we
1074 * need to keep around. So, we just can't cull rename_dst even
1075 * if we wanted to. But doing so wouldn't help because...
1076 *
1077 * 2) There is a matrix pairwise comparison that follows the
1078 * "Performing inexact rename detection" progress message.
1079 * Iterating over the destinations is done in the outer loop,
1080 * hence we only iterate over each of those once and we can
1081 * easily skip the outer loop early if the destination isn't
1082 * relevant. That's only one check per destination path to
1083 * skip.
1084 *
1085 * By contrast, the sources are iterated in the inner loop; if
1086 * we check whether a source can be skipped, then we'll be
1087 * checking it N separate times, once for each destination.
1088 * We don't want to have to iterate over known-not-needed
1089 * sources N times each, so avoid that by removing the sources
1090 * from rename_src here.
1091 */
1092 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
9799889f
EN
1093 struct diff_filespec *one = rename_src[i].p->one;
1094
829514c5
EN
1095 /*
1096 * renames are stored in rename_dst, so if a rename has
1097 * already been detected using this source, we can just
1098 * remove the source knowing rename_dst has its info.
1099 */
9799889f
EN
1100 if (!detecting_copies && one->rename_used)
1101 continue;
1102
1103 /* If we don't care about the source path, skip it */
a49b55d5 1104 if (interesting && !strintmap_contains(interesting, one->path))
829514c5
EN
1105 continue;
1106
1107 if (new_num_src < i)
1108 memcpy(&rename_src[new_num_src], &rename_src[i],
1109 sizeof(struct diff_rename_src));
1110 new_num_src++;
1111 }
1112
1113 rename_src_nr = new_num_src;
1114}
1115
ae1db7b3 1116static void handle_early_known_dir_renames(struct dir_rename_info *info,
a49b55d5
EN
1117 struct strintmap *relevant_sources,
1118 struct strintmap *dirs_removed)
ae1db7b3
EN
1119{
1120 /*
0491d392
EN
1121 * Directory renames are determined via an aggregate of all renames
1122 * under them and using a "majority wins" rule. The fact that
1123 * "majority wins", though, means we don't need all the renames
1124 * under the given directory, we only need enough to ensure we have
1125 * a majority.
ae1db7b3 1126 */
0491d392
EN
1127
1128 struct hashmap_iter iter;
1129 struct strmap_entry *entry;
1130
1131 if (!dirs_removed || !relevant_sources)
1132 return; /* nothing to cull */
1133 if (break_idx)
1134 return; /* culling incompatbile with break detection */
1135
1136 /*
1137 * FIXME: Supplement dir_rename_count with number of potential
1138 * renames, marking all potential rename sources as mapping to
1139 * UNKNOWN_DIR.
1140 */
1141
1142 /*
1143 * For any directory which we need a potential rename detected for
1144 * (i.e. those marked as RELEVANT_FOR_SELF in dirs_removed), check
1145 * whether we have enough renames to satisfy the "majority rules"
1146 * requirement such that detecting any more renames of files under
1147 * it won't change the result. For any such directory, mark that
1148 * we no longer need to detect a rename for it. However, since we
1149 * might need to still detect renames for an ancestor of that
1150 * directory, use RELEVANT_FOR_ANCESTOR.
1151 */
1152 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
1153 /* entry->key is source_dir */
1154 struct strintmap *counts = entry->value;
1155
1156 if (strintmap_get(dirs_removed, entry->key) ==
1157 RELEVANT_FOR_SELF &&
1158 dir_rename_already_determinable(counts)) {
1159 strintmap_set(dirs_removed, entry->key,
1160 RELEVANT_FOR_ANCESTOR);
1161 }
1162 }
ae1db7b3
EN
1163}
1164
0c4fd732 1165void diffcore_rename_extended(struct diff_options *options,
a49b55d5
EN
1166 struct strintmap *relevant_sources,
1167 struct strintmap *dirs_removed,
0c4fd732 1168 struct strmap *dir_rename_count)
427dcb4b 1169{
8082d8d3
JH
1170 int detect_rename = options->detect_rename;
1171 int minimum_score = options->rename_score;
38c6f780 1172 struct diff_queue_struct *q = &diff_queued_diff;
5098bafb 1173 struct diff_queue_struct outq;
427dcb4b 1174 struct diff_score *mx;
f31027c9 1175 int i, j, rename_count, skip_unmodified = 0;
26a66a6b 1176 int num_destinations, dst_cnt;
f15eb7c1 1177 int num_sources, want_copies;
3ac942d4 1178 struct progress *progress = NULL;
bde8b9f3 1179 struct dir_rename_info info;
427dcb4b 1180
557ac035 1181 trace2_region_enter("diff", "setup", options->repo);
bde8b9f3 1182 info.setup = 0;
0c4fd732 1183 assert(!dir_rename_count || strmap_empty(dir_rename_count));
f15eb7c1 1184 want_copies = (detect_rename == DIFF_DETECT_COPY);
1ad69eb0
EN
1185 if (dirs_removed && (break_idx || want_copies))
1186 BUG("dirs_removed incompatible with break/copy detection");
9799889f
EN
1187 if (break_idx && relevant_sources)
1188 BUG("break detection incompatible with source specification");
26dee0ad 1189 if (!minimum_score)
f345b0a0 1190 minimum_score = DEFAULT_RENAME_SCORE;
427dcb4b 1191
427dcb4b 1192 for (i = 0; i < q->nr; i++) {
52e95789 1193 struct diff_filepair *p = q->queue[i];
2f3f8b21 1194 if (!DIFF_FILE_VALID(p->one)) {
81e50eab 1195 if (!DIFF_FILE_VALID(p->two))
60896c7b 1196 continue; /* unmerged */
2f3f8b21
JH
1197 else if (options->single_follow &&
1198 strcmp(options->single_follow, p->two->path))
1199 continue; /* not interested */
0d1e0e78 1200 else if (!options->flags.rename_empty &&
02491b67 1201 is_empty_blob_oid(&p->two->oid))
90d43b07 1202 continue;
9db2ac56 1203 else if (add_rename_dst(p) < 0) {
4d6be03b
JK
1204 warning("skipping rename detection, detected"
1205 " duplicate destination '%s'",
1206 p->two->path);
1207 goto cleanup;
1208 }
2f3f8b21 1209 }
0d1e0e78 1210 else if (!options->flags.rename_empty &&
02491b67 1211 is_empty_blob_oid(&p->one->oid))
90d43b07 1212 continue;
d7c9bf22 1213 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
64479711
LT
1214 /*
1215 * If the source is a broken "delete", and
2210100a
JH
1216 * they did not really want to get broken,
1217 * that means the source actually stays.
64479711
LT
1218 * So we increment the "rename_used" score
1219 * by one, to indicate ourselves as a user
1220 */
1221 if (p->broken_pair && !p->score)
1222 p->one->rename_used++;
e88d6bc6 1223 register_rename_src(p);
64479711 1224 }
f15eb7c1 1225 else if (want_copies) {
64479711
LT
1226 /*
1227 * Increment the "rename_used" score by
1228 * one, to indicate ourselves as a user.
2210100a 1229 */
64479711 1230 p->one->rename_used++;
e88d6bc6 1231 register_rename_src(p);
2210100a 1232 }
427dcb4b 1233 }
557ac035 1234 trace2_region_leave("diff", "setup", options->repo);
0024a549 1235 if (rename_dst_nr == 0 || rename_src_nr == 0)
427dcb4b
JH
1236 goto cleanup; /* nothing to do */
1237
557ac035 1238 trace2_region_enter("diff", "exact renames", options->repo);
17559a64
LT
1239 /*
1240 * We really want to cull the candidates list early
1241 * with cheap tests in order to avoid doing deltas.
1242 */
11f944dd 1243 rename_count = find_exact_renames(options);
557ac035 1244 trace2_region_leave("diff", "exact renames", options->repo);
17559a64 1245
42899ac8
LT
1246 /* Did we only want exact renames? */
1247 if (minimum_score == MAX_SCORE)
1248 goto cleanup;
1249
f15eb7c1 1250 num_sources = rename_src_nr;
42899ac8 1251
bd24aa2f
EN
1252 if (want_copies || break_idx) {
1253 /*
1254 * Cull sources:
1255 * - remove ones corresponding to exact renames
9799889f 1256 * - remove ones not found in relevant_sources
bd24aa2f
EN
1257 */
1258 trace2_region_enter("diff", "cull after exact", options->repo);
9799889f 1259 remove_unneeded_paths_from_src(want_copies, relevant_sources);
bd24aa2f
EN
1260 trace2_region_leave("diff", "cull after exact", options->repo);
1261 } else {
1262 /* Determine minimum score to match basenames */
1263 double factor = 0.5;
1264 char *basename_factor = getenv("GIT_BASENAME_FACTOR");
1265 int min_basename_score;
1266
1267 if (basename_factor)
1268 factor = strtol(basename_factor, NULL, 10)/100.0;
1269 assert(factor >= 0.0 && factor <= 1.0);
1270 min_basename_score = minimum_score +
1271 (int)(factor * (MAX_SCORE - minimum_score));
1272
1273 /*
1274 * Cull sources:
1275 * - remove ones involved in renames (found via exact match)
1276 */
1277 trace2_region_enter("diff", "cull after exact", options->repo);
9799889f 1278 remove_unneeded_paths_from_src(want_copies, NULL);
bd24aa2f
EN
1279 trace2_region_leave("diff", "cull after exact", options->repo);
1280
ae8cf74d
EN
1281 /* Preparation for basename-driven matching. */
1282 trace2_region_enter("diff", "dir rename setup", options->repo);
e4fd06e7 1283 initialize_dir_rename_info(&info, relevant_sources,
1ad69eb0 1284 dirs_removed, dir_rename_count);
ae8cf74d
EN
1285 trace2_region_leave("diff", "dir rename setup", options->repo);
1286
bd24aa2f
EN
1287 /* Utilize file basenames to quickly find renames. */
1288 trace2_region_enter("diff", "basename matches", options->repo);
1289 rename_count += find_basename_matches(options,
bde8b9f3 1290 min_basename_score,
e4fd06e7
EN
1291 &info,
1292 relevant_sources,
1293 dirs_removed);
bd24aa2f
EN
1294 trace2_region_leave("diff", "basename matches", options->repo);
1295
1296 /*
1297 * Cull sources, again:
1298 * - remove ones involved in renames (found via basenames)
9799889f 1299 * - remove ones not found in relevant_sources
ae1db7b3
EN
1300 * and
1301 * - remove ones in relevant_sources which are needed only
1302 * for directory renames IF no ancestory directory
1303 * actually needs to know any more individual path
1304 * renames under them
bd24aa2f
EN
1305 */
1306 trace2_region_enter("diff", "cull basename", options->repo);
9799889f 1307 remove_unneeded_paths_from_src(want_copies, relevant_sources);
ae1db7b3
EN
1308 handle_early_known_dir_renames(&info, relevant_sources,
1309 dirs_removed);
bd24aa2f
EN
1310 trace2_region_leave("diff", "cull basename", options->repo);
1311 }
1312
1313 /* Calculate how many rename destinations are left */
1314 num_destinations = (rename_dst_nr - rename_count);
1315 num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
1316
42899ac8 1317 /* All done? */
f15eb7c1 1318 if (!num_destinations || !num_sources)
42899ac8
LT
1319 goto cleanup;
1320
f15eb7c1 1321 switch (too_many_rename_candidates(num_destinations, num_sources,
00b8cccd 1322 options)) {
f31027c9 1323 case 1:
0024a549 1324 goto cleanup;
f31027c9
JH
1325 case 2:
1326 options->degraded_cc_to_c = 1;
1327 skip_unmodified = 1;
1328 break;
1329 default:
1330 break;
1331 }
0024a549 1332
557ac035 1333 trace2_region_enter("diff", "inexact renames", options->repo);
3ac942d4 1334 if (options->show_rename_progress) {
8aade107 1335 progress = start_delayed_progress(
754dbc43 1336 _("Performing inexact rename detection"),
f15eb7c1 1337 (uint64_t)num_destinations * (uint64_t)num_sources);
3ac942d4
JK
1338 }
1339
26a66a6b
EN
1340 mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_destinations),
1341 sizeof(*mx));
25d5ea41 1342 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
9db2ac56 1343 struct diff_filespec *two = rename_dst[i].p->two;
6d24ad97
JH
1344 struct diff_score *m;
1345
9db2ac56 1346 if (rename_dst[i].is_rename)
bd24aa2f 1347 continue; /* exact or basename match already handled */
6d24ad97
JH
1348
1349 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
1350 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
1351 m[j].dst = -1;
1352
25d5ea41 1353 for (j = 0; j < rename_src_nr; j++) {
e88d6bc6 1354 struct diff_filespec *one = rename_src[j].p->one;
6d24ad97 1355 struct diff_score this_src;
f31027c9 1356
829514c5 1357 assert(!one->rename_used || want_copies || break_idx);
f15eb7c1 1358
f31027c9
JH
1359 if (skip_unmodified &&
1360 diff_unmodified_pair(rename_src[j].p))
1361 continue;
1362
b78ea5fc
NTND
1363 this_src.score = estimate_similarity(options->repo,
1364 one, two,
95acf11a
JT
1365 minimum_score,
1366 skip_unmodified);
6d24ad97
JH
1367 this_src.name_score = basename_same(one, two);
1368 this_src.dst = i;
1369 this_src.src = j;
1370 record_if_better(m, &this_src);
809809bb
JH
1371 /*
1372 * Once we run estimate_similarity,
1373 * We do not need the text anymore.
1374 */
8ae92e63 1375 diff_free_filespec_blob(one);
809809bb 1376 diff_free_filespec_blob(two);
427dcb4b
JH
1377 }
1378 dst_cnt++;
81c4bf02 1379 display_progress(progress,
f15eb7c1 1380 (uint64_t)dst_cnt * (uint64_t)num_sources);
427dcb4b 1381 }
3ac942d4 1382 stop_progress(&progress);
6d24ad97 1383
427dcb4b 1384 /* cost matrix sorted by most to least similar pair */
2049b8dc 1385 STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
6d24ad97 1386
1ad69eb0
EN
1387 rename_count += find_renames(mx, dst_cnt, minimum_score, 0,
1388 &info, dirs_removed);
f15eb7c1 1389 if (want_copies)
1ad69eb0
EN
1390 rename_count += find_renames(mx, dst_cnt, minimum_score, 1,
1391 &info, dirs_removed);
427dcb4b 1392 free(mx);
557ac035 1393 trace2_region_leave("diff", "inexact renames", options->repo);
427dcb4b 1394
15d061b4 1395 cleanup:
427dcb4b 1396 /* At this point, we have found some renames and copies and they
5098bafb 1397 * are recorded in rename_dst. The original list is still in *q.
427dcb4b 1398 */
557ac035 1399 trace2_region_enter("diff", "write back to queue", options->repo);
9ca5df90 1400 DIFF_QUEUE_CLEAR(&outq);
427dcb4b 1401 for (i = 0; i < q->nr; i++) {
25d5ea41 1402 struct diff_filepair *p = q->queue[i];
25d5ea41
JH
1403 struct diff_filepair *pair_to_free = NULL;
1404
d7c9bf22
MZ
1405 if (DIFF_PAIR_UNMERGED(p)) {
1406 diff_q(&outq, p);
1407 }
1408 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
9db2ac56
EN
1409 /* Creation */
1410 diff_q(&outq, p);
427dcb4b 1411 }
2cd68882
JH
1412 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
1413 /*
1414 * Deletion
1415 *
f345b0a0
JH
1416 * We would output this delete record if:
1417 *
1418 * (1) this is a broken delete and the counterpart
1419 * broken create remains in the output; or
5098bafb
JH
1420 * (2) this is not a broken delete, and rename_dst
1421 * does not have a rename/copy to move p->one->path
1422 * out of existence.
f345b0a0
JH
1423 *
1424 * Otherwise, the counterpart broken create
1425 * has been turned into a rename-edit; or
1426 * delete did not have a matching create to
1427 * begin with.
2cd68882 1428 */
f345b0a0
JH
1429 if (DIFF_PAIR_BROKEN(p)) {
1430 /* broken delete */
9db2ac56
EN
1431 struct diff_rename_dst *dst = locate_rename_dst(p);
1432 if (!dst)
1433 BUG("tracking failed somehow; failed to find associated dst for broken pair");
1434 if (dst->is_rename)
f345b0a0
JH
1435 /* counterpart is now rename/copy */
1436 pair_to_free = p;
1437 }
1438 else {
64479711 1439 if (p->one->rename_used)
f345b0a0
JH
1440 /* this path remains */
1441 pair_to_free = p;
1442 }
2cd68882 1443
9db2ac56 1444 if (!pair_to_free)
2cd68882
JH
1445 diff_q(&outq, p);
1446 }
25d5ea41 1447 else if (!diff_unmodified_pair(p))
15d061b4 1448 /* all the usual ones need to be kept */
25d5ea41 1449 diff_q(&outq, p);
15d061b4 1450 else
9db2ac56 1451 /* no need to keep unmodified pairs; FIXME: remove earlier? */
15d061b4
JH
1452 pair_to_free = p;
1453
226406f6
JH
1454 if (pair_to_free)
1455 diff_free_filepair(pair_to_free);
427dcb4b 1456 }
25d5ea41 1457 diff_debug_queue("done copying original", &outq);
427dcb4b 1458
25d5ea41
JH
1459 free(q->queue);
1460 *q = outq;
1461 diff_debug_queue("done collapsing", q);
427dcb4b 1462
9fb88419 1463 for (i = 0; i < rename_dst_nr; i++)
9db2ac56
EN
1464 if (rename_dst[i].filespec_to_free)
1465 free_filespec(rename_dst[i].filespec_to_free);
5098bafb 1466
b1473019 1467 cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
6a83d902 1468 FREE_AND_NULL(rename_dst);
25d5ea41 1469 rename_dst_nr = rename_dst_alloc = 0;
6a83d902 1470 FREE_AND_NULL(rename_src);
25d5ea41 1471 rename_src_nr = rename_src_alloc = 0;
9db2ac56
EN
1472 if (break_idx) {
1473 strintmap_clear(break_idx);
1474 FREE_AND_NULL(break_idx);
1475 }
557ac035 1476 trace2_region_leave("diff", "write back to queue", options->repo);
427dcb4b
JH
1477 return;
1478}
0c4fd732
EN
1479
1480void diffcore_rename(struct diff_options *options)
1481{
9799889f 1482 diffcore_rename_extended(options, NULL, NULL, NULL);
0c4fd732 1483}