blob: af1fe08861e6862985ac8fb9311b17568cb9e547 [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);
Jeff Kinge5450102012-07-28 11:03:01 -040063 fill_filespec(rename_dst[first].two, two->sha1, two->sha1_valid, two->mode);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070064 rename_dst[first].pair = NULL;
Jeff Kingf98c2f72015-02-26 20:39:48 -050065 return 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -070066}
67
Junio C Hamano15d061b2005-05-27 15:55:55 -070068/* Table of rename/copy src files */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070069static struct diff_rename_src {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080070 struct diff_filepair *p;
Junio C Hamanofc580712006-04-08 20:17:46 -070071 unsigned short score; /* to remember the break score */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070072} *rename_src;
73static int rename_src_nr, rename_src_alloc;
Junio C Hamano427dcb42005-05-21 02:39:09 -070074
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080075static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
Junio C Hamano25d5ea42005-05-24 01:10:48 -070076{
77 int first, last;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080078 struct diff_filespec *one = p->one;
79 unsigned short score = p->score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070080
81 first = 0;
82 last = rename_src_nr;
83 while (last > first) {
84 int next = (last + first) >> 1;
85 struct diff_rename_src *src = &(rename_src[next]);
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080086 int cmp = strcmp(one->path, src->p->one->path);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070087 if (!cmp)
88 return src;
89 if (cmp < 0) {
90 last = next;
91 continue;
92 }
93 first = next+1;
Junio C Hamano427dcb42005-05-21 02:39:09 -070094 }
Junio C Hamano15d061b2005-05-27 15:55:55 -070095
Junio C Hamano25d5ea42005-05-24 01:10:48 -070096 /* insert to make it at "first" */
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040097 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070098 rename_src_nr++;
99 if (first < rename_src_nr)
100 memmove(rename_src + first + 1, rename_src + first,
101 (rename_src_nr - first - 1) * sizeof(*rename_src));
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800102 rename_src[first].p = p;
Junio C Hamanofc580712006-04-08 20:17:46 -0700103 rename_src[first].score = score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700104 return &(rename_src[first]);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700105}
106
Johannes Schindelin0ce39642007-06-21 12:52:11 +0100107static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
108{
109 int src_len = strlen(src->path), dst_len = strlen(dst->path);
110 while (src_len && dst_len) {
111 char c1 = src->path[--src_len];
112 char c2 = dst->path[--dst_len];
113 if (c1 != c2)
114 return 0;
115 if (c1 == '/')
116 return 1;
117 }
118 return (!src_len || src->path[src_len - 1] == '/') &&
119 (!dst_len || dst->path[dst_len - 1] == '/');
120}
121
Junio C Hamano427dcb42005-05-21 02:39:09 -0700122struct diff_score {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700123 int src; /* index in rename_src */
124 int dst; /* index in rename_dst */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800125 unsigned short score;
126 short name_score;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700127};
128
129static int estimate_similarity(struct diff_filespec *src,
130 struct diff_filespec *dst,
131 int minimum_score)
132{
133 /* src points at a file that existed in the original tree (or
134 * optionally a file in the destination tree) and dst points
135 * at a newly created file. They may be quite similar, in which
136 * case we want to say src is renamed to dst or src is copied into
137 * dst, and then some edit has been applied to dst.
138 *
139 * Compare them and return how similar they are, representing
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700140 * the score as an integer between 0 and MAX_SCORE.
141 *
142 * When there is an exact match, it is considered a better
143 * match than anything else; the destination does not even
144 * call into this function in that case.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700145 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800146 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
Junio C Hamano75c660a2005-06-28 16:58:27 -0700147 unsigned long delta_limit;
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
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500193 delta_limit = (unsigned long)
194 (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
Junio C Hamanod8c3d032007-06-28 22:54:37 -0700195 if (diffcore_count_changes(src, dst,
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800196 &src->cnt_data, &dst->cnt_data,
Junio C Hamano65416752006-02-28 16:01:36 -0800197 delta_limit,
198 &src_copied, &literal_added))
Junio C Hamano75c660a2005-06-28 16:58:27 -0700199 return 0;
Junio C Hamano85976972005-05-24 12:09:32 -0700200
Junio C Hamano17063062006-03-02 22:11:25 -0800201 /* How similar are they?
202 * what percentage of material in dst are from source?
Junio C Hamano427dcb42005-05-21 02:39:09 -0700203 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800204 if (!dst->size)
Junio C Hamano17063062006-03-02 22:11:25 -0800205 score = 0; /* should not happen */
René Scharfecfc0aef2007-06-25 00:23:28 +0200206 else
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500207 score = (int)(src_copied * MAX_SCORE / max_size);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700208 return score;
209}
210
Junio C Hamano5098baf2005-09-15 16:13:43 -0700211static void record_rename_pair(int dst_index, int src_index, int score)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700212{
Linus Torvalds9fb88412007-10-25 11:19:10 -0700213 struct diff_filespec *src, *dst;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700214 struct diff_filepair *dp;
Junio C Hamanof7c15122005-05-22 21:26:09 -0700215
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700216 if (rename_dst[dst_index].pair)
217 die("internal error: dst already matched.");
218
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800219 src = rename_src[src_index].p->one;
Linus Torvalds64479712007-10-25 11:20:56 -0700220 src->rename_used++;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700221 src->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700222
223 dst = rename_dst[dst_index].two;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700224 dst->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700225
Linus Torvalds9fb88412007-10-25 11:19:10 -0700226 dp = diff_queue(NULL, src, dst);
Junio C Hamanoef677682006-08-03 12:01:01 -0700227 dp->renamed_pair = 1;
Junio C Hamanofc580712006-04-08 20:17:46 -0700228 if (!strcmp(src->path, dst->path))
229 dp->score = rename_src[src_index].score;
230 else
231 dp->score = score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700232 rename_dst[dst_index].pair = dp;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700233}
234
235/*
236 * We sort the rename similarity matrix with the score, in descending
Junio C Hamano15d061b2005-05-27 15:55:55 -0700237 * order (the most similar first).
Junio C Hamano427dcb42005-05-21 02:39:09 -0700238 */
239static int score_compare(const void *a_, const void *b_)
240{
241 const struct diff_score *a = a_, *b = b_;
René Scharfecfc0aef2007-06-25 00:23:28 +0200242
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800243 /* sink the unused ones to the bottom */
244 if (a->dst < 0)
245 return (0 <= b->dst);
246 else if (b->dst < 0)
247 return -1;
248
René Scharfecfc0aef2007-06-25 00:23:28 +0200249 if (a->score == b->score)
250 return b->name_score - a->name_score;
251
Junio C Hamano427dcb42005-05-21 02:39:09 -0700252 return b->score - a->score;
253}
254
Linus Torvalds9027f532007-10-25 11:23:26 -0700255struct file_similarity {
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100256 struct hashmap_entry entry;
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100257 int index;
Linus Torvalds9027f532007-10-25 11:23:26 -0700258 struct diff_filespec *filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700259};
260
Karsten Blees48f64072013-11-14 20:19:04 +0100261static unsigned int hash_filespec(struct diff_filespec *filespec)
262{
Karsten Blees48f64072013-11-14 20:19:04 +0100263 if (!filespec->sha1_valid) {
264 if (diff_populate_filespec(filespec, 0))
265 return 0;
266 hash_sha1_file(filespec->data, filespec->size, "blob", filespec->sha1);
267 }
Karsten Blees039dc712014-07-03 00:20:20 +0200268 return sha1hash(filespec->sha1);
Karsten Blees48f64072013-11-14 20:19:04 +0100269}
270
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100271static int find_identical_files(struct hashmap *srcs,
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100272 int dst_index,
Linus Torvalds11f944d2011-02-18 19:55:19 -0800273 struct diff_options *options)
Linus Torvalds9027f532007-10-25 11:23:26 -0700274{
275 int renames = 0;
276
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100277 struct diff_filespec *target = rename_dst[dst_index].two;
Karsten Bleesab73a9d2014-07-03 00:22:11 +0200278 struct file_similarity *p, *best = NULL;
Karsten Blees48f64072013-11-14 20:19:04 +0100279 int i = 100, best_score = -1;
Linus Torvalds9027f532007-10-25 11:23:26 -0700280
Karsten Blees48f64072013-11-14 20:19:04 +0100281 /*
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100282 * Find the best source match for specified destination.
Karsten Blees48f64072013-11-14 20:19:04 +0100283 */
Karsten Bleesab73a9d2014-07-03 00:22:11 +0200284 p = hashmap_get_from_hash(srcs, hash_filespec(target), NULL);
285 for (; p; p = hashmap_get_next(srcs, p)) {
Karsten Blees48f64072013-11-14 20:19:04 +0100286 int score;
287 struct diff_filespec *source = p->filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700288
Karsten Blees48f64072013-11-14 20:19:04 +0100289 /* False hash collision? */
290 if (hashcmp(source->sha1, target->sha1))
291 continue;
292 /* Non-regular files? If so, the modes must match! */
293 if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
294 if (source->mode != target->mode)
Linus Torvalds9027f532007-10-25 11:23:26 -0700295 continue;
Karsten Blees48f64072013-11-14 20:19:04 +0100296 }
297 /* Give higher scores to sources that haven't been used already */
298 score = !source->rename_used;
299 if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
300 continue;
301 score += basename_same(source, target);
302 if (score > best_score) {
303 best = p;
304 best_score = score;
305 if (score == 2)
Linus Torvalds9027f532007-10-25 11:23:26 -0700306 break;
307 }
Karsten Blees48f64072013-11-14 20:19:04 +0100308
309 /* Too many identical alternatives? Pick one */
310 if (!--i)
311 break;
312 }
313 if (best) {
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100314 record_rename_pair(dst_index, best->index, MAX_SCORE);
Karsten Blees48f64072013-11-14 20:19:04 +0100315 renames++;
316 }
Linus Torvalds9027f532007-10-25 11:23:26 -0700317 return renames;
318}
319
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100320static void insert_file_table(struct hashmap *table, int index, struct diff_filespec *filespec)
Linus Torvalds9027f532007-10-25 11:23:26 -0700321{
Linus Torvalds9027f532007-10-25 11:23:26 -0700322 struct file_similarity *entry = xmalloc(sizeof(*entry));
323
Linus Torvalds9027f532007-10-25 11:23:26 -0700324 entry->index = index;
325 entry->filespec = filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700326
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100327 hashmap_entry_init(entry, hash_filespec(filespec));
328 hashmap_add(table, entry);
Linus Torvalds9027f532007-10-25 11:23:26 -0700329}
330
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700331/*
332 * Find exact renames first.
333 *
334 * The first round matches up the up-to-date entries,
335 * and then during the second round we try to match
336 * cache-dirty entries as well.
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700337 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800338static int find_exact_renames(struct diff_options *options)
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700339{
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100340 int i, renames = 0;
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100341 struct hashmap file_table;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700342
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100343 /* Add all sources to the hash table */
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100344 hashmap_init(&file_table, NULL, rename_src_nr);
Linus Torvalds9027f532007-10-25 11:23:26 -0700345 for (i = 0; i < rename_src_nr; 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
394 *
395 * but handles the potential overflow case specially (and we
396 * assume at least 32-bit integers)
397 */
398 if (rename_limit <= 0 || rename_limit > 32767)
399 rename_limit = 32767;
400 if ((num_create <= rename_limit || num_src <= rename_limit) &&
401 (num_create * num_src <= rename_limit * rename_limit))
402 return 0;
403
404 options->needed_rename_limit =
405 num_src > num_create ? num_src : num_create;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800406
407 /* Are we running under -C -C? */
408 if (!DIFF_OPT_TST(options, FIND_COPIES_HARDER))
409 return 1;
410
411 /* Would we bust the limit if we were running under -C? */
412 for (num_src = i = 0; i < rename_src_nr; i++) {
413 if (diff_unmodified_pair(rename_src[i].p))
414 continue;
415 num_src++;
416 }
417 if ((num_create <= rename_limit || num_src <= rename_limit) &&
418 (num_create * num_src <= rename_limit * rename_limit))
419 return 2;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800420 return 1;
421}
422
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800423static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
424{
425 int count = 0, i;
426
427 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
428 struct diff_rename_dst *dst;
429
430 if ((mx[i].dst < 0) ||
431 (mx[i].score < minimum_score))
432 break; /* there is no more usable pair. */
433 dst = &rename_dst[mx[i].dst];
434 if (dst->pair)
435 continue; /* already done, either exact or fuzzy. */
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800436 if (!copies && rename_src[mx[i].src].p->one->rename_used)
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800437 continue;
438 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
439 count++;
440 }
441 return count;
442}
443
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700444void diffcore_rename(struct diff_options *options)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700445{
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700446 int detect_rename = options->detect_rename;
447 int minimum_score = options->rename_score;
Junio C Hamano38c6f782005-05-21 19:40:36 -0700448 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano5098baf2005-09-15 16:13:43 -0700449 struct diff_queue_struct outq;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700450 struct diff_score *mx;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800451 int i, j, rename_count, skip_unmodified = 0;
Jim Meyeringdabdbee2011-04-29 11:42:41 +0200452 int num_create, dst_cnt;
Jeff King3ac942d2011-02-20 04:51:16 -0500453 struct progress *progress = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700454
Junio C Hamano26dee0a2005-05-21 23:33:32 -0700455 if (!minimum_score)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700456 minimum_score = DEFAULT_RENAME_SCORE;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700457
Junio C Hamano427dcb42005-05-21 02:39:09 -0700458 for (i = 0; i < q->nr; i++) {
Junio C Hamano52e95782005-05-21 02:40:01 -0700459 struct diff_filepair *p = q->queue[i];
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800460 if (!DIFF_FILE_VALID(p->one)) {
Junio C Hamano81e50ea2005-05-21 19:42:18 -0700461 if (!DIFF_FILE_VALID(p->two))
Junio C Hamano60896c72005-05-22 21:24:49 -0700462 continue; /* unmerged */
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800463 else if (options->single_follow &&
464 strcmp(options->single_follow, p->two->path))
465 continue; /* not interested */
Jeff King90d43b02012-03-22 18:52:13 -0400466 else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
467 is_empty_blob_sha1(p->two->sha1))
468 continue;
Jeff King4d6be032015-02-26 20:42:27 -0500469 else if (add_rename_dst(p->two) < 0) {
470 warning("skipping rename detection, detected"
471 " duplicate destination '%s'",
472 p->two->path);
473 goto cleanup;
474 }
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800475 }
Jeff King90d43b02012-03-22 18:52:13 -0400476 else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
477 is_empty_blob_sha1(p->one->sha1))
478 continue;
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400479 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
Linus Torvalds64479712007-10-25 11:20:56 -0700480 /*
481 * If the source is a broken "delete", and
Junio C Hamano22101002005-06-11 20:55:20 -0700482 * they did not really want to get broken,
483 * that means the source actually stays.
Linus Torvalds64479712007-10-25 11:20:56 -0700484 * So we increment the "rename_used" score
485 * by one, to indicate ourselves as a user
Junio C Hamano22101002005-06-11 20:55:20 -0700486 */
Linus Torvalds64479712007-10-25 11:20:56 -0700487 if (p->broken_pair && !p->score)
488 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800489 register_rename_src(p);
Junio C Hamano22101002005-06-11 20:55:20 -0700490 }
Linus Torvalds64479712007-10-25 11:20:56 -0700491 else if (detect_rename == DIFF_DETECT_COPY) {
492 /*
493 * Increment the "rename_used" score by
494 * one, to indicate ourselves as a user.
495 */
496 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800497 register_rename_src(p);
Linus Torvalds64479712007-10-25 11:20:56 -0700498 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700499 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700500 if (rename_dst_nr == 0 || rename_src_nr == 0)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700501 goto cleanup; /* nothing to do */
502
Linus Torvalds0024a542007-09-14 10:39:48 -0700503 /*
Linus Torvalds17559a62007-10-25 11:24:47 -0700504 * We really want to cull the candidates list early
505 * with cheap tests in order to avoid doing deltas.
506 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800507 rename_count = find_exact_renames(options);
Linus Torvalds17559a62007-10-25 11:24:47 -0700508
Linus Torvalds42899ac2007-10-26 16:56:34 -0700509 /* Did we only want exact renames? */
510 if (minimum_score == MAX_SCORE)
511 goto cleanup;
512
513 /*
514 * Calculate how many renames are left (but all the source
515 * files still remain as options for rename/copies!)
516 */
517 num_create = (rename_dst_nr - rename_count);
Linus Torvalds42899ac2007-10-26 16:56:34 -0700518
519 /* All done? */
520 if (!num_create)
521 goto cleanup;
522
Junio C Hamanof31027c2011-01-06 13:50:06 -0800523 switch (too_many_rename_candidates(num_create, options)) {
524 case 1:
Linus Torvalds0024a542007-09-14 10:39:48 -0700525 goto cleanup;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800526 case 2:
527 options->degraded_cc_to_c = 1;
528 skip_unmodified = 1;
529 break;
530 default:
531 break;
532 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700533
Jeff King3ac942d2011-02-20 04:51:16 -0500534 if (options->show_rename_progress) {
535 progress = start_progress_delay(
Nguyễn Thái Ngọc Duy754dbc42014-02-21 19:50:18 +0700536 _("Performing inexact rename detection"),
Jeff King3ac942d2011-02-20 04:51:16 -0500537 rename_dst_nr * rename_src_nr, 50, 1);
538 }
539
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800540 mx = xcalloc(num_create * NUM_CANDIDATE_PER_DST, sizeof(*mx));
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700541 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700542 struct diff_filespec *two = rename_dst[i].two;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800543 struct diff_score *m;
544
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700545 if (rename_dst[i].pair)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700546 continue; /* dealt with exact match already. */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800547
548 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
549 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
550 m[j].dst = -1;
551
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700552 for (j = 0; j < rename_src_nr; j++) {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800553 struct diff_filespec *one = rename_src[j].p->one;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800554 struct diff_score this_src;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800555
556 if (skip_unmodified &&
557 diff_unmodified_pair(rename_src[j].p))
558 continue;
559
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800560 this_src.score = estimate_similarity(one, two,
561 minimum_score);
562 this_src.name_score = basename_same(one, two);
563 this_src.dst = i;
564 this_src.src = j;
565 record_if_better(m, &this_src);
Junio C Hamano809809b2009-11-20 22:13:47 -0800566 /*
567 * Once we run estimate_similarity,
568 * We do not need the text anymore.
569 */
Junio C Hamano8ae92e62007-10-02 21:01:03 -0700570 diff_free_filespec_blob(one);
Junio C Hamano809809b2009-11-20 22:13:47 -0800571 diff_free_filespec_blob(two);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700572 }
573 dst_cnt++;
Jeff King3ac942d2011-02-20 04:51:16 -0500574 display_progress(progress, (i+1)*rename_src_nr);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700575 }
Jeff King3ac942d2011-02-20 04:51:16 -0500576 stop_progress(&progress);
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800577
Junio C Hamano427dcb42005-05-21 02:39:09 -0700578 /* cost matrix sorted by most to least similar pair */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800579 qsort(mx, dst_cnt * NUM_CANDIDATE_PER_DST, sizeof(*mx), score_compare);
580
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800581 rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
582 if (detect_rename == DIFF_DETECT_COPY)
583 rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700584 free(mx);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700585
Junio C Hamano15d061b2005-05-27 15:55:55 -0700586 cleanup:
Junio C Hamano427dcb42005-05-21 02:39:09 -0700587 /* At this point, we have found some renames and copies and they
Junio C Hamano5098baf2005-09-15 16:13:43 -0700588 * are recorded in rename_dst. The original list is still in *q.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700589 */
Bo Yang9ca5df92010-05-06 21:52:27 -0700590 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700591 for (i = 0; i < q->nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700592 struct diff_filepair *p = q->queue[i];
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700593 struct diff_filepair *pair_to_free = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700594
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400595 if (DIFF_PAIR_UNMERGED(p)) {
596 diff_q(&outq, p);
597 }
598 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
Junio C Hamano2cd68882005-05-30 00:08:07 -0700599 /*
600 * Creation
601 *
602 * We would output this create record if it has
603 * not been turned into a rename/copy already.
604 */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500605 struct diff_rename_dst *dst = locate_rename_dst(p->two);
Junio C Hamano2cd68882005-05-30 00:08:07 -0700606 if (dst && dst->pair) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700607 diff_q(&outq, dst->pair);
608 pair_to_free = p;
609 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700610 else
Junio C Hamano2cd68882005-05-30 00:08:07 -0700611 /* no matching rename/copy source, so
612 * record this as a creation.
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700613 */
614 diff_q(&outq, p);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700615 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700616 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
617 /*
618 * Deletion
619 *
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700620 * We would output this delete record if:
621 *
622 * (1) this is a broken delete and the counterpart
623 * broken create remains in the output; or
Junio C Hamano5098baf2005-09-15 16:13:43 -0700624 * (2) this is not a broken delete, and rename_dst
625 * does not have a rename/copy to move p->one->path
626 * out of existence.
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700627 *
628 * Otherwise, the counterpart broken create
629 * has been turned into a rename-edit; or
630 * delete did not have a matching create to
631 * begin with.
Junio C Hamano2cd68882005-05-30 00:08:07 -0700632 */
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700633 if (DIFF_PAIR_BROKEN(p)) {
634 /* broken delete */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500635 struct diff_rename_dst *dst = locate_rename_dst(p->one);
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700636 if (dst && dst->pair)
637 /* counterpart is now rename/copy */
638 pair_to_free = p;
639 }
640 else {
Linus Torvalds64479712007-10-25 11:20:56 -0700641 if (p->one->rename_used)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700642 /* this path remains */
643 pair_to_free = p;
644 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700645
646 if (pair_to_free)
647 ;
648 else
649 diff_q(&outq, p);
650 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700651 else if (!diff_unmodified_pair(p))
Junio C Hamano15d061b2005-05-27 15:55:55 -0700652 /* all the usual ones need to be kept */
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700653 diff_q(&outq, p);
Junio C Hamano15d061b2005-05-27 15:55:55 -0700654 else
655 /* no need to keep unmodified pairs */
656 pair_to_free = p;
657
Junio C Hamano226406f2005-05-27 15:50:30 -0700658 if (pair_to_free)
659 diff_free_filepair(pair_to_free);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700660 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700661 diff_debug_queue("done copying original", &outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700662
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700663 free(q->queue);
664 *q = outq;
665 diff_debug_queue("done collapsing", q);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700666
Linus Torvalds9fb88412007-10-25 11:19:10 -0700667 for (i = 0; i < rename_dst_nr; i++)
668 free_filespec(rename_dst[i].two);
Junio C Hamano5098baf2005-09-15 16:13:43 -0700669
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700670 free(rename_dst);
671 rename_dst = NULL;
672 rename_dst_nr = rename_dst_alloc = 0;
673 free(rename_src);
674 rename_src = NULL;
675 rename_src_nr = rename_src_alloc = 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700676 return;
677}