blob: 0b7e4989a87214faa22e4f8ec75a719d3fd857ae [file] [log] [blame]
Junio C Hamano427dcb42005-05-21 02:39:09 -07001/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#include "cache.h"
5#include "diff.h"
6#include "diffcore.h"
Karsten Bleesf79d9c52013-11-14 20:20:26 +01007#include "hashmap.h"
Jeff King3ac942d2011-02-20 04:51:16 -05008#include "progress.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -07009
Junio C Hamano25d5ea42005-05-24 01:10:48 -070010/* Table of rename/copy destinations */
Junio C Hamano427dcb42005-05-21 02:39:09 -070011
Junio C Hamano25d5ea42005-05-24 01:10:48 -070012static struct diff_rename_dst {
13 struct diff_filespec *two;
14 struct diff_filepair *pair;
15} *rename_dst;
16static int rename_dst_nr, rename_dst_alloc;
17
Jeff Kingf98c2f72015-02-26 20:39:48 -050018static int find_rename_dst(struct diff_filespec *two)
Junio C Hamano427dcb42005-05-21 02:39:09 -070019{
Junio C Hamano25d5ea42005-05-24 01:10:48 -070020 int first, last;
21
22 first = 0;
23 last = rename_dst_nr;
24 while (last > first) {
25 int next = (last + first) >> 1;
26 struct diff_rename_dst *dst = &(rename_dst[next]);
27 int cmp = strcmp(two->path, dst->two->path);
28 if (!cmp)
Jeff Kingf98c2f72015-02-26 20:39:48 -050029 return next;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070030 if (cmp < 0) {
31 last = next;
32 continue;
33 }
34 first = next+1;
35 }
Jeff Kingf98c2f72015-02-26 20:39:48 -050036 return -first - 1;
37}
38
39static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two)
40{
41 int ofs = find_rename_dst(two);
42 return ofs < 0 ? NULL : &rename_dst[ofs];
43}
44
45/*
46 * Returns 0 on success, -1 if we found a duplicate.
47 */
48static int add_rename_dst(struct diff_filespec *two)
49{
50 int first = find_rename_dst(two);
51
52 if (first >= 0)
53 return -1;
54 first = -first - 1;
55
Junio C Hamano25d5ea42005-05-24 01:10:48 -070056 /* insert to make it at "first" */
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040057 ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070058 rename_dst_nr++;
59 if (first < rename_dst_nr)
SZEDER Gáborf919ffe2018-01-22 18:50:09 +010060 MOVE_ARRAY(rename_dst + first + 1, rename_dst + first,
61 rename_dst_nr - first - 1);
Junio C Hamano5098baf2005-09-15 16:13:43 -070062 rename_dst[first].two = alloc_filespec(two->path);
Brandon Williamsf9704c22017-05-30 10:30:50 -070063 fill_filespec(rename_dst[first].two, &two->oid, two->oid_valid,
brian m. carlsona0d12c42016-06-24 23:09:23 +000064 two->mode);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070065 rename_dst[first].pair = NULL;
Jeff Kingf98c2f72015-02-26 20:39:48 -050066 return 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -070067}
68
Junio C Hamano15d061b2005-05-27 15:55:55 -070069/* Table of rename/copy src files */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070070static struct diff_rename_src {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080071 struct diff_filepair *p;
Junio C Hamanofc580712006-04-08 20:17:46 -070072 unsigned short score; /* to remember the break score */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070073} *rename_src;
74static int rename_src_nr, rename_src_alloc;
Junio C Hamano427dcb42005-05-21 02:39:09 -070075
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080076static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
Junio C Hamano25d5ea42005-05-24 01:10:48 -070077{
78 int first, last;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080079 struct diff_filespec *one = p->one;
80 unsigned short score = p->score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070081
82 first = 0;
83 last = rename_src_nr;
84 while (last > first) {
85 int next = (last + first) >> 1;
86 struct diff_rename_src *src = &(rename_src[next]);
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080087 int cmp = strcmp(one->path, src->p->one->path);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070088 if (!cmp)
89 return src;
90 if (cmp < 0) {
91 last = next;
92 continue;
93 }
94 first = next+1;
Junio C Hamano427dcb42005-05-21 02:39:09 -070095 }
Junio C Hamano15d061b2005-05-27 15:55:55 -070096
Junio C Hamano25d5ea42005-05-24 01:10:48 -070097 /* insert to make it at "first" */
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040098 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070099 rename_src_nr++;
100 if (first < rename_src_nr)
SZEDER Gáborf919ffe2018-01-22 18:50:09 +0100101 MOVE_ARRAY(rename_src + first + 1, rename_src + first,
102 rename_src_nr - first - 1);
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800103 rename_src[first].p = p;
Junio C Hamanofc580712006-04-08 20:17:46 -0700104 rename_src[first].score = score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700105 return &(rename_src[first]);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700106}
107
Johannes Schindelin0ce39642007-06-21 12:52:11 +0100108static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
109{
110 int src_len = strlen(src->path), dst_len = strlen(dst->path);
111 while (src_len && dst_len) {
112 char c1 = src->path[--src_len];
113 char c2 = dst->path[--dst_len];
114 if (c1 != c2)
115 return 0;
116 if (c1 == '/')
117 return 1;
118 }
119 return (!src_len || src->path[src_len - 1] == '/') &&
120 (!dst_len || dst->path[dst_len - 1] == '/');
121}
122
Junio C Hamano427dcb42005-05-21 02:39:09 -0700123struct diff_score {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700124 int src; /* index in rename_src */
125 int dst; /* index in rename_dst */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800126 unsigned short score;
127 short name_score;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700128};
129
130static int estimate_similarity(struct diff_filespec *src,
131 struct diff_filespec *dst,
132 int minimum_score)
133{
134 /* src points at a file that existed in the original tree (or
135 * optionally a file in the destination tree) and dst points
136 * at a newly created file. They may be quite similar, in which
137 * case we want to say src is renamed to dst or src is copied into
138 * dst, and then some edit has been applied to dst.
139 *
140 * Compare them and return how similar they are, representing
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700141 * the score as an integer between 0 and MAX_SCORE.
142 *
143 * When there is an exact match, it is considered a better
144 * match than anything else; the destination does not even
145 * call into this function in that case.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700146 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800147 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700148 int score;
149
Junio C Hamano60896c72005-05-22 21:24:49 -0700150 /* We deal only with regular files. Symlink renames are handled
151 * only when they are exact matches --- in other words, no edits
152 * after renaming.
153 */
154 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
155 return 0;
156
Linus Torvalds81ac0512007-10-26 16:51:28 -0700157 /*
158 * Need to check that source and destination sizes are
159 * filled in before comparing them.
160 *
161 * If we already have "cnt_data" filled in, we know it's
162 * all good (avoid checking the size for zero, as that
163 * is a possible size - we really should have a flag to
164 * say whether the size is valid or not!)
165 */
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700166 if (!src->cnt_data &&
167 diff_populate_filespec(src, CHECK_SIZE_ONLY))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700168 return 0;
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700169 if (!dst->cnt_data &&
170 diff_populate_filespec(dst, CHECK_SIZE_ONLY))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700171 return 0;
172
Linus Torvalds90bd9322006-03-12 22:26:34 -0800173 max_size = ((src->size > dst->size) ? src->size : dst->size);
Junio C Hamano58b103f2005-05-21 15:55:18 -0700174 base_size = ((src->size < dst->size) ? src->size : dst->size);
Linus Torvalds90bd9322006-03-12 22:26:34 -0800175 delta_size = max_size - base_size;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700176
Junio C Hamano58b103f2005-05-21 15:55:18 -0700177 /* We would not consider edits that change the file size so
178 * drastically. delta_size must be smaller than
Junio C Hamanocd1870e2005-05-22 01:31:28 -0700179 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700180 *
Junio C Hamano58b103f2005-05-21 15:55:18 -0700181 * Note that base_size == 0 case is handled here already
182 * and the final score computation below would not have a
183 * divide-by-zero issue.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700184 */
Linus Torvalds3a4d6762011-02-18 20:12:06 -0800185 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700186 return 0;
187
Björn Steinbrink885c7162009-01-20 16:59:57 +0100188 if (!src->cnt_data && diff_populate_filespec(src, 0))
189 return 0;
190 if (!dst->cnt_data && diff_populate_filespec(dst, 0))
191 return 0;
192
Junio C Hamanod8c3d032007-06-28 22:54:37 -0700193 if (diffcore_count_changes(src, dst,
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800194 &src->cnt_data, &dst->cnt_data,
Junio C Hamano65416752006-02-28 16:01:36 -0800195 &src_copied, &literal_added))
Junio C Hamano75c660a2005-06-28 16:58:27 -0700196 return 0;
Junio C Hamano85976972005-05-24 12:09:32 -0700197
Junio C Hamano17063062006-03-02 22:11:25 -0800198 /* How similar are they?
199 * what percentage of material in dst are from source?
Junio C Hamano427dcb42005-05-21 02:39:09 -0700200 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800201 if (!dst->size)
Junio C Hamano17063062006-03-02 22:11:25 -0800202 score = 0; /* should not happen */
René Scharfecfc0aef2007-06-25 00:23:28 +0200203 else
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500204 score = (int)(src_copied * MAX_SCORE / max_size);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700205 return score;
206}
207
Junio C Hamano5098baf2005-09-15 16:13:43 -0700208static void record_rename_pair(int dst_index, int src_index, int score)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700209{
Linus Torvalds9fb88412007-10-25 11:19:10 -0700210 struct diff_filespec *src, *dst;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700211 struct diff_filepair *dp;
Junio C Hamanof7c15122005-05-22 21:26:09 -0700212
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700213 if (rename_dst[dst_index].pair)
214 die("internal error: dst already matched.");
215
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800216 src = rename_src[src_index].p->one;
Linus Torvalds64479712007-10-25 11:20:56 -0700217 src->rename_used++;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700218 src->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700219
220 dst = rename_dst[dst_index].two;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700221 dst->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700222
Linus Torvalds9fb88412007-10-25 11:19:10 -0700223 dp = diff_queue(NULL, src, dst);
Junio C Hamanoef677682006-08-03 12:01:01 -0700224 dp->renamed_pair = 1;
Junio C Hamanofc580712006-04-08 20:17:46 -0700225 if (!strcmp(src->path, dst->path))
226 dp->score = rename_src[src_index].score;
227 else
228 dp->score = score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700229 rename_dst[dst_index].pair = dp;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700230}
231
232/*
233 * We sort the rename similarity matrix with the score, in descending
Junio C Hamano15d061b2005-05-27 15:55:55 -0700234 * order (the most similar first).
Junio C Hamano427dcb42005-05-21 02:39:09 -0700235 */
236static int score_compare(const void *a_, const void *b_)
237{
238 const struct diff_score *a = a_, *b = b_;
René Scharfecfc0aef2007-06-25 00:23:28 +0200239
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800240 /* sink the unused ones to the bottom */
241 if (a->dst < 0)
242 return (0 <= b->dst);
243 else if (b->dst < 0)
244 return -1;
245
René Scharfecfc0aef2007-06-25 00:23:28 +0200246 if (a->score == b->score)
247 return b->name_score - a->name_score;
248
Junio C Hamano427dcb42005-05-21 02:39:09 -0700249 return b->score - a->score;
250}
251
Linus Torvalds9027f532007-10-25 11:23:26 -0700252struct file_similarity {
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100253 struct hashmap_entry entry;
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100254 int index;
Linus Torvalds9027f532007-10-25 11:23:26 -0700255 struct diff_filespec *filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700256};
257
Karsten Blees48f64072013-11-14 20:19:04 +0100258static unsigned int hash_filespec(struct diff_filespec *filespec)
259{
brian m. carlson41c95602016-06-24 23:09:24 +0000260 if (!filespec->oid_valid) {
Karsten Blees48f64072013-11-14 20:19:04 +0100261 if (diff_populate_filespec(filespec, 0))
262 return 0;
Patryk Obaraf070fac2018-01-28 01:13:13 +0100263 hash_object_file(filespec->data, filespec->size, "blob",
264 &filespec->oid);
Karsten Blees48f64072013-11-14 20:19:04 +0100265 }
brian m. carlsona0d12c42016-06-24 23:09:23 +0000266 return sha1hash(filespec->oid.hash);
Karsten Blees48f64072013-11-14 20:19:04 +0100267}
268
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100269static int find_identical_files(struct hashmap *srcs,
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100270 int dst_index,
Linus Torvalds11f944d2011-02-18 19:55:19 -0800271 struct diff_options *options)
Linus Torvalds9027f532007-10-25 11:23:26 -0700272{
273 int renames = 0;
274
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100275 struct diff_filespec *target = rename_dst[dst_index].two;
Karsten Bleesab73a9d2014-07-03 00:22:11 +0200276 struct file_similarity *p, *best = NULL;
Karsten Blees48f64072013-11-14 20:19:04 +0100277 int i = 100, best_score = -1;
Linus Torvalds9027f532007-10-25 11:23:26 -0700278
Karsten Blees48f64072013-11-14 20:19:04 +0100279 /*
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100280 * Find the best source match for specified destination.
Karsten Blees48f64072013-11-14 20:19:04 +0100281 */
Karsten Bleesab73a9d2014-07-03 00:22:11 +0200282 p = hashmap_get_from_hash(srcs, hash_filespec(target), NULL);
283 for (; p; p = hashmap_get_next(srcs, p)) {
Karsten Blees48f64072013-11-14 20:19:04 +0100284 int score;
285 struct diff_filespec *source = p->filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700286
Karsten Blees48f64072013-11-14 20:19:04 +0100287 /* False hash collision? */
brian m. carlsona0d12c42016-06-24 23:09:23 +0000288 if (oidcmp(&source->oid, &target->oid))
Karsten Blees48f64072013-11-14 20:19:04 +0100289 continue;
290 /* Non-regular files? If so, the modes must match! */
291 if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
292 if (source->mode != target->mode)
Linus Torvalds9027f532007-10-25 11:23:26 -0700293 continue;
Karsten Blees48f64072013-11-14 20:19:04 +0100294 }
295 /* Give higher scores to sources that haven't been used already */
296 score = !source->rename_used;
297 if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
298 continue;
299 score += basename_same(source, target);
300 if (score > best_score) {
301 best = p;
302 best_score = score;
303 if (score == 2)
Linus Torvalds9027f532007-10-25 11:23:26 -0700304 break;
305 }
Karsten Blees48f64072013-11-14 20:19:04 +0100306
307 /* Too many identical alternatives? Pick one */
308 if (!--i)
309 break;
310 }
311 if (best) {
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100312 record_rename_pair(dst_index, best->index, MAX_SCORE);
Karsten Blees48f64072013-11-14 20:19:04 +0100313 renames++;
314 }
Linus Torvalds9027f532007-10-25 11:23:26 -0700315 return renames;
316}
317
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100318static void insert_file_table(struct hashmap *table, int index, struct diff_filespec *filespec)
Linus Torvalds9027f532007-10-25 11:23:26 -0700319{
Linus Torvalds9027f532007-10-25 11:23:26 -0700320 struct file_similarity *entry = xmalloc(sizeof(*entry));
321
Linus Torvalds9027f532007-10-25 11:23:26 -0700322 entry->index = index;
323 entry->filespec = filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700324
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100325 hashmap_entry_init(entry, hash_filespec(filespec));
326 hashmap_add(table, entry);
Linus Torvalds9027f532007-10-25 11:23:26 -0700327}
328
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700329/*
330 * Find exact renames first.
331 *
332 * The first round matches up the up-to-date entries,
333 * and then during the second round we try to match
334 * cache-dirty entries as well.
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700335 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800336static int find_exact_renames(struct diff_options *options)
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700337{
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100338 int i, renames = 0;
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100339 struct hashmap file_table;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700340
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200341 /* Add all sources to the hash table in reverse order, because
342 * later on they will be retrieved in LIFO order.
343 */
Stefan Beller7663cdc2017-06-30 12:14:05 -0700344 hashmap_init(&file_table, NULL, NULL, rename_src_nr);
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200345 for (i = rename_src_nr-1; i >= 0; i--)
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100346 insert_file_table(&file_table, i, rename_src[i].p->one);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700347
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100348 /* Walk the destinations and find best source match */
Linus Torvalds9027f532007-10-25 11:23:26 -0700349 for (i = 0; i < rename_dst_nr; i++)
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100350 renames += find_identical_files(&file_table, i, options);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700351
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100352 /* Free the hash data structure and entries */
353 hashmap_free(&file_table, 1);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700354
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100355 return renames;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700356}
357
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800358#define NUM_CANDIDATE_PER_DST 4
359static void record_if_better(struct diff_score m[], struct diff_score *o)
360{
361 int i, worst;
362
363 /* find the worst one */
364 worst = 0;
365 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
366 if (score_compare(&m[i], &m[worst]) > 0)
367 worst = i;
368
369 /* is it better than the worst one? */
370 if (score_compare(&m[worst], o) > 0)
371 m[worst] = *o;
372}
373
Junio C Hamanof31027c2011-01-06 13:50:06 -0800374/*
375 * Returns:
376 * 0 if we are under the limit;
377 * 1 if we need to disable inexact rename detection;
378 * 2 if we would be under the limit if we were given -C instead of -C -C.
379 */
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800380static int too_many_rename_candidates(int num_create,
381 struct diff_options *options)
382{
383 int rename_limit = options->rename_limit;
384 int num_src = rename_src_nr;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800385 int i;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800386
387 options->needed_rename_limit = 0;
388
389 /*
390 * This basically does a test for the rename matrix not
391 * growing larger than a "rename_limit" square matrix, ie:
392 *
393 * num_create * num_src > rename_limit * rename_limit
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800394 */
Jonathan Tan89973552017-11-29 12:11:54 -0800395 if (rename_limit <= 0)
396 rename_limit = 32767;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800397 if ((num_create <= rename_limit || num_src <= rename_limit) &&
Elijah Newren9f7e4bf2017-11-13 12:15:59 -0800398 ((uint64_t)num_create * (uint64_t)num_src
399 <= (uint64_t)rename_limit * (uint64_t)rename_limit))
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800400 return 0;
401
402 options->needed_rename_limit =
403 num_src > num_create ? num_src : num_create;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800404
405 /* Are we running under -C -C? */
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700406 if (!options->flags.find_copies_harder)
Junio C Hamanof31027c2011-01-06 13:50:06 -0800407 return 1;
408
409 /* Would we bust the limit if we were running under -C? */
410 for (num_src = i = 0; i < rename_src_nr; i++) {
411 if (diff_unmodified_pair(rename_src[i].p))
412 continue;
413 num_src++;
414 }
415 if ((num_create <= rename_limit || num_src <= rename_limit) &&
Elijah Newren9f7e4bf2017-11-13 12:15:59 -0800416 ((uint64_t)num_create * (uint64_t)num_src
417 <= (uint64_t)rename_limit * (uint64_t)rename_limit))
Junio C Hamanof31027c2011-01-06 13:50:06 -0800418 return 2;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800419 return 1;
420}
421
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800422static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
423{
424 int count = 0, i;
425
426 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
427 struct diff_rename_dst *dst;
428
429 if ((mx[i].dst < 0) ||
430 (mx[i].score < minimum_score))
431 break; /* there is no more usable pair. */
432 dst = &rename_dst[mx[i].dst];
433 if (dst->pair)
434 continue; /* already done, either exact or fuzzy. */
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800435 if (!copies && rename_src[mx[i].src].p->one->rename_used)
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800436 continue;
437 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
438 count++;
439 }
440 return count;
441}
442
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700443void diffcore_rename(struct diff_options *options)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700444{
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700445 int detect_rename = options->detect_rename;
446 int minimum_score = options->rename_score;
Junio C Hamano38c6f782005-05-21 19:40:36 -0700447 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano5098baf2005-09-15 16:13:43 -0700448 struct diff_queue_struct outq;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700449 struct diff_score *mx;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800450 int i, j, rename_count, skip_unmodified = 0;
Jim Meyeringdabdbee2011-04-29 11:42:41 +0200451 int num_create, dst_cnt;
Jeff King3ac942d2011-02-20 04:51:16 -0500452 struct progress *progress = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700453
Junio C Hamano26dee0a2005-05-21 23:33:32 -0700454 if (!minimum_score)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700455 minimum_score = DEFAULT_RENAME_SCORE;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700456
Junio C Hamano427dcb42005-05-21 02:39:09 -0700457 for (i = 0; i < q->nr; i++) {
Junio C Hamano52e95782005-05-21 02:40:01 -0700458 struct diff_filepair *p = q->queue[i];
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800459 if (!DIFF_FILE_VALID(p->one)) {
Junio C Hamano81e50ea2005-05-21 19:42:18 -0700460 if (!DIFF_FILE_VALID(p->two))
Junio C Hamano60896c72005-05-22 21:24:49 -0700461 continue; /* unmerged */
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800462 else if (options->single_follow &&
463 strcmp(options->single_follow, p->two->path))
464 continue; /* not interested */
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700465 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -0700466 is_empty_blob_oid(&p->two->oid))
Jeff King90d43b02012-03-22 18:52:13 -0400467 continue;
Jeff King4d6be032015-02-26 20:42:27 -0500468 else if (add_rename_dst(p->two) < 0) {
469 warning("skipping rename detection, detected"
470 " duplicate destination '%s'",
471 p->two->path);
472 goto cleanup;
473 }
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800474 }
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700475 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -0700476 is_empty_blob_oid(&p->one->oid))
Jeff King90d43b02012-03-22 18:52:13 -0400477 continue;
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400478 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
Linus Torvalds64479712007-10-25 11:20:56 -0700479 /*
480 * If the source is a broken "delete", and
Junio C Hamano22101002005-06-11 20:55:20 -0700481 * they did not really want to get broken,
482 * that means the source actually stays.
Linus Torvalds64479712007-10-25 11:20:56 -0700483 * So we increment the "rename_used" score
484 * by one, to indicate ourselves as a user
Junio C Hamano22101002005-06-11 20:55:20 -0700485 */
Linus Torvalds64479712007-10-25 11:20:56 -0700486 if (p->broken_pair && !p->score)
487 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800488 register_rename_src(p);
Junio C Hamano22101002005-06-11 20:55:20 -0700489 }
Linus Torvalds64479712007-10-25 11:20:56 -0700490 else if (detect_rename == DIFF_DETECT_COPY) {
491 /*
492 * Increment the "rename_used" score by
493 * one, to indicate ourselves as a user.
494 */
495 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800496 register_rename_src(p);
Linus Torvalds64479712007-10-25 11:20:56 -0700497 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700498 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700499 if (rename_dst_nr == 0 || rename_src_nr == 0)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700500 goto cleanup; /* nothing to do */
501
Linus Torvalds0024a542007-09-14 10:39:48 -0700502 /*
Linus Torvalds17559a62007-10-25 11:24:47 -0700503 * We really want to cull the candidates list early
504 * with cheap tests in order to avoid doing deltas.
505 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800506 rename_count = find_exact_renames(options);
Linus Torvalds17559a62007-10-25 11:24:47 -0700507
Linus Torvalds42899ac2007-10-26 16:56:34 -0700508 /* Did we only want exact renames? */
509 if (minimum_score == MAX_SCORE)
510 goto cleanup;
511
512 /*
513 * Calculate how many renames are left (but all the source
514 * files still remain as options for rename/copies!)
515 */
516 num_create = (rename_dst_nr - rename_count);
Linus Torvalds42899ac2007-10-26 16:56:34 -0700517
518 /* All done? */
519 if (!num_create)
520 goto cleanup;
521
Junio C Hamanof31027c2011-01-06 13:50:06 -0800522 switch (too_many_rename_candidates(num_create, options)) {
523 case 1:
Linus Torvalds0024a542007-09-14 10:39:48 -0700524 goto cleanup;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800525 case 2:
526 options->degraded_cc_to_c = 1;
527 skip_unmodified = 1;
528 break;
529 default:
530 break;
531 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700532
Jeff King3ac942d2011-02-20 04:51:16 -0500533 if (options->show_rename_progress) {
Junio C Hamano8aade102017-08-19 10:39:41 -0700534 progress = start_delayed_progress(
Nguyễn Thái Ngọc Duy754dbc42014-02-21 19:50:18 +0700535 _("Performing inexact rename detection"),
Elijah Newrend6861d02017-11-13 12:15:58 -0800536 (uint64_t)rename_dst_nr * (uint64_t)rename_src_nr);
Jeff King3ac942d2011-02-20 04:51:16 -0500537 }
538
René Scharfe50492f72016-07-30 20:18:31 +0200539 mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700540 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700541 struct diff_filespec *two = rename_dst[i].two;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800542 struct diff_score *m;
543
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700544 if (rename_dst[i].pair)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700545 continue; /* dealt with exact match already. */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800546
547 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
548 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
549 m[j].dst = -1;
550
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700551 for (j = 0; j < rename_src_nr; j++) {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800552 struct diff_filespec *one = rename_src[j].p->one;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800553 struct diff_score this_src;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800554
555 if (skip_unmodified &&
556 diff_unmodified_pair(rename_src[j].p))
557 continue;
558
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800559 this_src.score = estimate_similarity(one, two,
560 minimum_score);
561 this_src.name_score = basename_same(one, two);
562 this_src.dst = i;
563 this_src.src = j;
564 record_if_better(m, &this_src);
Junio C Hamano809809b2009-11-20 22:13:47 -0800565 /*
566 * Once we run estimate_similarity,
567 * We do not need the text anymore.
568 */
Junio C Hamano8ae92e62007-10-02 21:01:03 -0700569 diff_free_filespec_blob(one);
Junio C Hamano809809b2009-11-20 22:13:47 -0800570 diff_free_filespec_blob(two);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700571 }
572 dst_cnt++;
Elijah Newrend6861d02017-11-13 12:15:58 -0800573 display_progress(progress, (uint64_t)(i+1)*(uint64_t)rename_src_nr);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700574 }
Jeff King3ac942d2011-02-20 04:51:16 -0500575 stop_progress(&progress);
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800576
Junio C Hamano427dcb42005-05-21 02:39:09 -0700577 /* cost matrix sorted by most to least similar pair */
René Scharfe9ed0d8d2016-09-29 17:27:31 +0200578 QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800579
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800580 rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
581 if (detect_rename == DIFF_DETECT_COPY)
582 rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700583 free(mx);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700584
Junio C Hamano15d061b2005-05-27 15:55:55 -0700585 cleanup:
Junio C Hamano427dcb42005-05-21 02:39:09 -0700586 /* At this point, we have found some renames and copies and they
Junio C Hamano5098baf2005-09-15 16:13:43 -0700587 * are recorded in rename_dst. The original list is still in *q.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700588 */
Bo Yang9ca5df92010-05-06 21:52:27 -0700589 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700590 for (i = 0; i < q->nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700591 struct diff_filepair *p = q->queue[i];
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700592 struct diff_filepair *pair_to_free = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700593
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400594 if (DIFF_PAIR_UNMERGED(p)) {
595 diff_q(&outq, p);
596 }
597 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
Junio C Hamano2cd68882005-05-30 00:08:07 -0700598 /*
599 * Creation
600 *
601 * We would output this create record if it has
602 * not been turned into a rename/copy already.
603 */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500604 struct diff_rename_dst *dst = locate_rename_dst(p->two);
Junio C Hamano2cd68882005-05-30 00:08:07 -0700605 if (dst && dst->pair) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700606 diff_q(&outq, dst->pair);
607 pair_to_free = p;
608 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700609 else
Junio C Hamano2cd68882005-05-30 00:08:07 -0700610 /* no matching rename/copy source, so
611 * record this as a creation.
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700612 */
613 diff_q(&outq, p);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700614 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700615 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
616 /*
617 * Deletion
618 *
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700619 * We would output this delete record if:
620 *
621 * (1) this is a broken delete and the counterpart
622 * broken create remains in the output; or
Junio C Hamano5098baf2005-09-15 16:13:43 -0700623 * (2) this is not a broken delete, and rename_dst
624 * does not have a rename/copy to move p->one->path
625 * out of existence.
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700626 *
627 * Otherwise, the counterpart broken create
628 * has been turned into a rename-edit; or
629 * delete did not have a matching create to
630 * begin with.
Junio C Hamano2cd68882005-05-30 00:08:07 -0700631 */
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700632 if (DIFF_PAIR_BROKEN(p)) {
633 /* broken delete */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500634 struct diff_rename_dst *dst = locate_rename_dst(p->one);
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700635 if (dst && dst->pair)
636 /* counterpart is now rename/copy */
637 pair_to_free = p;
638 }
639 else {
Linus Torvalds64479712007-10-25 11:20:56 -0700640 if (p->one->rename_used)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700641 /* this path remains */
642 pair_to_free = p;
643 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700644
645 if (pair_to_free)
646 ;
647 else
648 diff_q(&outq, p);
649 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700650 else if (!diff_unmodified_pair(p))
Junio C Hamano15d061b2005-05-27 15:55:55 -0700651 /* all the usual ones need to be kept */
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700652 diff_q(&outq, p);
Junio C Hamano15d061b2005-05-27 15:55:55 -0700653 else
654 /* no need to keep unmodified pairs */
655 pair_to_free = p;
656
Junio C Hamano226406f2005-05-27 15:50:30 -0700657 if (pair_to_free)
658 diff_free_filepair(pair_to_free);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700659 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700660 diff_debug_queue("done copying original", &outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700661
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700662 free(q->queue);
663 *q = outq;
664 diff_debug_queue("done collapsing", q);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700665
Linus Torvalds9fb88412007-10-25 11:19:10 -0700666 for (i = 0; i < rename_dst_nr; i++)
667 free_filespec(rename_dst[i].two);
Junio C Hamano5098baf2005-09-15 16:13:43 -0700668
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +0000669 FREE_AND_NULL(rename_dst);
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700670 rename_dst_nr = rename_dst_alloc = 0;
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +0000671 FREE_AND_NULL(rename_src);
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700672 rename_src_nr = rename_src_alloc = 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700673 return;
674}