blob: 73d003a08ae72d0c8f18b16172bc09c86022eb8f [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)
60 memmove(rename_dst + first + 1, rename_dst + first,
61 (rename_dst_nr - first - 1) * sizeof(*rename_dst));
Junio C Hamano5098baf2005-09-15 16:13:43 -070062 rename_dst[first].two = alloc_filespec(two->path);
brian m. carlson41c95602016-06-24 23:09:24 +000063 fill_filespec(rename_dst[first].two, two->oid.hash, 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)
101 memmove(rename_src + first + 1, rename_src + first,
102 (rename_src_nr - first - 1) * sizeof(*rename_src));
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 Hamano75c660a2005-06-28 16:58:27 -0700148 unsigned long delta_limit;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700149 int score;
150
Junio C Hamano60896c72005-05-22 21:24:49 -0700151 /* We deal only with regular files. Symlink renames are handled
152 * only when they are exact matches --- in other words, no edits
153 * after renaming.
154 */
155 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
156 return 0;
157
Linus Torvalds81ac0512007-10-26 16:51:28 -0700158 /*
159 * Need to check that source and destination sizes are
160 * filled in before comparing them.
161 *
162 * If we already have "cnt_data" filled in, we know it's
163 * all good (avoid checking the size for zero, as that
164 * is a possible size - we really should have a flag to
165 * say whether the size is valid or not!)
166 */
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700167 if (!src->cnt_data &&
168 diff_populate_filespec(src, CHECK_SIZE_ONLY))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700169 return 0;
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700170 if (!dst->cnt_data &&
171 diff_populate_filespec(dst, CHECK_SIZE_ONLY))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700172 return 0;
173
Linus Torvalds90bd9322006-03-12 22:26:34 -0800174 max_size = ((src->size > dst->size) ? src->size : dst->size);
Junio C Hamano58b103f2005-05-21 15:55:18 -0700175 base_size = ((src->size < dst->size) ? src->size : dst->size);
Linus Torvalds90bd9322006-03-12 22:26:34 -0800176 delta_size = max_size - base_size;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700177
Junio C Hamano58b103f2005-05-21 15:55:18 -0700178 /* We would not consider edits that change the file size so
179 * drastically. delta_size must be smaller than
Junio C Hamanocd1870e2005-05-22 01:31:28 -0700180 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700181 *
Junio C Hamano58b103f2005-05-21 15:55:18 -0700182 * Note that base_size == 0 case is handled here already
183 * and the final score computation below would not have a
184 * divide-by-zero issue.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700185 */
Linus Torvalds3a4d6762011-02-18 20:12:06 -0800186 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700187 return 0;
188
Björn Steinbrink885c7162009-01-20 16:59:57 +0100189 if (!src->cnt_data && diff_populate_filespec(src, 0))
190 return 0;
191 if (!dst->cnt_data && diff_populate_filespec(dst, 0))
192 return 0;
193
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500194 delta_limit = (unsigned long)
195 (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
Junio C Hamanod8c3d032007-06-28 22:54:37 -0700196 if (diffcore_count_changes(src, dst,
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800197 &src->cnt_data, &dst->cnt_data,
Junio C Hamano65416752006-02-28 16:01:36 -0800198 delta_limit,
199 &src_copied, &literal_added))
Junio C Hamano75c660a2005-06-28 16:58:27 -0700200 return 0;
Junio C Hamano85976972005-05-24 12:09:32 -0700201
Junio C Hamano17063062006-03-02 22:11:25 -0800202 /* How similar are they?
203 * what percentage of material in dst are from source?
Junio C Hamano427dcb42005-05-21 02:39:09 -0700204 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800205 if (!dst->size)
Junio C Hamano17063062006-03-02 22:11:25 -0800206 score = 0; /* should not happen */
René Scharfecfc0aef2007-06-25 00:23:28 +0200207 else
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500208 score = (int)(src_copied * MAX_SCORE / max_size);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700209 return score;
210}
211
Junio C Hamano5098baf2005-09-15 16:13:43 -0700212static void record_rename_pair(int dst_index, int src_index, int score)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700213{
Linus Torvalds9fb88412007-10-25 11:19:10 -0700214 struct diff_filespec *src, *dst;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700215 struct diff_filepair *dp;
Junio C Hamanof7c15122005-05-22 21:26:09 -0700216
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700217 if (rename_dst[dst_index].pair)
218 die("internal error: dst already matched.");
219
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800220 src = rename_src[src_index].p->one;
Linus Torvalds64479712007-10-25 11:20:56 -0700221 src->rename_used++;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700222 src->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700223
224 dst = rename_dst[dst_index].two;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700225 dst->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700226
Linus Torvalds9fb88412007-10-25 11:19:10 -0700227 dp = diff_queue(NULL, src, dst);
Junio C Hamanoef677682006-08-03 12:01:01 -0700228 dp->renamed_pair = 1;
Junio C Hamanofc580712006-04-08 20:17:46 -0700229 if (!strcmp(src->path, dst->path))
230 dp->score = rename_src[src_index].score;
231 else
232 dp->score = score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700233 rename_dst[dst_index].pair = dp;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700234}
235
236/*
237 * We sort the rename similarity matrix with the score, in descending
Junio C Hamano15d061b2005-05-27 15:55:55 -0700238 * order (the most similar first).
Junio C Hamano427dcb42005-05-21 02:39:09 -0700239 */
240static int score_compare(const void *a_, const void *b_)
241{
242 const struct diff_score *a = a_, *b = b_;
René Scharfecfc0aef2007-06-25 00:23:28 +0200243
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800244 /* sink the unused ones to the bottom */
245 if (a->dst < 0)
246 return (0 <= b->dst);
247 else if (b->dst < 0)
248 return -1;
249
René Scharfecfc0aef2007-06-25 00:23:28 +0200250 if (a->score == b->score)
251 return b->name_score - a->name_score;
252
Junio C Hamano427dcb42005-05-21 02:39:09 -0700253 return b->score - a->score;
254}
255
Linus Torvalds9027f532007-10-25 11:23:26 -0700256struct file_similarity {
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100257 struct hashmap_entry entry;
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100258 int index;
Linus Torvalds9027f532007-10-25 11:23:26 -0700259 struct diff_filespec *filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700260};
261
Karsten Blees48f64072013-11-14 20:19:04 +0100262static unsigned int hash_filespec(struct diff_filespec *filespec)
263{
brian m. carlson41c95602016-06-24 23:09:24 +0000264 if (!filespec->oid_valid) {
Karsten Blees48f64072013-11-14 20:19:04 +0100265 if (diff_populate_filespec(filespec, 0))
266 return 0;
brian m. carlsona0d12c42016-06-24 23:09:23 +0000267 hash_sha1_file(filespec->data, filespec->size, "blob",
268 filespec->oid.hash);
Karsten Blees48f64072013-11-14 20:19:04 +0100269 }
brian m. carlsona0d12c42016-06-24 23:09:23 +0000270 return sha1hash(filespec->oid.hash);
Karsten Blees48f64072013-11-14 20:19:04 +0100271}
272
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100273static int find_identical_files(struct hashmap *srcs,
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100274 int dst_index,
Linus Torvalds11f944d2011-02-18 19:55:19 -0800275 struct diff_options *options)
Linus Torvalds9027f532007-10-25 11:23:26 -0700276{
277 int renames = 0;
278
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100279 struct diff_filespec *target = rename_dst[dst_index].two;
Karsten Bleesab73a9d2014-07-03 00:22:11 +0200280 struct file_similarity *p, *best = NULL;
Karsten Blees48f64072013-11-14 20:19:04 +0100281 int i = 100, best_score = -1;
Linus Torvalds9027f532007-10-25 11:23:26 -0700282
Karsten Blees48f64072013-11-14 20:19:04 +0100283 /*
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100284 * Find the best source match for specified destination.
Karsten Blees48f64072013-11-14 20:19:04 +0100285 */
Karsten Bleesab73a9d2014-07-03 00:22:11 +0200286 p = hashmap_get_from_hash(srcs, hash_filespec(target), NULL);
287 for (; p; p = hashmap_get_next(srcs, p)) {
Karsten Blees48f64072013-11-14 20:19:04 +0100288 int score;
289 struct diff_filespec *source = p->filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700290
Karsten Blees48f64072013-11-14 20:19:04 +0100291 /* False hash collision? */
brian m. carlsona0d12c42016-06-24 23:09:23 +0000292 if (oidcmp(&source->oid, &target->oid))
Karsten Blees48f64072013-11-14 20:19:04 +0100293 continue;
294 /* Non-regular files? If so, the modes must match! */
295 if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
296 if (source->mode != target->mode)
Linus Torvalds9027f532007-10-25 11:23:26 -0700297 continue;
Karsten Blees48f64072013-11-14 20:19:04 +0100298 }
299 /* Give higher scores to sources that haven't been used already */
300 score = !source->rename_used;
301 if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
302 continue;
303 score += basename_same(source, target);
304 if (score > best_score) {
305 best = p;
306 best_score = score;
307 if (score == 2)
Linus Torvalds9027f532007-10-25 11:23:26 -0700308 break;
309 }
Karsten Blees48f64072013-11-14 20:19:04 +0100310
311 /* Too many identical alternatives? Pick one */
312 if (!--i)
313 break;
314 }
315 if (best) {
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100316 record_rename_pair(dst_index, best->index, MAX_SCORE);
Karsten Blees48f64072013-11-14 20:19:04 +0100317 renames++;
318 }
Linus Torvalds9027f532007-10-25 11:23:26 -0700319 return renames;
320}
321
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100322static void insert_file_table(struct hashmap *table, int index, struct diff_filespec *filespec)
Linus Torvalds9027f532007-10-25 11:23:26 -0700323{
Linus Torvalds9027f532007-10-25 11:23:26 -0700324 struct file_similarity *entry = xmalloc(sizeof(*entry));
325
Linus Torvalds9027f532007-10-25 11:23:26 -0700326 entry->index = index;
327 entry->filespec = filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700328
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100329 hashmap_entry_init(entry, hash_filespec(filespec));
330 hashmap_add(table, entry);
Linus Torvalds9027f532007-10-25 11:23:26 -0700331}
332
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700333/*
334 * Find exact renames first.
335 *
336 * The first round matches up the up-to-date entries,
337 * and then during the second round we try to match
338 * cache-dirty entries as well.
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700339 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800340static int find_exact_renames(struct diff_options *options)
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700341{
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100342 int i, renames = 0;
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100343 struct hashmap file_table;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700344
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200345 /* Add all sources to the hash table in reverse order, because
346 * later on they will be retrieved in LIFO order.
347 */
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100348 hashmap_init(&file_table, NULL, rename_src_nr);
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200349 for (i = rename_src_nr-1; i >= 0; i--)
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100350 insert_file_table(&file_table, i, rename_src[i].p->one);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700351
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100352 /* Walk the destinations and find best source match */
Linus Torvalds9027f532007-10-25 11:23:26 -0700353 for (i = 0; i < rename_dst_nr; i++)
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100354 renames += find_identical_files(&file_table, i, options);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700355
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100356 /* Free the hash data structure and entries */
357 hashmap_free(&file_table, 1);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700358
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100359 return renames;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700360}
361
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800362#define NUM_CANDIDATE_PER_DST 4
363static void record_if_better(struct diff_score m[], struct diff_score *o)
364{
365 int i, worst;
366
367 /* find the worst one */
368 worst = 0;
369 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
370 if (score_compare(&m[i], &m[worst]) > 0)
371 worst = i;
372
373 /* is it better than the worst one? */
374 if (score_compare(&m[worst], o) > 0)
375 m[worst] = *o;
376}
377
Junio C Hamanof31027c2011-01-06 13:50:06 -0800378/*
379 * Returns:
380 * 0 if we are under the limit;
381 * 1 if we need to disable inexact rename detection;
382 * 2 if we would be under the limit if we were given -C instead of -C -C.
383 */
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800384static int too_many_rename_candidates(int num_create,
385 struct diff_options *options)
386{
387 int rename_limit = options->rename_limit;
388 int num_src = rename_src_nr;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800389 int i;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800390
391 options->needed_rename_limit = 0;
392
393 /*
394 * This basically does a test for the rename matrix not
395 * growing larger than a "rename_limit" square matrix, ie:
396 *
397 * num_create * num_src > rename_limit * rename_limit
398 *
399 * but handles the potential overflow case specially (and we
400 * assume at least 32-bit integers)
401 */
402 if (rename_limit <= 0 || rename_limit > 32767)
403 rename_limit = 32767;
404 if ((num_create <= rename_limit || num_src <= rename_limit) &&
405 (num_create * num_src <= rename_limit * rename_limit))
406 return 0;
407
408 options->needed_rename_limit =
409 num_src > num_create ? num_src : num_create;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800410
411 /* Are we running under -C -C? */
412 if (!DIFF_OPT_TST(options, FIND_COPIES_HARDER))
413 return 1;
414
415 /* Would we bust the limit if we were running under -C? */
416 for (num_src = i = 0; i < rename_src_nr; i++) {
417 if (diff_unmodified_pair(rename_src[i].p))
418 continue;
419 num_src++;
420 }
421 if ((num_create <= rename_limit || num_src <= rename_limit) &&
422 (num_create * num_src <= rename_limit * rename_limit))
423 return 2;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800424 return 1;
425}
426
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800427static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
428{
429 int count = 0, i;
430
431 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
432 struct diff_rename_dst *dst;
433
434 if ((mx[i].dst < 0) ||
435 (mx[i].score < minimum_score))
436 break; /* there is no more usable pair. */
437 dst = &rename_dst[mx[i].dst];
438 if (dst->pair)
439 continue; /* already done, either exact or fuzzy. */
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800440 if (!copies && rename_src[mx[i].src].p->one->rename_used)
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800441 continue;
442 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
443 count++;
444 }
445 return count;
446}
447
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700448void diffcore_rename(struct diff_options *options)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700449{
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700450 int detect_rename = options->detect_rename;
451 int minimum_score = options->rename_score;
Junio C Hamano38c6f782005-05-21 19:40:36 -0700452 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano5098baf2005-09-15 16:13:43 -0700453 struct diff_queue_struct outq;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700454 struct diff_score *mx;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800455 int i, j, rename_count, skip_unmodified = 0;
Jim Meyeringdabdbee2011-04-29 11:42:41 +0200456 int num_create, dst_cnt;
Jeff King3ac942d2011-02-20 04:51:16 -0500457 struct progress *progress = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700458
Junio C Hamano26dee0a2005-05-21 23:33:32 -0700459 if (!minimum_score)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700460 minimum_score = DEFAULT_RENAME_SCORE;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700461
Junio C Hamano427dcb42005-05-21 02:39:09 -0700462 for (i = 0; i < q->nr; i++) {
Junio C Hamano52e95782005-05-21 02:40:01 -0700463 struct diff_filepair *p = q->queue[i];
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800464 if (!DIFF_FILE_VALID(p->one)) {
Junio C Hamano81e50ea2005-05-21 19:42:18 -0700465 if (!DIFF_FILE_VALID(p->two))
Junio C Hamano60896c72005-05-22 21:24:49 -0700466 continue; /* unmerged */
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800467 else if (options->single_follow &&
468 strcmp(options->single_follow, p->two->path))
469 continue; /* not interested */
Jeff King90d43b02012-03-22 18:52:13 -0400470 else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
brian m. carlsona0d12c42016-06-24 23:09:23 +0000471 is_empty_blob_sha1(p->two->oid.hash))
Jeff King90d43b02012-03-22 18:52:13 -0400472 continue;
Jeff King4d6be032015-02-26 20:42:27 -0500473 else if (add_rename_dst(p->two) < 0) {
474 warning("skipping rename detection, detected"
475 " duplicate destination '%s'",
476 p->two->path);
477 goto cleanup;
478 }
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800479 }
Jeff King90d43b02012-03-22 18:52:13 -0400480 else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
brian m. carlsona0d12c42016-06-24 23:09:23 +0000481 is_empty_blob_sha1(p->one->oid.hash))
Jeff King90d43b02012-03-22 18:52:13 -0400482 continue;
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400483 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
Linus Torvalds64479712007-10-25 11:20:56 -0700484 /*
485 * If the source is a broken "delete", and
Junio C Hamano22101002005-06-11 20:55:20 -0700486 * they did not really want to get broken,
487 * that means the source actually stays.
Linus Torvalds64479712007-10-25 11:20:56 -0700488 * So we increment the "rename_used" score
489 * by one, to indicate ourselves as a user
Junio C Hamano22101002005-06-11 20:55:20 -0700490 */
Linus Torvalds64479712007-10-25 11:20:56 -0700491 if (p->broken_pair && !p->score)
492 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800493 register_rename_src(p);
Junio C Hamano22101002005-06-11 20:55:20 -0700494 }
Linus Torvalds64479712007-10-25 11:20:56 -0700495 else if (detect_rename == DIFF_DETECT_COPY) {
496 /*
497 * Increment the "rename_used" score by
498 * one, to indicate ourselves as a user.
499 */
500 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800501 register_rename_src(p);
Linus Torvalds64479712007-10-25 11:20:56 -0700502 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700503 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700504 if (rename_dst_nr == 0 || rename_src_nr == 0)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700505 goto cleanup; /* nothing to do */
506
Linus Torvalds0024a542007-09-14 10:39:48 -0700507 /*
Linus Torvalds17559a62007-10-25 11:24:47 -0700508 * We really want to cull the candidates list early
509 * with cheap tests in order to avoid doing deltas.
510 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800511 rename_count = find_exact_renames(options);
Linus Torvalds17559a62007-10-25 11:24:47 -0700512
Linus Torvalds42899ac2007-10-26 16:56:34 -0700513 /* Did we only want exact renames? */
514 if (minimum_score == MAX_SCORE)
515 goto cleanup;
516
517 /*
518 * Calculate how many renames are left (but all the source
519 * files still remain as options for rename/copies!)
520 */
521 num_create = (rename_dst_nr - rename_count);
Linus Torvalds42899ac2007-10-26 16:56:34 -0700522
523 /* All done? */
524 if (!num_create)
525 goto cleanup;
526
Junio C Hamanof31027c2011-01-06 13:50:06 -0800527 switch (too_many_rename_candidates(num_create, options)) {
528 case 1:
Linus Torvalds0024a542007-09-14 10:39:48 -0700529 goto cleanup;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800530 case 2:
531 options->degraded_cc_to_c = 1;
532 skip_unmodified = 1;
533 break;
534 default:
535 break;
536 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700537
Jeff King3ac942d2011-02-20 04:51:16 -0500538 if (options->show_rename_progress) {
539 progress = start_progress_delay(
Nguyễn Thái Ngọc Duy754dbc42014-02-21 19:50:18 +0700540 _("Performing inexact rename detection"),
Jeff King3ac942d2011-02-20 04:51:16 -0500541 rename_dst_nr * rename_src_nr, 50, 1);
542 }
543
René Scharfe50492f72016-07-30 20:18:31 +0200544 mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700545 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700546 struct diff_filespec *two = rename_dst[i].two;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800547 struct diff_score *m;
548
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700549 if (rename_dst[i].pair)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700550 continue; /* dealt with exact match already. */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800551
552 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
553 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
554 m[j].dst = -1;
555
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700556 for (j = 0; j < rename_src_nr; j++) {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800557 struct diff_filespec *one = rename_src[j].p->one;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800558 struct diff_score this_src;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800559
560 if (skip_unmodified &&
561 diff_unmodified_pair(rename_src[j].p))
562 continue;
563
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800564 this_src.score = estimate_similarity(one, two,
565 minimum_score);
566 this_src.name_score = basename_same(one, two);
567 this_src.dst = i;
568 this_src.src = j;
569 record_if_better(m, &this_src);
Junio C Hamano809809b2009-11-20 22:13:47 -0800570 /*
571 * Once we run estimate_similarity,
572 * We do not need the text anymore.
573 */
Junio C Hamano8ae92e62007-10-02 21:01:03 -0700574 diff_free_filespec_blob(one);
Junio C Hamano809809b2009-11-20 22:13:47 -0800575 diff_free_filespec_blob(two);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700576 }
577 dst_cnt++;
Jeff King3ac942d2011-02-20 04:51:16 -0500578 display_progress(progress, (i+1)*rename_src_nr);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700579 }
Jeff King3ac942d2011-02-20 04:51:16 -0500580 stop_progress(&progress);
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800581
Junio C Hamano427dcb42005-05-21 02:39:09 -0700582 /* cost matrix sorted by most to least similar pair */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800583 qsort(mx, dst_cnt * NUM_CANDIDATE_PER_DST, sizeof(*mx), score_compare);
584
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800585 rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
586 if (detect_rename == DIFF_DETECT_COPY)
587 rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700588 free(mx);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700589
Junio C Hamano15d061b2005-05-27 15:55:55 -0700590 cleanup:
Junio C Hamano427dcb42005-05-21 02:39:09 -0700591 /* At this point, we have found some renames and copies and they
Junio C Hamano5098baf2005-09-15 16:13:43 -0700592 * are recorded in rename_dst. The original list is still in *q.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700593 */
Bo Yang9ca5df92010-05-06 21:52:27 -0700594 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700595 for (i = 0; i < q->nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700596 struct diff_filepair *p = q->queue[i];
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700597 struct diff_filepair *pair_to_free = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700598
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400599 if (DIFF_PAIR_UNMERGED(p)) {
600 diff_q(&outq, p);
601 }
602 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
Junio C Hamano2cd68882005-05-30 00:08:07 -0700603 /*
604 * Creation
605 *
606 * We would output this create record if it has
607 * not been turned into a rename/copy already.
608 */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500609 struct diff_rename_dst *dst = locate_rename_dst(p->two);
Junio C Hamano2cd68882005-05-30 00:08:07 -0700610 if (dst && dst->pair) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700611 diff_q(&outq, dst->pair);
612 pair_to_free = p;
613 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700614 else
Junio C Hamano2cd68882005-05-30 00:08:07 -0700615 /* no matching rename/copy source, so
616 * record this as a creation.
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700617 */
618 diff_q(&outq, p);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700619 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700620 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
621 /*
622 * Deletion
623 *
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700624 * We would output this delete record if:
625 *
626 * (1) this is a broken delete and the counterpart
627 * broken create remains in the output; or
Junio C Hamano5098baf2005-09-15 16:13:43 -0700628 * (2) this is not a broken delete, and rename_dst
629 * does not have a rename/copy to move p->one->path
630 * out of existence.
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700631 *
632 * Otherwise, the counterpart broken create
633 * has been turned into a rename-edit; or
634 * delete did not have a matching create to
635 * begin with.
Junio C Hamano2cd68882005-05-30 00:08:07 -0700636 */
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700637 if (DIFF_PAIR_BROKEN(p)) {
638 /* broken delete */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500639 struct diff_rename_dst *dst = locate_rename_dst(p->one);
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700640 if (dst && dst->pair)
641 /* counterpart is now rename/copy */
642 pair_to_free = p;
643 }
644 else {
Linus Torvalds64479712007-10-25 11:20:56 -0700645 if (p->one->rename_used)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700646 /* this path remains */
647 pair_to_free = p;
648 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700649
650 if (pair_to_free)
651 ;
652 else
653 diff_q(&outq, p);
654 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700655 else if (!diff_unmodified_pair(p))
Junio C Hamano15d061b2005-05-27 15:55:55 -0700656 /* all the usual ones need to be kept */
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700657 diff_q(&outq, p);
Junio C Hamano15d061b2005-05-27 15:55:55 -0700658 else
659 /* no need to keep unmodified pairs */
660 pair_to_free = p;
661
Junio C Hamano226406f2005-05-27 15:50:30 -0700662 if (pair_to_free)
663 diff_free_filepair(pair_to_free);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700664 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700665 diff_debug_queue("done copying original", &outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700666
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700667 free(q->queue);
668 *q = outq;
669 diff_debug_queue("done collapsing", q);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700670
Linus Torvalds9fb88412007-10-25 11:19:10 -0700671 for (i = 0; i < rename_dst_nr; i++)
672 free_filespec(rename_dst[i].two);
Junio C Hamano5098baf2005-09-15 16:13:43 -0700673
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700674 free(rename_dst);
675 rename_dst = NULL;
676 rename_dst_nr = rename_dst_alloc = 0;
677 free(rename_src);
678 rename_src = NULL;
679 rename_src_nr = rename_src_alloc = 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700680 return;
681}