blob: e189f407af3a8cc0155cd7a1146c9daacfe304a8 [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"
Stefan Bellercbd53a22018-05-15 16:42:15 -07007#include "object-store.h"
Karsten Bleesf79d9c52013-11-14 20:20:26 +01008#include "hashmap.h"
Jeff King3ac942d2011-02-20 04:51:16 -05009#include "progress.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -070010
Junio C Hamano25d5ea42005-05-24 01:10:48 -070011/* Table of rename/copy destinations */
Junio C Hamano427dcb42005-05-21 02:39:09 -070012
Junio C Hamano25d5ea42005-05-24 01:10:48 -070013static struct diff_rename_dst {
14 struct diff_filespec *two;
15 struct diff_filepair *pair;
16} *rename_dst;
17static int rename_dst_nr, rename_dst_alloc;
18
Jeff Kingf98c2f72015-02-26 20:39:48 -050019static int find_rename_dst(struct diff_filespec *two)
Junio C Hamano427dcb42005-05-21 02:39:09 -070020{
Junio C Hamano25d5ea42005-05-24 01:10:48 -070021 int first, last;
22
23 first = 0;
24 last = rename_dst_nr;
25 while (last > first) {
René Scharfe568a05c2019-06-13 19:51:56 +020026 int next = first + ((last - first) >> 1);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070027 struct diff_rename_dst *dst = &(rename_dst[next]);
28 int cmp = strcmp(two->path, dst->two->path);
29 if (!cmp)
Jeff Kingf98c2f72015-02-26 20:39:48 -050030 return next;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070031 if (cmp < 0) {
32 last = next;
33 continue;
34 }
35 first = next+1;
36 }
Jeff Kingf98c2f72015-02-26 20:39:48 -050037 return -first - 1;
38}
39
40static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two)
41{
42 int ofs = find_rename_dst(two);
43 return ofs < 0 ? NULL : &rename_dst[ofs];
44}
45
46/*
47 * Returns 0 on success, -1 if we found a duplicate.
48 */
49static int add_rename_dst(struct diff_filespec *two)
50{
51 int first = find_rename_dst(two);
52
53 if (first >= 0)
54 return -1;
55 first = -first - 1;
56
Junio C Hamano25d5ea42005-05-24 01:10:48 -070057 /* insert to make it at "first" */
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040058 ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070059 rename_dst_nr++;
60 if (first < rename_dst_nr)
SZEDER Gáborf919ffe2018-01-22 18:50:09 +010061 MOVE_ARRAY(rename_dst + first + 1, rename_dst + first,
62 rename_dst_nr - first - 1);
Junio C Hamano5098baf2005-09-15 16:13:43 -070063 rename_dst[first].two = alloc_filespec(two->path);
Brandon Williamsf9704c22017-05-30 10:30:50 -070064 fill_filespec(rename_dst[first].two, &two->oid, two->oid_valid,
brian m. carlsona0d12c42016-06-24 23:09:23 +000065 two->mode);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070066 rename_dst[first].pair = NULL;
Jeff Kingf98c2f72015-02-26 20:39:48 -050067 return 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -070068}
69
Junio C Hamano15d061b2005-05-27 15:55:55 -070070/* Table of rename/copy src files */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070071static struct diff_rename_src {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080072 struct diff_filepair *p;
Junio C Hamanofc580712006-04-08 20:17:46 -070073 unsigned short score; /* to remember the break score */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070074} *rename_src;
75static int rename_src_nr, rename_src_alloc;
Junio C Hamano427dcb42005-05-21 02:39:09 -070076
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080077static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
Junio C Hamano25d5ea42005-05-24 01:10:48 -070078{
79 int first, last;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080080 struct diff_filespec *one = p->one;
81 unsigned short score = p->score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070082
83 first = 0;
84 last = rename_src_nr;
85 while (last > first) {
René Scharfe568a05c2019-06-13 19:51:56 +020086 int next = first + ((last - first) >> 1);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070087 struct diff_rename_src *src = &(rename_src[next]);
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080088 int cmp = strcmp(one->path, src->p->one->path);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070089 if (!cmp)
90 return src;
91 if (cmp < 0) {
92 last = next;
93 continue;
94 }
95 first = next+1;
Junio C Hamano427dcb42005-05-21 02:39:09 -070096 }
Junio C Hamano15d061b2005-05-27 15:55:55 -070097
Junio C Hamano25d5ea42005-05-24 01:10:48 -070098 /* insert to make it at "first" */
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040099 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700100 rename_src_nr++;
101 if (first < rename_src_nr)
SZEDER Gáborf919ffe2018-01-22 18:50:09 +0100102 MOVE_ARRAY(rename_src + first + 1, rename_src + first,
103 rename_src_nr - first - 1);
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800104 rename_src[first].p = p;
Junio C Hamanofc580712006-04-08 20:17:46 -0700105 rename_src[first].score = score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700106 return &(rename_src[first]);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700107}
108
Johannes Schindelin0ce39642007-06-21 12:52:11 +0100109static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
110{
111 int src_len = strlen(src->path), dst_len = strlen(dst->path);
112 while (src_len && dst_len) {
113 char c1 = src->path[--src_len];
114 char c2 = dst->path[--dst_len];
115 if (c1 != c2)
116 return 0;
117 if (c1 == '/')
118 return 1;
119 }
120 return (!src_len || src->path[src_len - 1] == '/') &&
121 (!dst_len || dst->path[dst_len - 1] == '/');
122}
123
Junio C Hamano427dcb42005-05-21 02:39:09 -0700124struct diff_score {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700125 int src; /* index in rename_src */
126 int dst; /* index in rename_dst */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800127 unsigned short score;
128 short name_score;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700129};
130
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200131static int estimate_similarity(struct repository *r,
132 struct diff_filespec *src,
Junio C Hamano427dcb42005-05-21 02:39:09 -0700133 struct diff_filespec *dst,
134 int minimum_score)
135{
136 /* src points at a file that existed in the original tree (or
137 * optionally a file in the destination tree) and dst points
138 * at a newly created file. They may be quite similar, in which
139 * case we want to say src is renamed to dst or src is copied into
140 * dst, and then some edit has been applied to dst.
141 *
142 * Compare them and return how similar they are, representing
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700143 * the score as an integer between 0 and MAX_SCORE.
144 *
145 * When there is an exact match, it is considered a better
146 * match than anything else; the destination does not even
147 * call into this function in that case.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700148 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800149 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700150 int score;
151
Junio C Hamano60896c72005-05-22 21:24:49 -0700152 /* We deal only with regular files. Symlink renames are handled
153 * only when they are exact matches --- in other words, no edits
154 * after renaming.
155 */
156 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
157 return 0;
158
Linus Torvalds81ac0512007-10-26 16:51:28 -0700159 /*
160 * Need to check that source and destination sizes are
161 * filled in before comparing them.
162 *
163 * If we already have "cnt_data" filled in, we know it's
164 * all good (avoid checking the size for zero, as that
165 * is a possible size - we really should have a flag to
166 * say whether the size is valid or not!)
167 */
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700168 if (!src->cnt_data &&
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200169 diff_populate_filespec(r, src, CHECK_SIZE_ONLY))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700170 return 0;
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700171 if (!dst->cnt_data &&
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200172 diff_populate_filespec(r, dst, CHECK_SIZE_ONLY))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700173 return 0;
174
Linus Torvalds90bd9322006-03-12 22:26:34 -0800175 max_size = ((src->size > dst->size) ? src->size : dst->size);
Junio C Hamano58b103f2005-05-21 15:55:18 -0700176 base_size = ((src->size < dst->size) ? src->size : dst->size);
Linus Torvalds90bd9322006-03-12 22:26:34 -0800177 delta_size = max_size - base_size;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700178
Junio C Hamano58b103f2005-05-21 15:55:18 -0700179 /* We would not consider edits that change the file size so
180 * drastically. delta_size must be smaller than
Junio C Hamanocd1870e2005-05-22 01:31:28 -0700181 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700182 *
Junio C Hamano58b103f2005-05-21 15:55:18 -0700183 * Note that base_size == 0 case is handled here already
184 * and the final score computation below would not have a
185 * divide-by-zero issue.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700186 */
Linus Torvalds3a4d6762011-02-18 20:12:06 -0800187 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700188 return 0;
189
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200190 if (!src->cnt_data && diff_populate_filespec(r, src, 0))
Björn Steinbrink885c7162009-01-20 16:59:57 +0100191 return 0;
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200192 if (!dst->cnt_data && diff_populate_filespec(r, dst, 0))
Björn Steinbrink885c7162009-01-20 16:59:57 +0100193 return 0;
194
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200195 if (diffcore_count_changes(r, 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 &src_copied, &literal_added))
Junio C Hamano75c660a2005-06-28 16:58:27 -0700198 return 0;
Junio C Hamano85976972005-05-24 12:09:32 -0700199
Junio C Hamano17063062006-03-02 22:11:25 -0800200 /* How similar are they?
201 * what percentage of material in dst are from source?
Junio C Hamano427dcb42005-05-21 02:39:09 -0700202 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800203 if (!dst->size)
Junio C Hamano17063062006-03-02 22:11:25 -0800204 score = 0; /* should not happen */
René Scharfecfc0aef2007-06-25 00:23:28 +0200205 else
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500206 score = (int)(src_copied * MAX_SCORE / max_size);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700207 return score;
208}
209
Junio C Hamano5098baf2005-09-15 16:13:43 -0700210static void record_rename_pair(int dst_index, int src_index, int score)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700211{
Linus Torvalds9fb88412007-10-25 11:19:10 -0700212 struct diff_filespec *src, *dst;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700213 struct diff_filepair *dp;
Junio C Hamanof7c15122005-05-22 21:26:09 -0700214
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700215 if (rename_dst[dst_index].pair)
216 die("internal error: dst already matched.");
217
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800218 src = rename_src[src_index].p->one;
Linus Torvalds64479712007-10-25 11:20:56 -0700219 src->rename_used++;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700220 src->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700221
222 dst = rename_dst[dst_index].two;
Linus Torvalds9fb88412007-10-25 11:19:10 -0700223 dst->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700224
Linus Torvalds9fb88412007-10-25 11:19:10 -0700225 dp = diff_queue(NULL, src, dst);
Junio C Hamanoef677682006-08-03 12:01:01 -0700226 dp->renamed_pair = 1;
Junio C Hamanofc580712006-04-08 20:17:46 -0700227 if (!strcmp(src->path, dst->path))
228 dp->score = rename_src[src_index].score;
229 else
230 dp->score = score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700231 rename_dst[dst_index].pair = dp;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700232}
233
234/*
235 * We sort the rename similarity matrix with the score, in descending
Junio C Hamano15d061b2005-05-27 15:55:55 -0700236 * order (the most similar first).
Junio C Hamano427dcb42005-05-21 02:39:09 -0700237 */
238static int score_compare(const void *a_, const void *b_)
239{
240 const struct diff_score *a = a_, *b = b_;
René Scharfecfc0aef2007-06-25 00:23:28 +0200241
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800242 /* sink the unused ones to the bottom */
243 if (a->dst < 0)
244 return (0 <= b->dst);
245 else if (b->dst < 0)
246 return -1;
247
René Scharfecfc0aef2007-06-25 00:23:28 +0200248 if (a->score == b->score)
249 return b->name_score - a->name_score;
250
Junio C Hamano427dcb42005-05-21 02:39:09 -0700251 return b->score - a->score;
252}
253
Linus Torvalds9027f532007-10-25 11:23:26 -0700254struct file_similarity {
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100255 struct hashmap_entry entry;
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100256 int index;
Linus Torvalds9027f532007-10-25 11:23:26 -0700257 struct diff_filespec *filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700258};
259
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200260static unsigned int hash_filespec(struct repository *r,
261 struct diff_filespec *filespec)
Karsten Blees48f64072013-11-14 20:19:04 +0100262{
brian m. carlson41c95602016-06-24 23:09:24 +0000263 if (!filespec->oid_valid) {
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200264 if (diff_populate_filespec(r, filespec, 0))
Karsten Blees48f64072013-11-14 20:19:04 +0100265 return 0;
Matheus Tavares2dcde202020-01-30 17:32:22 -0300266 hash_object_file(r->hash_algo, filespec->data, filespec->size,
267 "blob", &filespec->oid);
Karsten Blees48f64072013-11-14 20:19:04 +0100268 }
Jeff Kingd40abc82019-06-20 03:41:49 -0400269 return oidhash(&filespec->oid);
Karsten Blees48f64072013-11-14 20:19:04 +0100270}
271
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100272static int find_identical_files(struct hashmap *srcs,
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100273 int dst_index,
Linus Torvalds11f944d2011-02-18 19:55:19 -0800274 struct diff_options *options)
Linus Torvalds9027f532007-10-25 11:23:26 -0700275{
276 int renames = 0;
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;
Eric Wongf0e63c42019-10-06 23:30:35 +0000280 unsigned int hash = hash_filespec(options->repo, target);
Linus Torvalds9027f532007-10-25 11:23:26 -0700281
Karsten Blees48f64072013-11-14 20:19:04 +0100282 /*
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100283 * Find the best source match for specified destination.
Karsten Blees48f64072013-11-14 20:19:04 +0100284 */
Eric Wongf0e63c42019-10-06 23:30:35 +0000285 p = hashmap_get_entry_from_hash(srcs, hash, NULL,
286 struct file_similarity, entry);
Eric Wong23dee692019-10-06 23:30:41 +0000287 hashmap_for_each_entry_from(srcs, p, entry) {
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? */
Jeff King9001dc22018-08-28 17:22:48 -0400292 if (!oideq(&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
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200322static void insert_file_table(struct repository *r,
323 struct hashmap *table, int index,
324 struct diff_filespec *filespec)
Linus Torvalds9027f532007-10-25 11:23:26 -0700325{
Linus Torvalds9027f532007-10-25 11:23:26 -0700326 struct file_similarity *entry = xmalloc(sizeof(*entry));
327
Linus Torvalds9027f532007-10-25 11:23:26 -0700328 entry->index = index;
329 entry->filespec = filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700330
Eric Wongd22245a2019-10-06 23:30:27 +0000331 hashmap_entry_init(&entry->entry, hash_filespec(r, filespec));
Eric Wongb94e5c12019-10-06 23:30:29 +0000332 hashmap_add(table, &entry->entry);
Linus Torvalds9027f532007-10-25 11:23:26 -0700333}
334
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700335/*
336 * Find exact renames first.
337 *
338 * The first round matches up the up-to-date entries,
339 * and then during the second round we try to match
340 * cache-dirty entries as well.
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700341 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800342static int find_exact_renames(struct diff_options *options)
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700343{
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100344 int i, renames = 0;
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100345 struct hashmap file_table;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700346
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200347 /* Add all sources to the hash table in reverse order, because
348 * later on they will be retrieved in LIFO order.
349 */
Stefan Beller7663cdc2017-06-30 12:14:05 -0700350 hashmap_init(&file_table, NULL, NULL, rename_src_nr);
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200351 for (i = rename_src_nr-1; i >= 0; i--)
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200352 insert_file_table(options->repo,
353 &file_table, i,
354 rename_src[i].p->one);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700355
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100356 /* Walk the destinations and find best source match */
Linus Torvalds9027f532007-10-25 11:23:26 -0700357 for (i = 0; i < rename_dst_nr; i++)
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100358 renames += find_identical_files(&file_table, i, options);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700359
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100360 /* Free the hash data structure and entries */
Eric Wongc8e424c2019-10-06 23:30:40 +0000361 hashmap_free_entries(&file_table, struct file_similarity, entry);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700362
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100363 return renames;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700364}
365
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800366#define NUM_CANDIDATE_PER_DST 4
367static void record_if_better(struct diff_score m[], struct diff_score *o)
368{
369 int i, worst;
370
371 /* find the worst one */
372 worst = 0;
373 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
374 if (score_compare(&m[i], &m[worst]) > 0)
375 worst = i;
376
377 /* is it better than the worst one? */
378 if (score_compare(&m[worst], o) > 0)
379 m[worst] = *o;
380}
381
Junio C Hamanof31027c2011-01-06 13:50:06 -0800382/*
383 * Returns:
384 * 0 if we are under the limit;
385 * 1 if we need to disable inexact rename detection;
386 * 2 if we would be under the limit if we were given -C instead of -C -C.
387 */
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800388static int too_many_rename_candidates(int num_create,
389 struct diff_options *options)
390{
391 int rename_limit = options->rename_limit;
392 int num_src = rename_src_nr;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800393 int i;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800394
395 options->needed_rename_limit = 0;
396
397 /*
398 * This basically does a test for the rename matrix not
399 * growing larger than a "rename_limit" square matrix, ie:
400 *
401 * num_create * num_src > rename_limit * rename_limit
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800402 */
Jonathan Tan89973552017-11-29 12:11:54 -0800403 if (rename_limit <= 0)
404 rename_limit = 32767;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800405 if ((num_create <= rename_limit || num_src <= rename_limit) &&
Elijah Newren9f7e4bf2017-11-13 12:15:59 -0800406 ((uint64_t)num_create * (uint64_t)num_src
407 <= (uint64_t)rename_limit * (uint64_t)rename_limit))
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800408 return 0;
409
410 options->needed_rename_limit =
411 num_src > num_create ? num_src : num_create;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800412
413 /* Are we running under -C -C? */
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700414 if (!options->flags.find_copies_harder)
Junio C Hamanof31027c2011-01-06 13:50:06 -0800415 return 1;
416
417 /* Would we bust the limit if we were running under -C? */
418 for (num_src = i = 0; i < rename_src_nr; i++) {
419 if (diff_unmodified_pair(rename_src[i].p))
420 continue;
421 num_src++;
422 }
423 if ((num_create <= rename_limit || num_src <= rename_limit) &&
Elijah Newren9f7e4bf2017-11-13 12:15:59 -0800424 ((uint64_t)num_create * (uint64_t)num_src
425 <= (uint64_t)rename_limit * (uint64_t)rename_limit))
Junio C Hamanof31027c2011-01-06 13:50:06 -0800426 return 2;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -0800427 return 1;
428}
429
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800430static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
431{
432 int count = 0, i;
433
434 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
435 struct diff_rename_dst *dst;
436
437 if ((mx[i].dst < 0) ||
438 (mx[i].score < minimum_score))
439 break; /* there is no more usable pair. */
440 dst = &rename_dst[mx[i].dst];
441 if (dst->pair)
442 continue; /* already done, either exact or fuzzy. */
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800443 if (!copies && rename_src[mx[i].src].p->one->rename_used)
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800444 continue;
445 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
446 count++;
447 }
448 return count;
449}
450
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700451void diffcore_rename(struct diff_options *options)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700452{
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700453 int detect_rename = options->detect_rename;
454 int minimum_score = options->rename_score;
Junio C Hamano38c6f782005-05-21 19:40:36 -0700455 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano5098baf2005-09-15 16:13:43 -0700456 struct diff_queue_struct outq;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700457 struct diff_score *mx;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800458 int i, j, rename_count, skip_unmodified = 0;
Jim Meyeringdabdbee2011-04-29 11:42:41 +0200459 int num_create, dst_cnt;
Jeff King3ac942d2011-02-20 04:51:16 -0500460 struct progress *progress = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700461
Junio C Hamano26dee0a2005-05-21 23:33:32 -0700462 if (!minimum_score)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700463 minimum_score = DEFAULT_RENAME_SCORE;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700464
Junio C Hamano427dcb42005-05-21 02:39:09 -0700465 for (i = 0; i < q->nr; i++) {
Junio C Hamano52e95782005-05-21 02:40:01 -0700466 struct diff_filepair *p = q->queue[i];
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800467 if (!DIFF_FILE_VALID(p->one)) {
Junio C Hamano81e50ea2005-05-21 19:42:18 -0700468 if (!DIFF_FILE_VALID(p->two))
Junio C Hamano60896c72005-05-22 21:24:49 -0700469 continue; /* unmerged */
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800470 else if (options->single_follow &&
471 strcmp(options->single_follow, p->two->path))
472 continue; /* not interested */
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700473 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -0700474 is_empty_blob_oid(&p->two->oid))
Jeff King90d43b02012-03-22 18:52:13 -0400475 continue;
Jeff King4d6be032015-02-26 20:42:27 -0500476 else if (add_rename_dst(p->two) < 0) {
477 warning("skipping rename detection, detected"
478 " duplicate destination '%s'",
479 p->two->path);
480 goto cleanup;
481 }
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800482 }
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700483 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -0700484 is_empty_blob_oid(&p->one->oid))
Jeff King90d43b02012-03-22 18:52:13 -0400485 continue;
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400486 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
Linus Torvalds64479712007-10-25 11:20:56 -0700487 /*
488 * If the source is a broken "delete", and
Junio C Hamano22101002005-06-11 20:55:20 -0700489 * they did not really want to get broken,
490 * that means the source actually stays.
Linus Torvalds64479712007-10-25 11:20:56 -0700491 * So we increment the "rename_used" score
492 * by one, to indicate ourselves as a user
Junio C Hamano22101002005-06-11 20:55:20 -0700493 */
Linus Torvalds64479712007-10-25 11:20:56 -0700494 if (p->broken_pair && !p->score)
495 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800496 register_rename_src(p);
Junio C Hamano22101002005-06-11 20:55:20 -0700497 }
Linus Torvalds64479712007-10-25 11:20:56 -0700498 else if (detect_rename == DIFF_DETECT_COPY) {
499 /*
500 * Increment the "rename_used" score by
501 * one, to indicate ourselves as a user.
502 */
503 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800504 register_rename_src(p);
Linus Torvalds64479712007-10-25 11:20:56 -0700505 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700506 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700507 if (rename_dst_nr == 0 || rename_src_nr == 0)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700508 goto cleanup; /* nothing to do */
509
Linus Torvalds0024a542007-09-14 10:39:48 -0700510 /*
Linus Torvalds17559a62007-10-25 11:24:47 -0700511 * We really want to cull the candidates list early
512 * with cheap tests in order to avoid doing deltas.
513 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800514 rename_count = find_exact_renames(options);
Linus Torvalds17559a62007-10-25 11:24:47 -0700515
Linus Torvalds42899ac2007-10-26 16:56:34 -0700516 /* Did we only want exact renames? */
517 if (minimum_score == MAX_SCORE)
518 goto cleanup;
519
520 /*
521 * Calculate how many renames are left (but all the source
522 * files still remain as options for rename/copies!)
523 */
524 num_create = (rename_dst_nr - rename_count);
Linus Torvalds42899ac2007-10-26 16:56:34 -0700525
526 /* All done? */
527 if (!num_create)
528 goto cleanup;
529
Junio C Hamanof31027c2011-01-06 13:50:06 -0800530 switch (too_many_rename_candidates(num_create, options)) {
531 case 1:
Linus Torvalds0024a542007-09-14 10:39:48 -0700532 goto cleanup;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800533 case 2:
534 options->degraded_cc_to_c = 1;
535 skip_unmodified = 1;
536 break;
537 default:
538 break;
539 }
Linus Torvalds0024a542007-09-14 10:39:48 -0700540
Jeff King3ac942d2011-02-20 04:51:16 -0500541 if (options->show_rename_progress) {
Junio C Hamano8aade102017-08-19 10:39:41 -0700542 progress = start_delayed_progress(
Nguyễn Thái Ngọc Duy754dbc42014-02-21 19:50:18 +0700543 _("Performing inexact rename detection"),
Elijah Newrend6861d02017-11-13 12:15:58 -0800544 (uint64_t)rename_dst_nr * (uint64_t)rename_src_nr);
Jeff King3ac942d2011-02-20 04:51:16 -0500545 }
546
René Scharfe50492f72016-07-30 20:18:31 +0200547 mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700548 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700549 struct diff_filespec *two = rename_dst[i].two;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800550 struct diff_score *m;
551
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700552 if (rename_dst[i].pair)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700553 continue; /* dealt with exact match already. */
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800554
555 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
556 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
557 m[j].dst = -1;
558
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700559 for (j = 0; j < rename_src_nr; j++) {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -0800560 struct diff_filespec *one = rename_src[j].p->one;
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800561 struct diff_score this_src;
Junio C Hamanof31027c2011-01-06 13:50:06 -0800562
563 if (skip_unmodified &&
564 diff_unmodified_pair(rename_src[j].p))
565 continue;
566
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200567 this_src.score = estimate_similarity(options->repo,
568 one, two,
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800569 minimum_score);
570 this_src.name_score = basename_same(one, two);
571 this_src.dst = i;
572 this_src.src = j;
573 record_if_better(m, &this_src);
Junio C Hamano809809b2009-11-20 22:13:47 -0800574 /*
575 * Once we run estimate_similarity,
576 * We do not need the text anymore.
577 */
Junio C Hamano8ae92e62007-10-02 21:01:03 -0700578 diff_free_filespec_blob(one);
Junio C Hamano809809b2009-11-20 22:13:47 -0800579 diff_free_filespec_blob(two);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700580 }
581 dst_cnt++;
Elijah Newrend6861d02017-11-13 12:15:58 -0800582 display_progress(progress, (uint64_t)(i+1)*(uint64_t)rename_src_nr);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700583 }
Jeff King3ac942d2011-02-20 04:51:16 -0500584 stop_progress(&progress);
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800585
Junio C Hamano427dcb42005-05-21 02:39:09 -0700586 /* cost matrix sorted by most to least similar pair */
Johannes Schindelin2049b8d2019-09-30 10:21:55 -0700587 STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800588
Linus Torvalds0940e5f2011-02-18 20:10:32 -0800589 rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
590 if (detect_rename == DIFF_DETECT_COPY)
591 rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700592 free(mx);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700593
Junio C Hamano15d061b2005-05-27 15:55:55 -0700594 cleanup:
Junio C Hamano427dcb42005-05-21 02:39:09 -0700595 /* At this point, we have found some renames and copies and they
Junio C Hamano5098baf2005-09-15 16:13:43 -0700596 * are recorded in rename_dst. The original list is still in *q.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700597 */
Bo Yang9ca5df92010-05-06 21:52:27 -0700598 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700599 for (i = 0; i < q->nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700600 struct diff_filepair *p = q->queue[i];
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700601 struct diff_filepair *pair_to_free = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700602
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -0400603 if (DIFF_PAIR_UNMERGED(p)) {
604 diff_q(&outq, p);
605 }
606 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
Junio C Hamano2cd68882005-05-30 00:08:07 -0700607 /*
608 * Creation
609 *
610 * We would output this create record if it has
611 * not been turned into a rename/copy already.
612 */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500613 struct diff_rename_dst *dst = locate_rename_dst(p->two);
Junio C Hamano2cd68882005-05-30 00:08:07 -0700614 if (dst && dst->pair) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700615 diff_q(&outq, dst->pair);
616 pair_to_free = p;
617 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700618 else
Junio C Hamano2cd68882005-05-30 00:08:07 -0700619 /* no matching rename/copy source, so
620 * record this as a creation.
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700621 */
622 diff_q(&outq, p);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700623 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700624 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
625 /*
626 * Deletion
627 *
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700628 * We would output this delete record if:
629 *
630 * (1) this is a broken delete and the counterpart
631 * broken create remains in the output; or
Junio C Hamano5098baf2005-09-15 16:13:43 -0700632 * (2) this is not a broken delete, and rename_dst
633 * does not have a rename/copy to move p->one->path
634 * out of existence.
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700635 *
636 * Otherwise, the counterpart broken create
637 * has been turned into a rename-edit; or
638 * delete did not have a matching create to
639 * begin with.
Junio C Hamano2cd68882005-05-30 00:08:07 -0700640 */
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700641 if (DIFF_PAIR_BROKEN(p)) {
642 /* broken delete */
Jeff Kingf98c2f72015-02-26 20:39:48 -0500643 struct diff_rename_dst *dst = locate_rename_dst(p->one);
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700644 if (dst && dst->pair)
645 /* counterpart is now rename/copy */
646 pair_to_free = p;
647 }
648 else {
Linus Torvalds64479712007-10-25 11:20:56 -0700649 if (p->one->rename_used)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700650 /* this path remains */
651 pair_to_free = p;
652 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700653
654 if (pair_to_free)
655 ;
656 else
657 diff_q(&outq, p);
658 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700659 else if (!diff_unmodified_pair(p))
Junio C Hamano15d061b2005-05-27 15:55:55 -0700660 /* all the usual ones need to be kept */
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700661 diff_q(&outq, p);
Junio C Hamano15d061b2005-05-27 15:55:55 -0700662 else
663 /* no need to keep unmodified pairs */
664 pair_to_free = p;
665
Junio C Hamano226406f2005-05-27 15:50:30 -0700666 if (pair_to_free)
667 diff_free_filepair(pair_to_free);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700668 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700669 diff_debug_queue("done copying original", &outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700670
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700671 free(q->queue);
672 *q = outq;
673 diff_debug_queue("done collapsing", q);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700674
Linus Torvalds9fb88412007-10-25 11:19:10 -0700675 for (i = 0; i < rename_dst_nr; i++)
676 free_filespec(rename_dst[i].two);
Junio C Hamano5098baf2005-09-15 16:13:43 -0700677
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +0000678 FREE_AND_NULL(rename_dst);
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700679 rename_dst_nr = rename_dst_alloc = 0;
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +0000680 FREE_AND_NULL(rename_src);
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700681 rename_src_nr = rename_src_alloc = 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700682 return;
683}