blob: 7e9ff96d435819307071fd9ff5cf94a0892bb510 [file] [log] [blame]
Junio C Hamano427dcb42005-05-21 02:39:09 -07001/*
Jonathan Tan95acf112020-04-07 15:11:43 -07002 *
Junio C Hamano427dcb42005-05-21 02:39:09 -07003 * Copyright (C) 2005 Junio C Hamano
4 */
Elijah Newrenfc7bd512023-02-24 00:09:34 +00005#include "git-compat-util.h"
Elijah Newren36bf1952023-02-24 00:09:24 +00006#include "alloc.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -07007#include "diff.h"
8#include "diffcore.h"
Stefan Bellercbd53a22018-05-15 16:42:15 -07009#include "object-store.h"
Karsten Bleesf79d9c52013-11-14 20:20:26 +010010#include "hashmap.h"
Elijah Newrenfc7bd512023-02-24 00:09:34 +000011#include "mem-pool.h"
12#include "oid-array.h"
Jeff King3ac942d2011-02-20 04:51:16 -050013#include "progress.h"
Jonathan Tan95acf112020-04-07 15:11:43 -070014#include "promisor-remote.h"
Elijah Newrenfc7bd512023-02-24 00:09:34 +000015#include "string-list.h"
Elijah Newren9db2ac52020-12-11 09:08:47 +000016#include "strmap.h"
Elijah Newrenfc7bd512023-02-24 00:09:34 +000017#include "trace2.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -070018
Junio C Hamano25d5ea42005-05-24 01:10:48 -070019/* Table of rename/copy destinations */
Junio C Hamano427dcb42005-05-21 02:39:09 -070020
Junio C Hamano25d5ea42005-05-24 01:10:48 -070021static struct diff_rename_dst {
Elijah Newren9db2ac52020-12-11 09:08:47 +000022 struct diff_filepair *p;
23 struct diff_filespec *filespec_to_free;
24 int is_rename; /* false -> just a create; true -> rename or copy */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070025} *rename_dst;
26static int rename_dst_nr, rename_dst_alloc;
Elijah Newren9db2ac52020-12-11 09:08:47 +000027/* Mapping from break source pathname to break destination index */
28static struct strintmap *break_idx = NULL;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070029
Elijah Newren9db2ac52020-12-11 09:08:47 +000030static struct diff_rename_dst *locate_rename_dst(struct diff_filepair *p)
Junio C Hamano427dcb42005-05-21 02:39:09 -070031{
Elijah Newren9db2ac52020-12-11 09:08:47 +000032 /* Lookup by p->ONE->path */
33 int idx = break_idx ? strintmap_get(break_idx, p->one->path) : -1;
34 return (idx == -1) ? NULL : &rename_dst[idx];
Jeff Kingf98c2f72015-02-26 20:39:48 -050035}
36
37/*
38 * Returns 0 on success, -1 if we found a duplicate.
39 */
Elijah Newren9db2ac52020-12-11 09:08:47 +000040static int add_rename_dst(struct diff_filepair *p)
Jeff Kingf98c2f72015-02-26 20:39:48 -050041{
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040042 ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
Elijah Newren9db2ac52020-12-11 09:08:47 +000043 rename_dst[rename_dst_nr].p = p;
44 rename_dst[rename_dst_nr].filespec_to_free = NULL;
45 rename_dst[rename_dst_nr].is_rename = 0;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070046 rename_dst_nr++;
Jeff Kingf98c2f72015-02-26 20:39:48 -050047 return 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -070048}
49
Junio C Hamano15d061b2005-05-27 15:55:55 -070050/* Table of rename/copy src files */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070051static struct diff_rename_src {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080052 struct diff_filepair *p;
Junio C Hamanofc580712006-04-08 20:17:46 -070053 unsigned short score; /* to remember the break score */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070054} *rename_src;
55static int rename_src_nr, rename_src_alloc;
Junio C Hamano427dcb42005-05-21 02:39:09 -070056
Elijah Newrenb970b4e2020-12-11 09:08:46 +000057static void register_rename_src(struct diff_filepair *p)
Junio C Hamano25d5ea42005-05-24 01:10:48 -070058{
Elijah Newren9db2ac52020-12-11 09:08:47 +000059 if (p->broken_pair) {
60 if (!break_idx) {
61 break_idx = xmalloc(sizeof(*break_idx));
Elijah Newren61bf4492021-06-08 16:11:40 +000062 strintmap_init_with_options(break_idx, -1, NULL, 0);
Elijah Newren9db2ac52020-12-11 09:08:47 +000063 }
64 strintmap_set(break_idx, p->one->path, rename_dst_nr);
65 }
66
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040067 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
Elijah Newrenb970b4e2020-12-11 09:08:46 +000068 rename_src[rename_src_nr].p = p;
69 rename_src[rename_src_nr].score = p->score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070070 rename_src_nr++;
Junio C Hamano427dcb42005-05-21 02:39:09 -070071}
72
Johannes Schindelin0ce39642007-06-21 12:52:11 +010073static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
74{
75 int src_len = strlen(src->path), dst_len = strlen(dst->path);
76 while (src_len && dst_len) {
77 char c1 = src->path[--src_len];
78 char c2 = dst->path[--dst_len];
79 if (c1 != c2)
80 return 0;
81 if (c1 == '/')
82 return 1;
83 }
84 return (!src_len || src->path[src_len - 1] == '/') &&
85 (!dst_len || dst->path[dst_len - 1] == '/');
86}
87
Junio C Hamano427dcb42005-05-21 02:39:09 -070088struct diff_score {
Junio C Hamano25d5ea42005-05-24 01:10:48 -070089 int src; /* index in rename_src */
90 int dst; /* index in rename_dst */
Junio C Hamano6d24ad92008-01-29 20:54:56 -080091 unsigned short score;
92 short name_score;
Junio C Hamano427dcb42005-05-21 02:39:09 -070093};
94
Elijah Newren1aedd032021-06-22 08:04:40 +000095struct inexact_prefetch_options {
Jonathan Tan95acf112020-04-07 15:11:43 -070096 struct repository *repo;
97 int skip_unmodified;
98};
Elijah Newren1aedd032021-06-22 08:04:40 +000099static void inexact_prefetch(void *prefetch_options)
Jonathan Tan95acf112020-04-07 15:11:43 -0700100{
Elijah Newren1aedd032021-06-22 08:04:40 +0000101 struct inexact_prefetch_options *options = prefetch_options;
Jonathan Tan95acf112020-04-07 15:11:43 -0700102 int i;
103 struct oid_array to_fetch = OID_ARRAY_INIT;
104
105 for (i = 0; i < rename_dst_nr; i++) {
Elijah Newren9db2ac52020-12-11 09:08:47 +0000106 if (rename_dst[i].p->renamed_pair)
Jonathan Tan95acf112020-04-07 15:11:43 -0700107 /*
108 * The loop in diffcore_rename() will not need these
109 * blobs, so skip prefetching.
110 */
111 continue; /* already found exact match */
112 diff_add_if_missing(options->repo, &to_fetch,
Elijah Newren9db2ac52020-12-11 09:08:47 +0000113 rename_dst[i].p->two);
Jonathan Tan95acf112020-04-07 15:11:43 -0700114 }
115 for (i = 0; i < rename_src_nr; i++) {
116 if (options->skip_unmodified &&
117 diff_unmodified_pair(rename_src[i].p))
118 /*
119 * The loop in diffcore_rename() will not need these
120 * blobs, so skip prefetching.
121 */
122 continue;
123 diff_add_if_missing(options->repo, &to_fetch,
124 rename_src[i].p->one);
125 }
126 promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
127 oid_array_clear(&to_fetch);
128}
129
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200130static int estimate_similarity(struct repository *r,
131 struct diff_filespec *src,
Junio C Hamano427dcb42005-05-21 02:39:09 -0700132 struct diff_filespec *dst,
Jonathan Tan95acf112020-04-07 15:11:43 -0700133 int minimum_score,
Elijah Newrend331dd32021-06-22 08:04:39 +0000134 struct diff_populate_filespec_options *dpf_opt)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700135{
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 */
Elijah Newrend331dd32021-06-22 08:04:39 +0000168 dpf_opt->check_size_only = 1;
169
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700170 if (!src->cnt_data &&
Elijah Newrend331dd32021-06-22 08:04:39 +0000171 diff_populate_filespec(r, src, dpf_opt))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700172 return 0;
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700173 if (!dst->cnt_data &&
Elijah Newrend331dd32021-06-22 08:04:39 +0000174 diff_populate_filespec(r, dst, dpf_opt))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700175 return 0;
176
Linus Torvalds90bd9322006-03-12 22:26:34 -0800177 max_size = ((src->size > dst->size) ? src->size : dst->size);
Junio C Hamano58b103f2005-05-21 15:55:18 -0700178 base_size = ((src->size < dst->size) ? src->size : dst->size);
Linus Torvalds90bd9322006-03-12 22:26:34 -0800179 delta_size = max_size - base_size;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700180
Junio C Hamano58b103f2005-05-21 15:55:18 -0700181 /* We would not consider edits that change the file size so
182 * drastically. delta_size must be smaller than
Junio C Hamanocd1870e2005-05-22 01:31:28 -0700183 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700184 *
Junio C Hamano58b103f2005-05-21 15:55:18 -0700185 * Note that base_size == 0 case is handled here already
186 * and the final score computation below would not have a
187 * divide-by-zero issue.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700188 */
Linus Torvalds3a4d6762011-02-18 20:12:06 -0800189 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700190 return 0;
191
Elijah Newrend331dd32021-06-22 08:04:39 +0000192 dpf_opt->check_size_only = 0;
Jonathan Tan95acf112020-04-07 15:11:43 -0700193
Elijah Newrend331dd32021-06-22 08:04:39 +0000194 if (!src->cnt_data && diff_populate_filespec(r, src, dpf_opt))
Björn Steinbrink885c7162009-01-20 16:59:57 +0100195 return 0;
Elijah Newrend331dd32021-06-22 08:04:39 +0000196 if (!dst->cnt_data && diff_populate_filespec(r, dst, dpf_opt))
Björn Steinbrink885c7162009-01-20 16:59:57 +0100197 return 0;
198
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200199 if (diffcore_count_changes(r, src, dst,
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800200 &src->cnt_data, &dst->cnt_data,
Junio C Hamano65416752006-02-28 16:01:36 -0800201 &src_copied, &literal_added))
Junio C Hamano75c660a2005-06-28 16:58:27 -0700202 return 0;
Junio C Hamano85976972005-05-24 12:09:32 -0700203
Junio C Hamano17063062006-03-02 22:11:25 -0800204 /* How similar are they?
205 * what percentage of material in dst are from source?
Junio C Hamano427dcb42005-05-21 02:39:09 -0700206 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800207 if (!dst->size)
Junio C Hamano17063062006-03-02 22:11:25 -0800208 score = 0; /* should not happen */
René Scharfecfc0aef2007-06-25 00:23:28 +0200209 else
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500210 score = (int)(src_copied * MAX_SCORE / max_size);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700211 return score;
212}
213
Junio C Hamano5098baf2005-09-15 16:13:43 -0700214static void record_rename_pair(int dst_index, int src_index, int score)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700215{
Elijah Newren9db2ac52020-12-11 09:08:47 +0000216 struct diff_filepair *src = rename_src[src_index].p;
217 struct diff_filepair *dst = rename_dst[dst_index].p;
Junio C Hamanof7c15122005-05-22 21:26:09 -0700218
Elijah Newren9db2ac52020-12-11 09:08:47 +0000219 if (dst->renamed_pair)
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700220 die("internal error: dst already matched.");
221
Elijah Newren9db2ac52020-12-11 09:08:47 +0000222 src->one->rename_used++;
223 src->one->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700224
Elijah Newren9db2ac52020-12-11 09:08:47 +0000225 rename_dst[dst_index].filespec_to_free = dst->one;
226 rename_dst[dst_index].is_rename = 1;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700227
Elijah Newren9db2ac52020-12-11 09:08:47 +0000228 dst->one = src->one;
229 dst->renamed_pair = 1;
230 if (!strcmp(dst->one->path, dst->two->path))
231 dst->score = rename_src[src_index].score;
Junio C Hamanofc580712006-04-08 20:17:46 -0700232 else
Elijah Newren9db2ac52020-12-11 09:08:47 +0000233 dst->score = score;
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
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200262static unsigned int hash_filespec(struct repository *r,
263 struct diff_filespec *filespec)
Karsten Blees48f64072013-11-14 20:19:04 +0100264{
brian m. carlson41c95602016-06-24 23:09:24 +0000265 if (!filespec->oid_valid) {
Jonathan Tan1c37e862020-04-07 15:11:41 -0700266 if (diff_populate_filespec(r, filespec, NULL))
Karsten Blees48f64072013-11-14 20:19:04 +0100267 return 0;
Matheus Tavares2dcde202020-01-30 17:32:22 -0300268 hash_object_file(r->hash_algo, filespec->data, filespec->size,
Ævar Arnfjörð Bjarmason44439c12022-02-05 00:48:32 +0100269 OBJ_BLOB, &filespec->oid);
Karsten Blees48f64072013-11-14 20:19:04 +0100270 }
Jeff Kingd40abc82019-06-20 03:41:49 -0400271 return oidhash(&filespec->oid);
Karsten Blees48f64072013-11-14 20:19:04 +0100272}
273
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100274static int find_identical_files(struct hashmap *srcs,
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100275 int dst_index,
Linus Torvalds11f944d2011-02-18 19:55:19 -0800276 struct diff_options *options)
Linus Torvalds9027f532007-10-25 11:23:26 -0700277{
278 int renames = 0;
Elijah Newren9db2ac52020-12-11 09:08:47 +0000279 struct diff_filespec *target = rename_dst[dst_index].p->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;
Eric Wongf0e63c42019-10-06 23:30:35 +0000282 unsigned int hash = hash_filespec(options->repo, target);
Linus Torvalds9027f532007-10-25 11:23:26 -0700283
Karsten Blees48f64072013-11-14 20:19:04 +0100284 /*
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100285 * Find the best source match for specified destination.
Karsten Blees48f64072013-11-14 20:19:04 +0100286 */
Eric Wongf0e63c42019-10-06 23:30:35 +0000287 p = hashmap_get_entry_from_hash(srcs, hash, NULL,
288 struct file_similarity, entry);
Eric Wong23dee692019-10-06 23:30:41 +0000289 hashmap_for_each_entry_from(srcs, p, entry) {
Karsten Blees48f64072013-11-14 20:19:04 +0100290 int score;
291 struct diff_filespec *source = p->filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700292
Karsten Blees48f64072013-11-14 20:19:04 +0100293 /* False hash collision? */
Jeff King9001dc22018-08-28 17:22:48 -0400294 if (!oideq(&source->oid, &target->oid))
Karsten Blees48f64072013-11-14 20:19:04 +0100295 continue;
296 /* Non-regular files? If so, the modes must match! */
297 if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
298 if (source->mode != target->mode)
Linus Torvalds9027f532007-10-25 11:23:26 -0700299 continue;
Karsten Blees48f64072013-11-14 20:19:04 +0100300 }
301 /* Give higher scores to sources that haven't been used already */
302 score = !source->rename_used;
303 if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
304 continue;
305 score += basename_same(source, target);
306 if (score > best_score) {
307 best = p;
308 best_score = score;
309 if (score == 2)
Linus Torvalds9027f532007-10-25 11:23:26 -0700310 break;
311 }
Karsten Blees48f64072013-11-14 20:19:04 +0100312
313 /* Too many identical alternatives? Pick one */
314 if (!--i)
315 break;
316 }
317 if (best) {
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100318 record_rename_pair(dst_index, best->index, MAX_SCORE);
Karsten Blees48f64072013-11-14 20:19:04 +0100319 renames++;
320 }
Linus Torvalds9027f532007-10-25 11:23:26 -0700321 return renames;
322}
323
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200324static void insert_file_table(struct repository *r,
Elijah Newrenfa0e9362021-07-30 11:47:37 +0000325 struct mem_pool *pool,
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200326 struct hashmap *table, int index,
327 struct diff_filespec *filespec)
Linus Torvalds9027f532007-10-25 11:23:26 -0700328{
Elijah Newrenfa0e9362021-07-30 11:47:37 +0000329 struct file_similarity *entry = mem_pool_alloc(pool, sizeof(*entry));
Linus Torvalds9027f532007-10-25 11:23:26 -0700330
Linus Torvalds9027f532007-10-25 11:23:26 -0700331 entry->index = index;
332 entry->filespec = filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700333
Eric Wongd22245a2019-10-06 23:30:27 +0000334 hashmap_entry_init(&entry->entry, hash_filespec(r, filespec));
Eric Wongb94e5c12019-10-06 23:30:29 +0000335 hashmap_add(table, &entry->entry);
Linus Torvalds9027f532007-10-25 11:23:26 -0700336}
337
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700338/*
339 * Find exact renames first.
340 *
341 * The first round matches up the up-to-date entries,
342 * and then during the second round we try to match
343 * cache-dirty entries as well.
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700344 */
Elijah Newrenfa0e9362021-07-30 11:47:37 +0000345static int find_exact_renames(struct diff_options *options,
346 struct mem_pool *pool)
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700347{
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100348 int i, renames = 0;
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100349 struct hashmap file_table;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700350
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200351 /* Add all sources to the hash table in reverse order, because
352 * later on they will be retrieved in LIFO order.
353 */
Stefan Beller7663cdc2017-06-30 12:14:05 -0700354 hashmap_init(&file_table, NULL, NULL, rename_src_nr);
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200355 for (i = rename_src_nr-1; i >= 0; i--)
Elijah Newrenfa0e9362021-07-30 11:47:37 +0000356 insert_file_table(options->repo, pool,
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200357 &file_table, i,
358 rename_src[i].p->one);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700359
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100360 /* Walk the destinations and find best source match */
Linus Torvalds9027f532007-10-25 11:23:26 -0700361 for (i = 0; i < rename_dst_nr; i++)
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100362 renames += find_identical_files(&file_table, i, options);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700363
Elijah Newrenfa0e9362021-07-30 11:47:37 +0000364 /* Free the hash data structure (entries will be freed with the pool) */
365 hashmap_clear(&file_table);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700366
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100367 return renames;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700368}
369
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000370struct dir_rename_info {
371 struct strintmap idx_map;
372 struct strmap dir_rename_guess;
373 struct strmap *dir_rename_count;
Elijah Newrena49b55d2021-03-13 22:22:02 +0000374 struct strintmap *relevant_source_dirs;
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000375 unsigned setup;
376};
377
378static char *get_dirname(const char *filename)
379{
380 char *slash = strrchr(filename, '/');
381 return slash ? xstrndup(filename, slash - filename) : xstrdup("");
382}
383
Elijah Newren0c4fd732021-02-27 00:30:42 +0000384static void dirname_munge(char *filename)
385{
386 char *slash = strrchr(filename, '/');
387 if (!slash)
388 slash = filename;
389 *slash = '\0';
390}
391
Elijah Newren81afdf72021-02-27 00:30:48 +0000392static const char *get_highest_rename_path(struct strintmap *counts)
393{
394 int highest_count = 0;
395 const char *highest_destination_dir = NULL;
396 struct hashmap_iter iter;
397 struct strmap_entry *entry;
398
399 strintmap_for_each_entry(counts, &iter, entry) {
400 const char *destination_dir = entry->key;
401 intptr_t count = (intptr_t)entry->value;
402 if (count > highest_count) {
403 highest_count = count;
404 highest_destination_dir = destination_dir;
405 }
406 }
407 return highest_destination_dir;
408}
409
Elijah Newren0491d392021-03-13 22:22:05 +0000410static char *UNKNOWN_DIR = "/"; /* placeholder -- short, illegal directory */
411
412static int dir_rename_already_determinable(struct strintmap *counts)
413{
414 struct hashmap_iter iter;
415 struct strmap_entry *entry;
416 int first = 0, second = 0, unknown = 0;
417 strintmap_for_each_entry(counts, &iter, entry) {
418 const char *destination_dir = entry->key;
419 intptr_t count = (intptr_t)entry->value;
420 if (!strcmp(destination_dir, UNKNOWN_DIR)) {
421 unknown = count;
422 } else if (count >= first) {
423 second = first;
424 first = count;
425 } else if (count >= second) {
426 second = count;
427 }
428 }
429 return first > second + unknown;
430}
431
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000432static void increment_count(struct dir_rename_info *info,
Elijah Newren0c4fd732021-02-27 00:30:42 +0000433 char *old_dir,
434 char *new_dir)
435{
436 struct strintmap *counts;
437 struct strmap_entry *e;
438
439 /* Get the {new_dirs -> counts} mapping using old_dir */
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000440 e = strmap_get_entry(info->dir_rename_count, old_dir);
Elijah Newren0c4fd732021-02-27 00:30:42 +0000441 if (e) {
442 counts = e->value;
443 } else {
444 counts = xmalloc(sizeof(*counts));
445 strintmap_init_with_options(counts, 0, NULL, 1);
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000446 strmap_put(info->dir_rename_count, old_dir, counts);
Elijah Newren0c4fd732021-02-27 00:30:42 +0000447 }
448
449 /* Increment the count for new_dir */
450 strintmap_incr(counts, new_dir, 1);
451}
452
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000453static void update_dir_rename_counts(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000454 struct strintmap *dirs_removed,
Elijah Newren0c4fd732021-02-27 00:30:42 +0000455 const char *oldname,
456 const char *newname)
457{
Andrzej Hunt4e3250b2021-07-25 15:08:23 +0200458 char *old_dir;
459 char *new_dir;
460 const char new_dir_first_char = newname[0];
Elijah Newren0c4fd732021-02-27 00:30:42 +0000461 int first_time_in_loop = 1;
462
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000463 if (!info->setup)
464 /*
465 * info->setup is 0 here in two cases: (1) all auxiliary
466 * vars (like dirs_removed) were NULL so
467 * initialize_dir_rename_info() returned early, or (2)
468 * either break detection or copy detection are active so
469 * that we never called initialize_dir_rename_info(). In
470 * the former case, we don't have enough info to know if
471 * directories were renamed (because dirs_removed lets us
472 * know about a necessary prerequisite, namely if they were
473 * removed), and in the latter, we don't care about
474 * directory renames or find_basename_matches.
475 *
476 * This matters because both basename and inexact matching
477 * will also call update_dir_rename_counts(). In either of
478 * the above two cases info->dir_rename_counts will not
479 * have been properly initialized which prevents us from
480 * updating it, but in these two cases we don't care about
481 * dir_rename_counts anyway, so we can just exit early.
482 */
483 return;
484
Andrzej Hunt4e3250b2021-07-25 15:08:23 +0200485
486 old_dir = xstrdup(oldname);
487 new_dir = xstrdup(newname);
488
Elijah Newren0c4fd732021-02-27 00:30:42 +0000489 while (1) {
Elijah Newrene54385b2021-03-13 22:22:04 +0000490 int drd_flag = NOT_RELEVANT;
491
Elijah Newren333899e2021-02-27 00:30:47 +0000492 /* Get old_dir, skip if its directory isn't relevant. */
Elijah Newren0c4fd732021-02-27 00:30:42 +0000493 dirname_munge(old_dir);
Elijah Newren333899e2021-02-27 00:30:47 +0000494 if (info->relevant_source_dirs &&
Elijah Newrena49b55d2021-03-13 22:22:02 +0000495 !strintmap_contains(info->relevant_source_dirs, old_dir))
Elijah Newren333899e2021-02-27 00:30:47 +0000496 break;
497
498 /* Get new_dir */
Elijah Newren0c4fd732021-02-27 00:30:42 +0000499 dirname_munge(new_dir);
500
501 /*
502 * When renaming
503 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
504 * then this suggests that both
505 * a/b/c/d/e/ => a/b/some/thing/else/e/
506 * a/b/c/d/ => a/b/some/thing/else/
507 * so we want to increment counters for both. We do NOT,
508 * however, also want to suggest that there was the following
509 * rename:
510 * a/b/c/ => a/b/some/thing/
511 * so we need to quit at that point.
512 *
513 * Note the when first_time_in_loop, we only strip off the
514 * basename, and we don't care if that's different.
515 */
516 if (!first_time_in_loop) {
517 char *old_sub_dir = strchr(old_dir, '\0')+1;
518 char *new_sub_dir = strchr(new_dir, '\0')+1;
519 if (!*new_dir) {
520 /*
521 * Special case when renaming to root directory,
522 * i.e. when new_dir == "". In this case, we had
523 * something like
524 * a/b/subdir => subdir
525 * and so dirname_munge() sets things up so that
526 * old_dir = "a/b\0subdir\0"
527 * new_dir = "\0ubdir\0"
528 * We didn't have a '/' to overwrite a '\0' onto
529 * in new_dir, so we have to compare differently.
530 */
531 if (new_dir_first_char != old_sub_dir[0] ||
532 strcmp(old_sub_dir+1, new_sub_dir))
533 break;
534 } else {
535 if (strcmp(old_sub_dir, new_sub_dir))
536 break;
537 }
538 }
539
Elijah Newrene54385b2021-03-13 22:22:04 +0000540 /*
541 * Above we suggested that we'd keep recording renames for
542 * all ancestor directories where the trailing directories
543 * matched, i.e. for
544 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
545 * we'd increment rename counts for each of
546 * a/b/c/d/e/ => a/b/some/thing/else/e/
547 * a/b/c/d/ => a/b/some/thing/else/
548 * However, we only need the rename counts for directories
549 * in dirs_removed whose value is RELEVANT_FOR_SELF.
550 * However, we add one special case of also recording it for
551 * first_time_in_loop because find_basename_matches() can
552 * use that as a hint to find a good pairing.
553 */
554 if (dirs_removed)
555 drd_flag = strintmap_get(dirs_removed, old_dir);
556 if (drd_flag == RELEVANT_FOR_SELF || first_time_in_loop)
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000557 increment_count(info, old_dir, new_dir);
Elijah Newren0c4fd732021-02-27 00:30:42 +0000558
Elijah Newrene54385b2021-03-13 22:22:04 +0000559 first_time_in_loop = 0;
560 if (drd_flag == NOT_RELEVANT)
561 break;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000562 /* If we hit toplevel directory ("") for old or new dir, quit */
563 if (!*old_dir || !*new_dir)
564 break;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000565 }
566
567 /* Free resources we don't need anymore */
568 free(old_dir);
569 free(new_dir);
570}
571
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000572static void initialize_dir_rename_info(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000573 struct strintmap *relevant_sources,
574 struct strintmap *dirs_removed,
Elijah Newren25e65b62021-05-20 06:09:41 +0000575 struct strmap *dir_rename_count,
576 struct strmap *cached_pairs)
Elijah Newren0c4fd732021-02-27 00:30:42 +0000577{
Elijah Newren81afdf72021-02-27 00:30:48 +0000578 struct hashmap_iter iter;
579 struct strmap_entry *entry;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000580 int i;
581
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000582 if (!dirs_removed && !relevant_sources) {
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000583 info->setup = 0;
584 return;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000585 }
Elijah Newrenae8cf742021-02-27 00:30:41 +0000586 info->setup = 1;
587
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000588 info->dir_rename_count = dir_rename_count;
589 if (!info->dir_rename_count) {
590 info->dir_rename_count = xmalloc(sizeof(*dir_rename_count));
591 strmap_init(info->dir_rename_count);
592 }
Elijah Newrenae8cf742021-02-27 00:30:41 +0000593 strintmap_init_with_options(&info->idx_map, -1, NULL, 0);
594 strmap_init_with_options(&info->dir_rename_guess, NULL, 0);
Elijah Newrenae8cf742021-02-27 00:30:41 +0000595
Elijah Newren333899e2021-02-27 00:30:47 +0000596 /* Setup info->relevant_source_dirs */
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000597 info->relevant_source_dirs = NULL;
598 if (dirs_removed || !relevant_sources) {
599 info->relevant_source_dirs = dirs_removed; /* might be NULL */
600 } else {
601 info->relevant_source_dirs = xmalloc(sizeof(struct strintmap));
Elijah Newrena49b55d2021-03-13 22:22:02 +0000602 strintmap_init(info->relevant_source_dirs, 0 /* unused */);
603 strintmap_for_each_entry(relevant_sources, &iter, entry) {
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000604 char *dirname = get_dirname(entry->key);
605 if (!dirs_removed ||
Elijah Newrena49b55d2021-03-13 22:22:02 +0000606 strintmap_contains(dirs_removed, dirname))
607 strintmap_set(info->relevant_source_dirs,
608 dirname, 0 /* value irrelevant */);
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000609 free(dirname);
610 }
611 }
Elijah Newren333899e2021-02-27 00:30:47 +0000612
Elijah Newrenae8cf742021-02-27 00:30:41 +0000613 /*
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000614 * Loop setting up both info->idx_map, and doing setup of
615 * info->dir_rename_count.
Elijah Newrenae8cf742021-02-27 00:30:41 +0000616 */
617 for (i = 0; i < rename_dst_nr; ++i) {
618 /*
619 * For non-renamed files, make idx_map contain mapping of
620 * filename -> index (index within rename_dst, that is)
621 */
622 if (!rename_dst[i].is_rename) {
623 char *filename = rename_dst[i].p->two->path;
624 strintmap_set(&info->idx_map, filename, i);
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000625 continue;
Elijah Newrenae8cf742021-02-27 00:30:41 +0000626 }
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000627
628 /*
629 * For everything else (i.e. renamed files), make
630 * dir_rename_count contain a map of a map:
631 * old_directory -> {new_directory -> count}
632 * In other words, for every pair look at the directories for
633 * the old filename and the new filename and count how many
634 * times that pairing occurs.
635 */
636 update_dir_rename_counts(info, dirs_removed,
637 rename_dst[i].p->one->path,
638 rename_dst[i].p->two->path);
Elijah Newrenae8cf742021-02-27 00:30:41 +0000639 }
Elijah Newren81afdf72021-02-27 00:30:48 +0000640
Elijah Newren25e65b62021-05-20 06:09:41 +0000641 /* Add cached_pairs to counts */
642 strmap_for_each_entry(cached_pairs, &iter, entry) {
643 const char *old_name = entry->key;
644 const char *new_name = entry->value;
645 if (!new_name)
646 /* known delete; ignore it */
647 continue;
648
649 update_dir_rename_counts(info, dirs_removed, old_name, new_name);
650 }
651
Elijah Newren81afdf72021-02-27 00:30:48 +0000652 /*
653 * Now we collapse
654 * dir_rename_count: old_directory -> {new_directory -> count}
655 * down to
656 * dir_rename_guess: old_directory -> best_new_directory
657 * where best_new_directory is the one with the highest count.
658 */
659 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
660 /* entry->key is source_dir */
661 struct strintmap *counts = entry->value;
662 char *best_newdir;
663
664 best_newdir = xstrdup(get_highest_rename_path(counts));
665 strmap_put(&info->dir_rename_guess, entry->key,
666 best_newdir);
667 }
Elijah Newrenae8cf742021-02-27 00:30:41 +0000668}
669
Elijah Newrencd52e002021-02-27 00:30:43 +0000670void partial_clear_dir_rename_count(struct strmap *dir_rename_count)
671{
672 struct hashmap_iter iter;
673 struct strmap_entry *entry;
674
675 strmap_for_each_entry(dir_rename_count, &iter, entry) {
676 struct strintmap *counts = entry->value;
677 strintmap_clear(counts);
678 }
679 strmap_partial_clear(dir_rename_count, 1);
680}
681
Elijah Newrenb1473012021-02-27 00:30:45 +0000682static void cleanup_dir_rename_info(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000683 struct strintmap *dirs_removed,
Elijah Newrenb1473012021-02-27 00:30:45 +0000684 int keep_dir_rename_count)
Elijah Newrenae8cf742021-02-27 00:30:41 +0000685{
Elijah Newrenb1473012021-02-27 00:30:45 +0000686 struct hashmap_iter iter;
687 struct strmap_entry *entry;
688 struct string_list to_remove = STRING_LIST_INIT_NODUP;
689 int i;
690
Elijah Newrenae8cf742021-02-27 00:30:41 +0000691 if (!info->setup)
692 return;
693
694 /* idx_map */
695 strintmap_clear(&info->idx_map);
696
697 /* dir_rename_guess */
698 strmap_clear(&info->dir_rename_guess, 1);
699
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000700 /* relevant_source_dirs */
701 if (info->relevant_source_dirs &&
702 info->relevant_source_dirs != dirs_removed) {
Elijah Newrena49b55d2021-03-13 22:22:02 +0000703 strintmap_clear(info->relevant_source_dirs);
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000704 FREE_AND_NULL(info->relevant_source_dirs);
705 }
706
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000707 /* dir_rename_count */
Elijah Newrenb1473012021-02-27 00:30:45 +0000708 if (!keep_dir_rename_count) {
709 partial_clear_dir_rename_count(info->dir_rename_count);
710 strmap_clear(info->dir_rename_count, 1);
711 FREE_AND_NULL(info->dir_rename_count);
712 return;
713 }
714
715 /*
716 * Although dir_rename_count was passed in
717 * diffcore_rename_extended() and we want to keep it around and
Elijah Newrenbf238b72021-03-13 22:22:06 +0000718 * return it to that caller, we first want to remove any counts in
719 * the maps associated with UNKNOWN_DIR entries and any data
Elijah Newrenb1473012021-02-27 00:30:45 +0000720 * associated with directories that weren't renamed.
721 */
722 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
723 const char *source_dir = entry->key;
724 struct strintmap *counts = entry->value;
725
Elijah Newrenfb529382021-03-13 22:22:03 +0000726 if (!strintmap_get(dirs_removed, source_dir)) {
Elijah Newrenb1473012021-02-27 00:30:45 +0000727 string_list_append(&to_remove, source_dir);
728 strintmap_clear(counts);
729 continue;
730 }
Elijah Newrenbf238b72021-03-13 22:22:06 +0000731
732 if (strintmap_contains(counts, UNKNOWN_DIR))
733 strintmap_remove(counts, UNKNOWN_DIR);
Elijah Newrenb1473012021-02-27 00:30:45 +0000734 }
735 for (i = 0; i < to_remove.nr; ++i)
736 strmap_remove(info->dir_rename_count,
737 to_remove.items[i].string, 1);
738 string_list_clear(&to_remove, 0);
Elijah Newrenae8cf742021-02-27 00:30:41 +0000739}
740
Elijah Newrena35df332021-02-14 07:51:47 +0000741static const char *get_basename(const char *filename)
742{
743 /*
744 * gitbasename() has to worry about special drives, multiple
745 * directory separator characters, trailing slashes, NULL or
746 * empty strings, etc. We only work on filenames as stored in
747 * git, and thus get to ignore all those complications.
748 */
749 const char *base = strrchr(filename, '/');
750 return base ? base + 1 : filename;
751}
752
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000753static int idx_possible_rename(char *filename, struct dir_rename_info *info)
Elijah Newren37a25142021-02-27 00:30:39 +0000754{
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000755 /*
756 * Our comparison of files with the same basename (see
757 * find_basename_matches() below), is only helpful when after exact
758 * rename detection we have exactly one file with a given basename
759 * among the rename sources and also only exactly one file with
760 * that basename among the rename destinations. When we have
761 * multiple files with the same basename in either set, we do not
762 * know which to compare against. However, there are some
763 * filenames that occur in large numbers (particularly
764 * build-related filenames such as 'Makefile', '.gitignore', or
765 * 'build.gradle' that potentially exist within every single
766 * subdirectory), and for performance we want to be able to quickly
767 * find renames for these files too.
768 *
769 * The reason basename comparisons are a useful heuristic was that it
770 * is common for people to move files across directories while keeping
771 * their filename the same. If we had a way of determining or even
772 * making a good educated guess about which directory these non-unique
773 * basename files had moved the file to, we could check it.
774 * Luckily...
775 *
776 * When an entire directory is in fact renamed, we have two factors
777 * helping us out:
778 * (a) the original directory disappeared giving us a hint
779 * about when we can apply an extra heuristic.
780 * (a) we often have several files within that directory and
781 * subdirectories that are renamed without changes
782 * So, rules for a heuristic:
783 * (0) If there basename matches are non-unique (the condition under
784 * which this function is called) AND
785 * (1) the directory in which the file was found has disappeared
786 * (i.e. dirs_removed is non-NULL and has a relevant entry) THEN
787 * (2) use exact renames of files within the directory to determine
788 * where the directory is likely to have been renamed to. IF
789 * there is at least one exact rename from within that
790 * directory, we can proceed.
791 * (3) If there are multiple places the directory could have been
792 * renamed to based on exact renames, ignore all but one of them.
793 * Just use the destination with the most renames going to it.
794 * (4) Check if applying that directory rename to the original file
795 * would result in a destination filename that is in the
796 * potential rename set. If so, return the index of the
797 * destination file (the index within rename_dst).
798 * (5) Compare the original file and returned destination for
799 * similarity, and if they are sufficiently similar, record the
800 * rename.
801 *
802 * This function, idx_possible_rename(), is only responsible for (4).
Elijah Newren81afdf72021-02-27 00:30:48 +0000803 * The conditions/steps in (1)-(3) are handled via setting up
804 * dir_rename_count and dir_rename_guess in
805 * initialize_dir_rename_info(). Steps (0) and (5) are handled by
806 * the caller of this function.
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000807 */
808 char *old_dir, *new_dir;
809 struct strbuf new_path = STRBUF_INIT;
810 int idx;
811
812 if (!info->setup)
813 return -1;
814
815 old_dir = get_dirname(filename);
816 new_dir = strmap_get(&info->dir_rename_guess, old_dir);
817 free(old_dir);
818 if (!new_dir)
819 return -1;
820
821 strbuf_addstr(&new_path, new_dir);
822 strbuf_addch(&new_path, '/');
823 strbuf_addstr(&new_path, get_basename(filename));
824
825 idx = strintmap_get(&info->idx_map, new_path.buf);
826 strbuf_release(&new_path);
827 return idx;
Elijah Newren37a25142021-02-27 00:30:39 +0000828}
829
Elijah Newren1aedd032021-06-22 08:04:40 +0000830struct basename_prefetch_options {
831 struct repository *repo;
832 struct strintmap *relevant_sources;
833 struct strintmap *sources;
834 struct strintmap *dests;
835 struct dir_rename_info *info;
836};
837static void basename_prefetch(void *prefetch_options)
838{
839 struct basename_prefetch_options *options = prefetch_options;
840 struct strintmap *relevant_sources = options->relevant_sources;
841 struct strintmap *sources = options->sources;
842 struct strintmap *dests = options->dests;
843 struct dir_rename_info *info = options->info;
844 int i;
845 struct oid_array to_fetch = OID_ARRAY_INIT;
846
847 /*
848 * TODO: The following loops mirror the code/logic from
849 * find_basename_matches(), though not quite exactly. Maybe
850 * abstract the iteration logic out somehow?
851 */
852 for (i = 0; i < rename_src_nr; ++i) {
853 char *filename = rename_src[i].p->one->path;
854 const char *base = NULL;
855 intptr_t src_index;
856 intptr_t dst_index;
857
858 /* Skip irrelevant sources */
859 if (relevant_sources &&
860 !strintmap_contains(relevant_sources, filename))
861 continue;
862
863 /*
864 * If the basename is unique among remaining sources, then
865 * src_index will equal 'i' and we can attempt to match it
866 * to a unique basename in the destinations. Otherwise,
867 * use directory rename heuristics, if possible.
868 */
869 base = get_basename(filename);
870 src_index = strintmap_get(sources, base);
871 assert(src_index == -1 || src_index == i);
872
873 if (strintmap_contains(dests, base)) {
874 struct diff_filespec *one, *two;
875
876 /* Find a matching destination, if possible */
877 dst_index = strintmap_get(dests, base);
878 if (src_index == -1 || dst_index == -1) {
879 src_index = i;
880 dst_index = idx_possible_rename(filename, info);
881 }
882 if (dst_index == -1)
883 continue;
884
885 /* Ignore this dest if already used in a rename */
886 if (rename_dst[dst_index].is_rename)
887 continue; /* already used previously */
888
889 one = rename_src[src_index].p->one;
890 two = rename_dst[dst_index].p->two;
891
892 /* Add the pairs */
893 diff_add_if_missing(options->repo, &to_fetch, two);
894 diff_add_if_missing(options->repo, &to_fetch, one);
895 }
896 }
897
898 promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
899 oid_array_clear(&to_fetch);
900}
901
Elijah Newrena35df332021-02-14 07:51:47 +0000902static int find_basename_matches(struct diff_options *options,
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000903 int minimum_score,
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000904 struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000905 struct strintmap *relevant_sources,
906 struct strintmap *dirs_removed)
Elijah Newrena35df332021-02-14 07:51:47 +0000907{
Elijah Newrenda09f652021-02-14 07:51:48 +0000908 /*
909 * When I checked in early 2020, over 76% of file renames in linux
910 * just moved files to a different directory but kept the same
911 * basename. gcc did that with over 64% of renames, gecko did it
912 * with over 79%, and WebKit did it with over 89%.
913 *
914 * Therefore we can bypass the normal exhaustive NxM matrix
915 * comparison of similarities between all potential rename sources
916 * and destinations by instead using file basename as a hint (i.e.
917 * the portion of the filename after the last '/'), checking for
918 * similarity between files with the same basename, and if we find
919 * a pair that are sufficiently similar, record the rename pair and
920 * exclude those two from the NxM matrix.
921 *
922 * This *might* cause us to find a less than optimal pairing (if
923 * there is another file that we are even more similar to but has a
924 * different basename). Given the huge performance advantage
925 * basename matching provides, and given the frequency with which
926 * people use the same basename in real world projects, that's a
927 * trade-off we are willing to accept when doing just rename
928 * detection.
929 *
930 * If someone wants copy detection that implies they are willing to
931 * spend more cycles to find similarities between files, so it may
932 * be less likely that this heuristic is wanted. If someone is
933 * doing break detection, that means they do not want filename
934 * similarity to imply any form of content similiarity, and thus
935 * this heuristic would definitely be incompatible.
936 */
937
938 int i, renames = 0;
Elijah Newrena35df332021-02-14 07:51:47 +0000939 struct strintmap sources;
940 struct strintmap dests;
Elijah Newrend331dd32021-06-22 08:04:39 +0000941 struct diff_populate_filespec_options dpf_options = {
942 .check_binary = 0,
943 .missing_object_cb = NULL,
944 .missing_object_data = NULL
945 };
Elijah Newren1aedd032021-06-22 08:04:40 +0000946 struct basename_prefetch_options prefetch_options = {
Elijah Newrend331dd32021-06-22 08:04:39 +0000947 .repo = options->repo,
Elijah Newren1aedd032021-06-22 08:04:40 +0000948 .relevant_sources = relevant_sources,
949 .sources = &sources,
950 .dests = &dests,
951 .info = info
Elijah Newrend331dd32021-06-22 08:04:39 +0000952 };
Elijah Newrena35df332021-02-14 07:51:47 +0000953
954 /*
955 * Create maps of basename -> fullname(s) for remaining sources and
956 * dests.
957 */
958 strintmap_init_with_options(&sources, -1, NULL, 0);
959 strintmap_init_with_options(&dests, -1, NULL, 0);
960 for (i = 0; i < rename_src_nr; ++i) {
961 char *filename = rename_src[i].p->one->path;
962 const char *base;
963
964 /* exact renames removed in remove_unneeded_paths_from_src() */
965 assert(!rename_src[i].p->one->rename_used);
966
967 /* Record index within rename_src (i) if basename is unique */
968 base = get_basename(filename);
969 if (strintmap_contains(&sources, base))
970 strintmap_set(&sources, base, -1);
971 else
972 strintmap_set(&sources, base, i);
973 }
974 for (i = 0; i < rename_dst_nr; ++i) {
975 char *filename = rename_dst[i].p->two->path;
976 const char *base;
977
978 if (rename_dst[i].is_rename)
979 continue; /* involved in exact match already. */
980
981 /* Record index within rename_dst (i) if basename is unique */
982 base = get_basename(filename);
983 if (strintmap_contains(&dests, base))
984 strintmap_set(&dests, base, -1);
985 else
986 strintmap_set(&dests, base, i);
987 }
988
Elijah Newrend331dd32021-06-22 08:04:39 +0000989 if (options->repo == the_repository && has_promisor_remote()) {
Elijah Newren1aedd032021-06-22 08:04:40 +0000990 dpf_options.missing_object_cb = basename_prefetch;
Elijah Newrend331dd32021-06-22 08:04:39 +0000991 dpf_options.missing_object_data = &prefetch_options;
992 }
993
Elijah Newrenda09f652021-02-14 07:51:48 +0000994 /* Now look for basename matchups and do similarity estimation */
Elijah Newren37a25142021-02-27 00:30:39 +0000995 for (i = 0; i < rename_src_nr; ++i) {
996 char *filename = rename_src[i].p->one->path;
997 const char *base = NULL;
998 intptr_t src_index;
Elijah Newrenda09f652021-02-14 07:51:48 +0000999 intptr_t dst_index;
Elijah Newrenda09f652021-02-14 07:51:48 +00001000
Elijah Newrene4fd06e2021-03-11 00:38:31 +00001001 /* Skip irrelevant sources */
1002 if (relevant_sources &&
Elijah Newrena49b55d2021-03-13 22:22:02 +00001003 !strintmap_contains(relevant_sources, filename))
Elijah Newrene4fd06e2021-03-11 00:38:31 +00001004 continue;
1005
Elijah Newren37a25142021-02-27 00:30:39 +00001006 /*
1007 * If the basename is unique among remaining sources, then
1008 * src_index will equal 'i' and we can attempt to match it
1009 * to a unique basename in the destinations. Otherwise,
1010 * use directory rename heuristics, if possible.
1011 */
1012 base = get_basename(filename);
1013 src_index = strintmap_get(&sources, base);
1014 assert(src_index == -1 || src_index == i);
1015
1016 if (strintmap_contains(&dests, base)) {
Elijah Newrenda09f652021-02-14 07:51:48 +00001017 struct diff_filespec *one, *two;
1018 int score;
1019
Elijah Newren37a25142021-02-27 00:30:39 +00001020 /* Find a matching destination, if possible */
1021 dst_index = strintmap_get(&dests, base);
1022 if (src_index == -1 || dst_index == -1) {
1023 src_index = i;
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001024 dst_index = idx_possible_rename(filename, info);
Elijah Newren37a25142021-02-27 00:30:39 +00001025 }
1026 if (dst_index == -1)
1027 continue;
1028
1029 /* Ignore this dest if already used in a rename */
1030 if (rename_dst[dst_index].is_rename)
1031 continue; /* already used previously */
1032
Elijah Newrenda09f652021-02-14 07:51:48 +00001033 /* Estimate the similarity */
1034 one = rename_src[src_index].p->one;
1035 two = rename_dst[dst_index].p->two;
1036 score = estimate_similarity(options->repo, one, two,
Elijah Newrend331dd32021-06-22 08:04:39 +00001037 minimum_score, &dpf_options);
Elijah Newrenda09f652021-02-14 07:51:48 +00001038
1039 /* If sufficiently similar, record as rename pair */
1040 if (score < minimum_score)
1041 continue;
1042 record_rename_pair(dst_index, src_index, score);
1043 renames++;
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001044 update_dir_rename_counts(info, dirs_removed,
1045 one->path, two->path);
Elijah Newrenda09f652021-02-14 07:51:48 +00001046
1047 /*
1048 * Found a rename so don't need text anymore; if we
1049 * didn't find a rename, the filespec_blob would get
1050 * re-used when doing the matrix of comparisons.
1051 */
1052 diff_free_filespec_blob(one);
1053 diff_free_filespec_blob(two);
1054 }
1055 }
Elijah Newrena35df332021-02-14 07:51:47 +00001056
1057 strintmap_clear(&sources);
1058 strintmap_clear(&dests);
1059
Elijah Newrenda09f652021-02-14 07:51:48 +00001060 return renames;
Elijah Newrena35df332021-02-14 07:51:47 +00001061}
1062
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001063#define NUM_CANDIDATE_PER_DST 4
1064static void record_if_better(struct diff_score m[], struct diff_score *o)
1065{
1066 int i, worst;
1067
1068 /* find the worst one */
1069 worst = 0;
1070 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
1071 if (score_compare(&m[i], &m[worst]) > 0)
1072 worst = i;
1073
1074 /* is it better than the worst one? */
1075 if (score_compare(&m[worst], o) > 0)
1076 m[worst] = *o;
1077}
1078
Junio C Hamanof31027c2011-01-06 13:50:06 -08001079/*
1080 * Returns:
1081 * 0 if we are under the limit;
1082 * 1 if we need to disable inexact rename detection;
1083 * 2 if we would be under the limit if we were given -C instead of -C -C.
1084 */
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001085static int too_many_rename_candidates(int num_destinations, int num_sources,
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001086 struct diff_options *options)
1087{
1088 int rename_limit = options->rename_limit;
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001089 int i, limited_sources;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001090
1091 options->needed_rename_limit = 0;
1092
1093 /*
1094 * This basically does a test for the rename matrix not
1095 * growing larger than a "rename_limit" square matrix, ie:
1096 *
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001097 * num_destinations * num_sources > rename_limit * rename_limit
Elijah Newrenad8a1be2020-12-11 09:08:42 +00001098 *
1099 * We use st_mult() to check overflow conditions; in the
1100 * exceptional circumstance that size_t isn't large enough to hold
1101 * the multiplication, the system won't be able to allocate enough
1102 * memory for the matrix anyway.
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001103 */
Jonathan Tan89973552017-11-29 12:11:54 -08001104 if (rename_limit <= 0)
Elijah Newren9dd29db2021-07-15 00:45:23 +00001105 return 0; /* treat as unlimited */
Elijah Newrenad8a1be2020-12-11 09:08:42 +00001106 if (st_mult(num_destinations, num_sources)
1107 <= st_mult(rename_limit, rename_limit))
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001108 return 0;
1109
1110 options->needed_rename_limit =
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001111 num_sources > num_destinations ? num_sources : num_destinations;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001112
1113 /* Are we running under -C -C? */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001114 if (!options->flags.find_copies_harder)
Junio C Hamanof31027c2011-01-06 13:50:06 -08001115 return 1;
1116
1117 /* Would we bust the limit if we were running under -C? */
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001118 for (limited_sources = i = 0; i < num_sources; i++) {
Junio C Hamanof31027c2011-01-06 13:50:06 -08001119 if (diff_unmodified_pair(rename_src[i].p))
1120 continue;
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001121 limited_sources++;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001122 }
Elijah Newrenad8a1be2020-12-11 09:08:42 +00001123 if (st_mult(num_destinations, limited_sources)
1124 <= st_mult(rename_limit, rename_limit))
Junio C Hamanof31027c2011-01-06 13:50:06 -08001125 return 2;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001126 return 1;
1127}
1128
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001129static int find_renames(struct diff_score *mx,
1130 int dst_cnt,
1131 int minimum_score,
1132 int copies,
1133 struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001134 struct strintmap *dirs_removed)
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001135{
1136 int count = 0, i;
1137
1138 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
1139 struct diff_rename_dst *dst;
1140
1141 if ((mx[i].dst < 0) ||
1142 (mx[i].score < minimum_score))
1143 break; /* there is no more usable pair. */
1144 dst = &rename_dst[mx[i].dst];
Elijah Newren9db2ac52020-12-11 09:08:47 +00001145 if (dst->is_rename)
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001146 continue; /* already done, either exact or fuzzy. */
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001147 if (!copies && rename_src[mx[i].src].p->one->rename_used)
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001148 continue;
1149 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
1150 count++;
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001151 update_dir_rename_counts(info, dirs_removed,
1152 rename_src[mx[i].src].p->one->path,
1153 rename_dst[mx[i].dst].p->two->path);
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001154 }
1155 return count;
1156}
1157
Elijah Newren97998892021-03-11 00:38:24 +00001158static void remove_unneeded_paths_from_src(int detecting_copies,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001159 struct strintmap *interesting)
Elijah Newren829514c2021-02-14 07:35:01 +00001160{
1161 int i, new_num_src;
1162
Elijah Newren97998892021-03-11 00:38:24 +00001163 if (detecting_copies && !interesting)
Elijah Newren829514c2021-02-14 07:35:01 +00001164 return; /* nothing to remove */
1165 if (break_idx)
1166 return; /* culling incompatible with break detection */
1167
1168 /*
1169 * Note on reasons why we cull unneeded sources but not destinations:
1170 * 1) Pairings are stored in rename_dst (not rename_src), which we
1171 * need to keep around. So, we just can't cull rename_dst even
1172 * if we wanted to. But doing so wouldn't help because...
1173 *
1174 * 2) There is a matrix pairwise comparison that follows the
1175 * "Performing inexact rename detection" progress message.
1176 * Iterating over the destinations is done in the outer loop,
1177 * hence we only iterate over each of those once and we can
1178 * easily skip the outer loop early if the destination isn't
1179 * relevant. That's only one check per destination path to
1180 * skip.
1181 *
1182 * By contrast, the sources are iterated in the inner loop; if
1183 * we check whether a source can be skipped, then we'll be
1184 * checking it N separate times, once for each destination.
1185 * We don't want to have to iterate over known-not-needed
1186 * sources N times each, so avoid that by removing the sources
1187 * from rename_src here.
1188 */
1189 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
Elijah Newren97998892021-03-11 00:38:24 +00001190 struct diff_filespec *one = rename_src[i].p->one;
1191
Elijah Newren829514c2021-02-14 07:35:01 +00001192 /*
1193 * renames are stored in rename_dst, so if a rename has
1194 * already been detected using this source, we can just
1195 * remove the source knowing rename_dst has its info.
1196 */
Elijah Newren97998892021-03-11 00:38:24 +00001197 if (!detecting_copies && one->rename_used)
1198 continue;
1199
1200 /* If we don't care about the source path, skip it */
Elijah Newrena49b55d2021-03-13 22:22:02 +00001201 if (interesting && !strintmap_contains(interesting, one->path))
Elijah Newren829514c2021-02-14 07:35:01 +00001202 continue;
1203
1204 if (new_num_src < i)
1205 memcpy(&rename_src[new_num_src], &rename_src[i],
1206 sizeof(struct diff_rename_src));
1207 new_num_src++;
1208 }
1209
1210 rename_src_nr = new_num_src;
1211}
1212
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001213static void handle_early_known_dir_renames(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001214 struct strintmap *relevant_sources,
1215 struct strintmap *dirs_removed)
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001216{
1217 /*
Elijah Newren0491d392021-03-13 22:22:05 +00001218 * Directory renames are determined via an aggregate of all renames
1219 * under them and using a "majority wins" rule. The fact that
1220 * "majority wins", though, means we don't need all the renames
1221 * under the given directory, we only need enough to ensure we have
1222 * a majority.
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001223 */
Elijah Newren0491d392021-03-13 22:22:05 +00001224
Elijah Newren9bd34212021-03-13 22:22:08 +00001225 int i, new_num_src;
Elijah Newren0491d392021-03-13 22:22:05 +00001226 struct hashmap_iter iter;
1227 struct strmap_entry *entry;
1228
1229 if (!dirs_removed || !relevant_sources)
1230 return; /* nothing to cull */
1231 if (break_idx)
1232 return; /* culling incompatbile with break detection */
1233
1234 /*
Elijah Newrenbf238b72021-03-13 22:22:06 +00001235 * Supplement dir_rename_count with number of potential renames,
1236 * marking all potential rename sources as mapping to UNKNOWN_DIR.
Elijah Newren0491d392021-03-13 22:22:05 +00001237 */
Elijah Newrenbf238b72021-03-13 22:22:06 +00001238 for (i = 0; i < rename_src_nr; i++) {
1239 char *old_dir;
1240 struct diff_filespec *one = rename_src[i].p->one;
1241
1242 /*
1243 * sources that are part of a rename will have already been
1244 * removed by a prior call to remove_unneeded_paths_from_src()
1245 */
1246 assert(!one->rename_used);
1247
1248 old_dir = get_dirname(one->path);
1249 while (*old_dir != '\0' &&
1250 NOT_RELEVANT != strintmap_get(dirs_removed, old_dir)) {
1251 char *freeme = old_dir;
1252
1253 increment_count(info, old_dir, UNKNOWN_DIR);
1254 old_dir = get_dirname(old_dir);
1255
1256 /* Free resources we don't need anymore */
1257 free(freeme);
1258 }
1259 /*
1260 * old_dir and new_dir free'd in increment_count, but
1261 * get_dirname() gives us a new pointer we need to free for
1262 * old_dir. Also, if the loop runs 0 times we need old_dir
1263 * to be freed.
1264 */
1265 free(old_dir);
1266 }
Elijah Newren0491d392021-03-13 22:22:05 +00001267
1268 /*
1269 * For any directory which we need a potential rename detected for
1270 * (i.e. those marked as RELEVANT_FOR_SELF in dirs_removed), check
1271 * whether we have enough renames to satisfy the "majority rules"
1272 * requirement such that detecting any more renames of files under
1273 * it won't change the result. For any such directory, mark that
1274 * we no longer need to detect a rename for it. However, since we
1275 * might need to still detect renames for an ancestor of that
1276 * directory, use RELEVANT_FOR_ANCESTOR.
1277 */
1278 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
1279 /* entry->key is source_dir */
1280 struct strintmap *counts = entry->value;
1281
1282 if (strintmap_get(dirs_removed, entry->key) ==
1283 RELEVANT_FOR_SELF &&
1284 dir_rename_already_determinable(counts)) {
1285 strintmap_set(dirs_removed, entry->key,
1286 RELEVANT_FOR_ANCESTOR);
1287 }
1288 }
Elijah Newren9bd34212021-03-13 22:22:08 +00001289
1290 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
1291 struct diff_filespec *one = rename_src[i].p->one;
1292 int val;
1293
1294 val = strintmap_get(relevant_sources, one->path);
1295
1296 /*
1297 * sources that were not found in relevant_sources should
1298 * have already been removed by a prior call to
1299 * remove_unneeded_paths_from_src()
1300 */
1301 assert(val != -1);
1302
1303 if (val == RELEVANT_LOCATION) {
1304 int removable = 1;
1305 char *dir = get_dirname(one->path);
1306 while (1) {
1307 char *freeme = dir;
1308 int res = strintmap_get(dirs_removed, dir);
1309
1310 /* Quit if not found or irrelevant */
1311 if (res == NOT_RELEVANT)
1312 break;
1313 /* If RELEVANT_FOR_SELF, can't remove */
1314 if (res == RELEVANT_FOR_SELF) {
1315 removable = 0;
1316 break;
1317 }
1318 /* Else continue searching upwards */
1319 assert(res == RELEVANT_FOR_ANCESTOR);
1320 dir = get_dirname(dir);
1321 free(freeme);
1322 }
1323 free(dir);
1324 if (removable) {
1325 strintmap_set(relevant_sources, one->path,
1326 RELEVANT_NO_MORE);
1327 continue;
1328 }
1329 }
1330
1331 if (new_num_src < i)
1332 memcpy(&rename_src[new_num_src], &rename_src[i],
1333 sizeof(struct diff_rename_src));
1334 new_num_src++;
1335 }
1336
1337 rename_src_nr = new_num_src;
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001338}
1339
Elijah Newrena8791ef2021-07-30 11:47:41 +00001340static void free_filespec_data(struct diff_filespec *spec)
1341{
1342 if (!--spec->count)
1343 diff_free_filespec_data(spec);
1344}
1345
Elijah Newrena8791ef2021-07-30 11:47:41 +00001346static void pool_free_filespec(struct mem_pool *pool,
1347 struct diff_filespec *spec)
1348{
1349 if (!pool) {
1350 free_filespec(spec);
1351 return;
1352 }
1353
1354 /*
1355 * Similar to free_filespec(), but only frees the data. The spec
1356 * itself was allocated in the pool and should not be individually
1357 * freed.
1358 */
1359 free_filespec_data(spec);
1360}
1361
Elijah Newrena8791ef2021-07-30 11:47:41 +00001362void pool_diff_free_filepair(struct mem_pool *pool,
1363 struct diff_filepair *p)
1364{
1365 if (!pool) {
1366 diff_free_filepair(p);
1367 return;
1368 }
1369
1370 /*
1371 * Similar to diff_free_filepair() but only frees the data from the
1372 * filespecs; not the filespecs or the filepair which were
1373 * allocated from the pool.
1374 */
1375 free_filespec_data(p->one);
1376 free_filespec_data(p->two);
1377}
1378
Elijah Newren0c4fd732021-02-27 00:30:42 +00001379void diffcore_rename_extended(struct diff_options *options,
Elijah Newrenf239fff2021-07-30 11:47:42 +00001380 struct mem_pool *pool,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001381 struct strintmap *relevant_sources,
1382 struct strintmap *dirs_removed,
Elijah Newren25e65b62021-05-20 06:09:41 +00001383 struct strmap *dir_rename_count,
1384 struct strmap *cached_pairs)
Junio C Hamano427dcb42005-05-21 02:39:09 -07001385{
Junio C Hamano8082d8d2005-09-21 00:18:27 -07001386 int detect_rename = options->detect_rename;
1387 int minimum_score = options->rename_score;
Junio C Hamano38c6f782005-05-21 19:40:36 -07001388 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano5098baf2005-09-15 16:13:43 -07001389 struct diff_queue_struct outq;
Junio C Hamano427dcb42005-05-21 02:39:09 -07001390 struct diff_score *mx;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001391 int i, j, rename_count, skip_unmodified = 0;
Elijah Newren26a66a62020-12-11 09:08:40 +00001392 int num_destinations, dst_cnt;
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001393 int num_sources, want_copies;
Jeff King3ac942d2011-02-20 04:51:16 -05001394 struct progress *progress = NULL;
Elijah Newrenfa0e9362021-07-30 11:47:37 +00001395 struct mem_pool local_pool;
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001396 struct dir_rename_info info;
Elijah Newrend331dd32021-06-22 08:04:39 +00001397 struct diff_populate_filespec_options dpf_options = {
1398 .check_binary = 0,
1399 .missing_object_cb = NULL,
1400 .missing_object_data = NULL
1401 };
Elijah Newren1aedd032021-06-22 08:04:40 +00001402 struct inexact_prefetch_options prefetch_options = {
Elijah Newrend331dd32021-06-22 08:04:39 +00001403 .repo = options->repo
1404 };
Junio C Hamano427dcb42005-05-21 02:39:09 -07001405
Elijah Newren557ac032021-01-23 22:01:12 -08001406 trace2_region_enter("diff", "setup", options->repo);
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001407 info.setup = 0;
Elijah Newren0c4fd732021-02-27 00:30:42 +00001408 assert(!dir_rename_count || strmap_empty(dir_rename_count));
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001409 want_copies = (detect_rename == DIFF_DETECT_COPY);
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001410 if (dirs_removed && (break_idx || want_copies))
1411 BUG("dirs_removed incompatible with break/copy detection");
Elijah Newren97998892021-03-11 00:38:24 +00001412 if (break_idx && relevant_sources)
1413 BUG("break detection incompatible with source specification");
Junio C Hamano26dee0a2005-05-21 23:33:32 -07001414 if (!minimum_score)
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001415 minimum_score = DEFAULT_RENAME_SCORE;
Junio C Hamano427dcb42005-05-21 02:39:09 -07001416
Junio C Hamano427dcb42005-05-21 02:39:09 -07001417 for (i = 0; i < q->nr; i++) {
Junio C Hamano52e95782005-05-21 02:40:01 -07001418 struct diff_filepair *p = q->queue[i];
Junio C Hamano2f3f8b22006-11-02 00:02:11 -08001419 if (!DIFF_FILE_VALID(p->one)) {
Junio C Hamano81e50ea2005-05-21 19:42:18 -07001420 if (!DIFF_FILE_VALID(p->two))
Junio C Hamano60896c72005-05-22 21:24:49 -07001421 continue; /* unmerged */
Junio C Hamano2f3f8b22006-11-02 00:02:11 -08001422 else if (options->single_follow &&
1423 strcmp(options->single_follow, p->two->path))
1424 continue; /* not interested */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001425 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -07001426 is_empty_blob_oid(&p->two->oid))
Jeff King90d43b02012-03-22 18:52:13 -04001427 continue;
Elijah Newren9db2ac52020-12-11 09:08:47 +00001428 else if (add_rename_dst(p) < 0) {
Jeff King4d6be032015-02-26 20:42:27 -05001429 warning("skipping rename detection, detected"
1430 " duplicate destination '%s'",
1431 p->two->path);
1432 goto cleanup;
1433 }
Junio C Hamano2f3f8b22006-11-02 00:02:11 -08001434 }
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001435 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -07001436 is_empty_blob_oid(&p->one->oid))
Jeff King90d43b02012-03-22 18:52:13 -04001437 continue;
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -04001438 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
Linus Torvalds64479712007-10-25 11:20:56 -07001439 /*
1440 * If the source is a broken "delete", and
Junio C Hamano22101002005-06-11 20:55:20 -07001441 * they did not really want to get broken,
1442 * that means the source actually stays.
Linus Torvalds64479712007-10-25 11:20:56 -07001443 * So we increment the "rename_used" score
1444 * by one, to indicate ourselves as a user
Junio C Hamano22101002005-06-11 20:55:20 -07001445 */
Linus Torvalds64479712007-10-25 11:20:56 -07001446 if (p->broken_pair && !p->score)
1447 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001448 register_rename_src(p);
Junio C Hamano22101002005-06-11 20:55:20 -07001449 }
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001450 else if (want_copies) {
Linus Torvalds64479712007-10-25 11:20:56 -07001451 /*
1452 * Increment the "rename_used" score by
1453 * one, to indicate ourselves as a user.
1454 */
1455 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001456 register_rename_src(p);
Linus Torvalds64479712007-10-25 11:20:56 -07001457 }
Junio C Hamano427dcb42005-05-21 02:39:09 -07001458 }
Elijah Newren557ac032021-01-23 22:01:12 -08001459 trace2_region_leave("diff", "setup", options->repo);
Linus Torvalds0024a542007-09-14 10:39:48 -07001460 if (rename_dst_nr == 0 || rename_src_nr == 0)
Junio C Hamano427dcb42005-05-21 02:39:09 -07001461 goto cleanup; /* nothing to do */
1462
Elijah Newren557ac032021-01-23 22:01:12 -08001463 trace2_region_enter("diff", "exact renames", options->repo);
Elijah Newrenfa0e9362021-07-30 11:47:37 +00001464 mem_pool_init(&local_pool, 32*1024);
Linus Torvalds0024a542007-09-14 10:39:48 -07001465 /*
Linus Torvalds17559a62007-10-25 11:24:47 -07001466 * We really want to cull the candidates list early
1467 * with cheap tests in order to avoid doing deltas.
1468 */
Elijah Newrenfa0e9362021-07-30 11:47:37 +00001469 rename_count = find_exact_renames(options, &local_pool);
1470 /*
1471 * Discard local_pool immediately instead of at "cleanup:" in order
1472 * to reduce maximum memory usage; inexact rename detection uses up
1473 * a fair amount of memory, and mem_pools can too.
1474 */
1475 mem_pool_discard(&local_pool, 0);
Elijah Newren557ac032021-01-23 22:01:12 -08001476 trace2_region_leave("diff", "exact renames", options->repo);
Linus Torvalds17559a62007-10-25 11:24:47 -07001477
Linus Torvalds42899ac2007-10-26 16:56:34 -07001478 /* Did we only want exact renames? */
1479 if (minimum_score == MAX_SCORE)
1480 goto cleanup;
1481
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001482 num_sources = rename_src_nr;
Linus Torvalds42899ac2007-10-26 16:56:34 -07001483
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001484 if (want_copies || break_idx) {
1485 /*
1486 * Cull sources:
1487 * - remove ones corresponding to exact renames
Elijah Newren97998892021-03-11 00:38:24 +00001488 * - remove ones not found in relevant_sources
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001489 */
1490 trace2_region_enter("diff", "cull after exact", options->repo);
Elijah Newren97998892021-03-11 00:38:24 +00001491 remove_unneeded_paths_from_src(want_copies, relevant_sources);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001492 trace2_region_leave("diff", "cull after exact", options->repo);
1493 } else {
1494 /* Determine minimum score to match basenames */
1495 double factor = 0.5;
1496 char *basename_factor = getenv("GIT_BASENAME_FACTOR");
1497 int min_basename_score;
1498
1499 if (basename_factor)
1500 factor = strtol(basename_factor, NULL, 10)/100.0;
1501 assert(factor >= 0.0 && factor <= 1.0);
1502 min_basename_score = minimum_score +
1503 (int)(factor * (MAX_SCORE - minimum_score));
1504
1505 /*
1506 * Cull sources:
1507 * - remove ones involved in renames (found via exact match)
1508 */
1509 trace2_region_enter("diff", "cull after exact", options->repo);
Elijah Newren97998892021-03-11 00:38:24 +00001510 remove_unneeded_paths_from_src(want_copies, NULL);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001511 trace2_region_leave("diff", "cull after exact", options->repo);
1512
Elijah Newrenae8cf742021-02-27 00:30:41 +00001513 /* Preparation for basename-driven matching. */
1514 trace2_region_enter("diff", "dir rename setup", options->repo);
Elijah Newrene4fd06e2021-03-11 00:38:31 +00001515 initialize_dir_rename_info(&info, relevant_sources,
Elijah Newren25e65b62021-05-20 06:09:41 +00001516 dirs_removed, dir_rename_count,
1517 cached_pairs);
Elijah Newrenae8cf742021-02-27 00:30:41 +00001518 trace2_region_leave("diff", "dir rename setup", options->repo);
1519
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001520 /* Utilize file basenames to quickly find renames. */
1521 trace2_region_enter("diff", "basename matches", options->repo);
1522 rename_count += find_basename_matches(options,
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001523 min_basename_score,
Elijah Newrene4fd06e2021-03-11 00:38:31 +00001524 &info,
1525 relevant_sources,
1526 dirs_removed);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001527 trace2_region_leave("diff", "basename matches", options->repo);
1528
1529 /*
1530 * Cull sources, again:
1531 * - remove ones involved in renames (found via basenames)
Elijah Newren97998892021-03-11 00:38:24 +00001532 * - remove ones not found in relevant_sources
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001533 * and
1534 * - remove ones in relevant_sources which are needed only
1535 * for directory renames IF no ancestory directory
1536 * actually needs to know any more individual path
1537 * renames under them
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001538 */
1539 trace2_region_enter("diff", "cull basename", options->repo);
Elijah Newren97998892021-03-11 00:38:24 +00001540 remove_unneeded_paths_from_src(want_copies, relevant_sources);
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001541 handle_early_known_dir_renames(&info, relevant_sources,
1542 dirs_removed);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001543 trace2_region_leave("diff", "cull basename", options->repo);
1544 }
1545
1546 /* Calculate how many rename destinations are left */
1547 num_destinations = (rename_dst_nr - rename_count);
1548 num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
1549
Linus Torvalds42899ac2007-10-26 16:56:34 -07001550 /* All done? */
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001551 if (!num_destinations || !num_sources)
Linus Torvalds42899ac2007-10-26 16:56:34 -07001552 goto cleanup;
1553
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001554 switch (too_many_rename_candidates(num_destinations, num_sources,
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001555 options)) {
Junio C Hamanof31027c2011-01-06 13:50:06 -08001556 case 1:
Linus Torvalds0024a542007-09-14 10:39:48 -07001557 goto cleanup;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001558 case 2:
1559 options->degraded_cc_to_c = 1;
1560 skip_unmodified = 1;
1561 break;
1562 default:
1563 break;
1564 }
Linus Torvalds0024a542007-09-14 10:39:48 -07001565
Elijah Newren557ac032021-01-23 22:01:12 -08001566 trace2_region_enter("diff", "inexact renames", options->repo);
Jeff King3ac942d2011-02-20 04:51:16 -05001567 if (options->show_rename_progress) {
Junio C Hamano8aade102017-08-19 10:39:41 -07001568 progress = start_delayed_progress(
Nguyễn Thái Ngọc Duy754dbc42014-02-21 19:50:18 +07001569 _("Performing inexact rename detection"),
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001570 (uint64_t)num_destinations * (uint64_t)num_sources);
Jeff King3ac942d2011-02-20 04:51:16 -05001571 }
1572
Elijah Newrend331dd32021-06-22 08:04:39 +00001573 /* Finish setting up dpf_options */
1574 prefetch_options.skip_unmodified = skip_unmodified;
1575 if (options->repo == the_repository && has_promisor_remote()) {
Elijah Newren1aedd032021-06-22 08:04:40 +00001576 dpf_options.missing_object_cb = inexact_prefetch;
Elijah Newrend331dd32021-06-22 08:04:39 +00001577 dpf_options.missing_object_data = &prefetch_options;
1578 }
1579
René Scharfeca56dad2021-03-13 17:17:22 +01001580 CALLOC_ARRAY(mx, st_mult(NUM_CANDIDATE_PER_DST, num_destinations));
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001581 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
Elijah Newren9db2ac52020-12-11 09:08:47 +00001582 struct diff_filespec *two = rename_dst[i].p->two;
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001583 struct diff_score *m;
1584
Elijah Newren9db2ac52020-12-11 09:08:47 +00001585 if (rename_dst[i].is_rename)
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001586 continue; /* exact or basename match already handled */
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001587
1588 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
1589 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
1590 m[j].dst = -1;
1591
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001592 for (j = 0; j < rename_src_nr; j++) {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001593 struct diff_filespec *one = rename_src[j].p->one;
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001594 struct diff_score this_src;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001595
Elijah Newren829514c2021-02-14 07:35:01 +00001596 assert(!one->rename_used || want_copies || break_idx);
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001597
Junio C Hamanof31027c2011-01-06 13:50:06 -08001598 if (skip_unmodified &&
1599 diff_unmodified_pair(rename_src[j].p))
1600 continue;
1601
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02001602 this_src.score = estimate_similarity(options->repo,
1603 one, two,
Jonathan Tan95acf112020-04-07 15:11:43 -07001604 minimum_score,
Elijah Newrend331dd32021-06-22 08:04:39 +00001605 &dpf_options);
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001606 this_src.name_score = basename_same(one, two);
1607 this_src.dst = i;
1608 this_src.src = j;
1609 record_if_better(m, &this_src);
Junio C Hamano809809b2009-11-20 22:13:47 -08001610 /*
1611 * Once we run estimate_similarity,
1612 * We do not need the text anymore.
1613 */
Junio C Hamano8ae92e62007-10-02 21:01:03 -07001614 diff_free_filespec_blob(one);
Junio C Hamano809809b2009-11-20 22:13:47 -08001615 diff_free_filespec_blob(two);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001616 }
1617 dst_cnt++;
Elijah Newren81c4bf02020-12-11 09:08:43 +00001618 display_progress(progress,
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001619 (uint64_t)dst_cnt * (uint64_t)num_sources);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001620 }
Jeff King3ac942d2011-02-20 04:51:16 -05001621 stop_progress(&progress);
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001622
Junio C Hamano427dcb42005-05-21 02:39:09 -07001623 /* cost matrix sorted by most to least similar pair */
Johannes Schindelin2049b8d2019-09-30 10:21:55 -07001624 STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001625
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001626 rename_count += find_renames(mx, dst_cnt, minimum_score, 0,
1627 &info, dirs_removed);
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001628 if (want_copies)
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001629 rename_count += find_renames(mx, dst_cnt, minimum_score, 1,
1630 &info, dirs_removed);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001631 free(mx);
Elijah Newren557ac032021-01-23 22:01:12 -08001632 trace2_region_leave("diff", "inexact renames", options->repo);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001633
Junio C Hamano15d061b2005-05-27 15:55:55 -07001634 cleanup:
Junio C Hamano427dcb42005-05-21 02:39:09 -07001635 /* At this point, we have found some renames and copies and they
Junio C Hamano5098baf2005-09-15 16:13:43 -07001636 * are recorded in rename_dst. The original list is still in *q.
Junio C Hamano427dcb42005-05-21 02:39:09 -07001637 */
Elijah Newren557ac032021-01-23 22:01:12 -08001638 trace2_region_enter("diff", "write back to queue", options->repo);
Bo Yang9ca5df92010-05-06 21:52:27 -07001639 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001640 for (i = 0; i < q->nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001641 struct diff_filepair *p = q->queue[i];
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001642 struct diff_filepair *pair_to_free = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -07001643
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -04001644 if (DIFF_PAIR_UNMERGED(p)) {
1645 diff_q(&outq, p);
1646 }
1647 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
Elijah Newren9db2ac52020-12-11 09:08:47 +00001648 /* Creation */
1649 diff_q(&outq, p);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001650 }
Junio C Hamano2cd68882005-05-30 00:08:07 -07001651 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
1652 /*
1653 * Deletion
1654 *
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001655 * We would output this delete record if:
1656 *
1657 * (1) this is a broken delete and the counterpart
1658 * broken create remains in the output; or
Junio C Hamano5098baf2005-09-15 16:13:43 -07001659 * (2) this is not a broken delete, and rename_dst
1660 * does not have a rename/copy to move p->one->path
1661 * out of existence.
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001662 *
1663 * Otherwise, the counterpart broken create
1664 * has been turned into a rename-edit; or
1665 * delete did not have a matching create to
1666 * begin with.
Junio C Hamano2cd68882005-05-30 00:08:07 -07001667 */
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001668 if (DIFF_PAIR_BROKEN(p)) {
1669 /* broken delete */
Elijah Newren9db2ac52020-12-11 09:08:47 +00001670 struct diff_rename_dst *dst = locate_rename_dst(p);
1671 if (!dst)
1672 BUG("tracking failed somehow; failed to find associated dst for broken pair");
1673 if (dst->is_rename)
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001674 /* counterpart is now rename/copy */
1675 pair_to_free = p;
1676 }
1677 else {
Linus Torvalds64479712007-10-25 11:20:56 -07001678 if (p->one->rename_used)
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001679 /* this path remains */
1680 pair_to_free = p;
1681 }
Junio C Hamano2cd68882005-05-30 00:08:07 -07001682
Elijah Newren9db2ac52020-12-11 09:08:47 +00001683 if (!pair_to_free)
Junio C Hamano2cd68882005-05-30 00:08:07 -07001684 diff_q(&outq, p);
1685 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001686 else if (!diff_unmodified_pair(p))
Junio C Hamano15d061b2005-05-27 15:55:55 -07001687 /* all the usual ones need to be kept */
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001688 diff_q(&outq, p);
Junio C Hamano15d061b2005-05-27 15:55:55 -07001689 else
Elijah Newren356da0f2021-06-08 16:11:41 +00001690 /* no need to keep unmodified pairs */
Junio C Hamano15d061b2005-05-27 15:55:55 -07001691 pair_to_free = p;
1692
Junio C Hamano226406f2005-05-27 15:50:30 -07001693 if (pair_to_free)
Elijah Newrenf239fff2021-07-30 11:47:42 +00001694 pool_diff_free_filepair(pool, pair_to_free);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001695 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001696 diff_debug_queue("done copying original", &outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001697
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001698 free(q->queue);
1699 *q = outq;
1700 diff_debug_queue("done collapsing", q);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001701
Linus Torvalds9fb88412007-10-25 11:19:10 -07001702 for (i = 0; i < rename_dst_nr; i++)
Elijah Newren9db2ac52020-12-11 09:08:47 +00001703 if (rename_dst[i].filespec_to_free)
Elijah Newrenf239fff2021-07-30 11:47:42 +00001704 pool_free_filespec(pool, rename_dst[i].filespec_to_free);
Junio C Hamano5098baf2005-09-15 16:13:43 -07001705
Elijah Newrenb1473012021-02-27 00:30:45 +00001706 cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +00001707 FREE_AND_NULL(rename_dst);
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001708 rename_dst_nr = rename_dst_alloc = 0;
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +00001709 FREE_AND_NULL(rename_src);
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001710 rename_src_nr = rename_src_alloc = 0;
Elijah Newren9db2ac52020-12-11 09:08:47 +00001711 if (break_idx) {
1712 strintmap_clear(break_idx);
1713 FREE_AND_NULL(break_idx);
1714 }
Elijah Newren557ac032021-01-23 22:01:12 -08001715 trace2_region_leave("diff", "write back to queue", options->repo);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001716 return;
1717}
Elijah Newren0c4fd732021-02-27 00:30:42 +00001718
1719void diffcore_rename(struct diff_options *options)
1720{
Elijah Newrenf239fff2021-07-30 11:47:42 +00001721 diffcore_rename_extended(options, NULL, NULL, NULL, NULL, NULL);
Elijah Newren0c4fd732021-02-27 00:30:42 +00001722}