blob: 4ef0459cfb500049154ad72270e5ec5368702cf4 [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 */
5#include "cache.h"
6#include "diff.h"
7#include "diffcore.h"
Stefan Bellercbd53a22018-05-15 16:42:15 -07008#include "object-store.h"
Karsten Bleesf79d9c52013-11-14 20:20:26 +01009#include "hashmap.h"
Jeff King3ac942d2011-02-20 04:51:16 -050010#include "progress.h"
Jonathan Tan95acf112020-04-07 15:11:43 -070011#include "promisor-remote.h"
Elijah Newren9db2ac52020-12-11 09:08:47 +000012#include "strmap.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -070013
Junio C Hamano25d5ea42005-05-24 01:10:48 -070014/* Table of rename/copy destinations */
Junio C Hamano427dcb42005-05-21 02:39:09 -070015
Junio C Hamano25d5ea42005-05-24 01:10:48 -070016static struct diff_rename_dst {
Elijah Newren9db2ac52020-12-11 09:08:47 +000017 struct diff_filepair *p;
18 struct diff_filespec *filespec_to_free;
19 int is_rename; /* false -> just a create; true -> rename or copy */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070020} *rename_dst;
21static int rename_dst_nr, rename_dst_alloc;
Elijah Newren9db2ac52020-12-11 09:08:47 +000022/* Mapping from break source pathname to break destination index */
23static struct strintmap *break_idx = NULL;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070024
Elijah Newren9db2ac52020-12-11 09:08:47 +000025static struct diff_rename_dst *locate_rename_dst(struct diff_filepair *p)
Junio C Hamano427dcb42005-05-21 02:39:09 -070026{
Elijah Newren9db2ac52020-12-11 09:08:47 +000027 /* Lookup by p->ONE->path */
28 int idx = break_idx ? strintmap_get(break_idx, p->one->path) : -1;
29 return (idx == -1) ? NULL : &rename_dst[idx];
Jeff Kingf98c2f72015-02-26 20:39:48 -050030}
31
32/*
33 * Returns 0 on success, -1 if we found a duplicate.
34 */
Elijah Newren9db2ac52020-12-11 09:08:47 +000035static int add_rename_dst(struct diff_filepair *p)
Jeff Kingf98c2f72015-02-26 20:39:48 -050036{
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040037 ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
Elijah Newren9db2ac52020-12-11 09:08:47 +000038 rename_dst[rename_dst_nr].p = p;
39 rename_dst[rename_dst_nr].filespec_to_free = NULL;
40 rename_dst[rename_dst_nr].is_rename = 0;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070041 rename_dst_nr++;
Jeff Kingf98c2f72015-02-26 20:39:48 -050042 return 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -070043}
44
Junio C Hamano15d061b2005-05-27 15:55:55 -070045/* Table of rename/copy src files */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070046static struct diff_rename_src {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -080047 struct diff_filepair *p;
Junio C Hamanofc580712006-04-08 20:17:46 -070048 unsigned short score; /* to remember the break score */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070049} *rename_src;
50static int rename_src_nr, rename_src_alloc;
Junio C Hamano427dcb42005-05-21 02:39:09 -070051
Elijah Newrenb970b4e2020-12-11 09:08:46 +000052static void register_rename_src(struct diff_filepair *p)
Junio C Hamano25d5ea42005-05-24 01:10:48 -070053{
Elijah Newren9db2ac52020-12-11 09:08:47 +000054 if (p->broken_pair) {
55 if (!break_idx) {
56 break_idx = xmalloc(sizeof(*break_idx));
Elijah Newren61bf4492021-06-08 16:11:40 +000057 strintmap_init_with_options(break_idx, -1, NULL, 0);
Elijah Newren9db2ac52020-12-11 09:08:47 +000058 }
59 strintmap_set(break_idx, p->one->path, rename_dst_nr);
60 }
61
Dmitry S. Dolzhenko337ce242014-03-04 02:31:54 +040062 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
Elijah Newrenb970b4e2020-12-11 09:08:46 +000063 rename_src[rename_src_nr].p = p;
64 rename_src[rename_src_nr].score = p->score;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070065 rename_src_nr++;
Junio C Hamano427dcb42005-05-21 02:39:09 -070066}
67
Johannes Schindelin0ce39642007-06-21 12:52:11 +010068static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
69{
70 int src_len = strlen(src->path), dst_len = strlen(dst->path);
71 while (src_len && dst_len) {
72 char c1 = src->path[--src_len];
73 char c2 = dst->path[--dst_len];
74 if (c1 != c2)
75 return 0;
76 if (c1 == '/')
77 return 1;
78 }
79 return (!src_len || src->path[src_len - 1] == '/') &&
80 (!dst_len || dst->path[dst_len - 1] == '/');
81}
82
Junio C Hamano427dcb42005-05-21 02:39:09 -070083struct diff_score {
Junio C Hamano25d5ea42005-05-24 01:10:48 -070084 int src; /* index in rename_src */
85 int dst; /* index in rename_dst */
Junio C Hamano6d24ad92008-01-29 20:54:56 -080086 unsigned short score;
87 short name_score;
Junio C Hamano427dcb42005-05-21 02:39:09 -070088};
89
Elijah Newren1aedd032021-06-22 08:04:40 +000090struct inexact_prefetch_options {
Jonathan Tan95acf112020-04-07 15:11:43 -070091 struct repository *repo;
92 int skip_unmodified;
93};
Elijah Newren1aedd032021-06-22 08:04:40 +000094static void inexact_prefetch(void *prefetch_options)
Jonathan Tan95acf112020-04-07 15:11:43 -070095{
Elijah Newren1aedd032021-06-22 08:04:40 +000096 struct inexact_prefetch_options *options = prefetch_options;
Jonathan Tan95acf112020-04-07 15:11:43 -070097 int i;
98 struct oid_array to_fetch = OID_ARRAY_INIT;
99
100 for (i = 0; i < rename_dst_nr; i++) {
Elijah Newren9db2ac52020-12-11 09:08:47 +0000101 if (rename_dst[i].p->renamed_pair)
Jonathan Tan95acf112020-04-07 15:11:43 -0700102 /*
103 * The loop in diffcore_rename() will not need these
104 * blobs, so skip prefetching.
105 */
106 continue; /* already found exact match */
107 diff_add_if_missing(options->repo, &to_fetch,
Elijah Newren9db2ac52020-12-11 09:08:47 +0000108 rename_dst[i].p->two);
Jonathan Tan95acf112020-04-07 15:11:43 -0700109 }
110 for (i = 0; i < rename_src_nr; i++) {
111 if (options->skip_unmodified &&
112 diff_unmodified_pair(rename_src[i].p))
113 /*
114 * The loop in diffcore_rename() will not need these
115 * blobs, so skip prefetching.
116 */
117 continue;
118 diff_add_if_missing(options->repo, &to_fetch,
119 rename_src[i].p->one);
120 }
121 promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
122 oid_array_clear(&to_fetch);
123}
124
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200125static int estimate_similarity(struct repository *r,
126 struct diff_filespec *src,
Junio C Hamano427dcb42005-05-21 02:39:09 -0700127 struct diff_filespec *dst,
Jonathan Tan95acf112020-04-07 15:11:43 -0700128 int minimum_score,
Elijah Newrend331dd32021-06-22 08:04:39 +0000129 struct diff_populate_filespec_options *dpf_opt)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700130{
131 /* src points at a file that existed in the original tree (or
132 * optionally a file in the destination tree) and dst points
133 * at a newly created file. They may be quite similar, in which
134 * case we want to say src is renamed to dst or src is copied into
135 * dst, and then some edit has been applied to dst.
136 *
137 * Compare them and return how similar they are, representing
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700138 * the score as an integer between 0 and MAX_SCORE.
139 *
140 * When there is an exact match, it is considered a better
141 * match than anything else; the destination does not even
142 * call into this function in that case.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700143 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800144 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700145 int score;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700146
Junio C Hamano60896c72005-05-22 21:24:49 -0700147 /* We deal only with regular files. Symlink renames are handled
148 * only when they are exact matches --- in other words, no edits
149 * after renaming.
150 */
151 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
152 return 0;
153
Linus Torvalds81ac0512007-10-26 16:51:28 -0700154 /*
155 * Need to check that source and destination sizes are
156 * filled in before comparing them.
157 *
158 * If we already have "cnt_data" filled in, we know it's
159 * all good (avoid checking the size for zero, as that
160 * is a possible size - we really should have a flag to
161 * say whether the size is valid or not!)
162 */
Elijah Newrend331dd32021-06-22 08:04:39 +0000163 dpf_opt->check_size_only = 1;
164
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700165 if (!src->cnt_data &&
Elijah Newrend331dd32021-06-22 08:04:39 +0000166 diff_populate_filespec(r, src, dpf_opt))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700167 return 0;
Nguyễn Thái Ngọc Duy8e5dd3d2014-08-16 10:08:04 +0700168 if (!dst->cnt_data &&
Elijah Newrend331dd32021-06-22 08:04:39 +0000169 diff_populate_filespec(r, dst, dpf_opt))
Linus Torvalds81ac0512007-10-26 16:51:28 -0700170 return 0;
171
Linus Torvalds90bd9322006-03-12 22:26:34 -0800172 max_size = ((src->size > dst->size) ? src->size : dst->size);
Junio C Hamano58b103f2005-05-21 15:55:18 -0700173 base_size = ((src->size < dst->size) ? src->size : dst->size);
Linus Torvalds90bd9322006-03-12 22:26:34 -0800174 delta_size = max_size - base_size;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700175
Junio C Hamano58b103f2005-05-21 15:55:18 -0700176 /* We would not consider edits that change the file size so
177 * drastically. delta_size must be smaller than
Junio C Hamanocd1870e2005-05-22 01:31:28 -0700178 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700179 *
Junio C Hamano58b103f2005-05-21 15:55:18 -0700180 * Note that base_size == 0 case is handled here already
181 * and the final score computation below would not have a
182 * divide-by-zero issue.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700183 */
Linus Torvalds3a4d6762011-02-18 20:12:06 -0800184 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700185 return 0;
186
Elijah Newrend331dd32021-06-22 08:04:39 +0000187 dpf_opt->check_size_only = 0;
Jonathan Tan95acf112020-04-07 15:11:43 -0700188
Elijah Newrend331dd32021-06-22 08:04:39 +0000189 if (!src->cnt_data && diff_populate_filespec(r, src, dpf_opt))
Björn Steinbrink885c7162009-01-20 16:59:57 +0100190 return 0;
Elijah Newrend331dd32021-06-22 08:04:39 +0000191 if (!dst->cnt_data && diff_populate_filespec(r, dst, dpf_opt))
Björn Steinbrink885c7162009-01-20 16:59:57 +0100192 return 0;
193
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200194 if (diffcore_count_changes(r, src, dst,
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800195 &src->cnt_data, &dst->cnt_data,
Junio C Hamano65416752006-02-28 16:01:36 -0800196 &src_copied, &literal_added))
Junio C Hamano75c660a2005-06-28 16:58:27 -0700197 return 0;
Junio C Hamano85976972005-05-24 12:09:32 -0700198
Junio C Hamano17063062006-03-02 22:11:25 -0800199 /* How similar are they?
200 * what percentage of material in dst are from source?
Junio C Hamano427dcb42005-05-21 02:39:09 -0700201 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800202 if (!dst->size)
Junio C Hamano17063062006-03-02 22:11:25 -0800203 score = 0; /* should not happen */
René Scharfecfc0aef2007-06-25 00:23:28 +0200204 else
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500205 score = (int)(src_copied * MAX_SCORE / max_size);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700206 return score;
207}
208
Junio C Hamano5098baf2005-09-15 16:13:43 -0700209static void record_rename_pair(int dst_index, int src_index, int score)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700210{
Elijah Newren9db2ac52020-12-11 09:08:47 +0000211 struct diff_filepair *src = rename_src[src_index].p;
212 struct diff_filepair *dst = rename_dst[dst_index].p;
Junio C Hamanof7c15122005-05-22 21:26:09 -0700213
Elijah Newren9db2ac52020-12-11 09:08:47 +0000214 if (dst->renamed_pair)
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700215 die("internal error: dst already matched.");
216
Elijah Newren9db2ac52020-12-11 09:08:47 +0000217 src->one->rename_used++;
218 src->one->count++;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700219
Elijah Newren9db2ac52020-12-11 09:08:47 +0000220 rename_dst[dst_index].filespec_to_free = dst->one;
221 rename_dst[dst_index].is_rename = 1;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700222
Elijah Newren9db2ac52020-12-11 09:08:47 +0000223 dst->one = src->one;
224 dst->renamed_pair = 1;
225 if (!strcmp(dst->one->path, dst->two->path))
226 dst->score = rename_src[src_index].score;
Junio C Hamanofc580712006-04-08 20:17:46 -0700227 else
Elijah Newren9db2ac52020-12-11 09:08:47 +0000228 dst->score = score;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700229}
230
231/*
232 * We sort the rename similarity matrix with the score, in descending
Junio C Hamano15d061b2005-05-27 15:55:55 -0700233 * order (the most similar first).
Junio C Hamano427dcb42005-05-21 02:39:09 -0700234 */
235static int score_compare(const void *a_, const void *b_)
236{
237 const struct diff_score *a = a_, *b = b_;
René Scharfecfc0aef2007-06-25 00:23:28 +0200238
Junio C Hamano6d24ad92008-01-29 20:54:56 -0800239 /* sink the unused ones to the bottom */
240 if (a->dst < 0)
241 return (0 <= b->dst);
242 else if (b->dst < 0)
243 return -1;
244
René Scharfecfc0aef2007-06-25 00:23:28 +0200245 if (a->score == b->score)
246 return b->name_score - a->name_score;
247
Junio C Hamano427dcb42005-05-21 02:39:09 -0700248 return b->score - a->score;
249}
250
Linus Torvalds9027f532007-10-25 11:23:26 -0700251struct file_similarity {
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100252 struct hashmap_entry entry;
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100253 int index;
Linus Torvalds9027f532007-10-25 11:23:26 -0700254 struct diff_filespec *filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700255};
256
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200257static unsigned int hash_filespec(struct repository *r,
258 struct diff_filespec *filespec)
Karsten Blees48f64072013-11-14 20:19:04 +0100259{
brian m. carlson41c95602016-06-24 23:09:24 +0000260 if (!filespec->oid_valid) {
Jonathan Tan1c37e862020-04-07 15:11:41 -0700261 if (diff_populate_filespec(r, filespec, NULL))
Karsten Blees48f64072013-11-14 20:19:04 +0100262 return 0;
Matheus Tavares2dcde202020-01-30 17:32:22 -0300263 hash_object_file(r->hash_algo, filespec->data, filespec->size,
264 "blob", &filespec->oid);
Karsten Blees48f64072013-11-14 20:19:04 +0100265 }
Jeff Kingd40abc82019-06-20 03:41:49 -0400266 return oidhash(&filespec->oid);
Karsten Blees48f64072013-11-14 20:19:04 +0100267}
268
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100269static int find_identical_files(struct hashmap *srcs,
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100270 int dst_index,
Linus Torvalds11f944d2011-02-18 19:55:19 -0800271 struct diff_options *options)
Linus Torvalds9027f532007-10-25 11:23:26 -0700272{
273 int renames = 0;
Elijah Newren9db2ac52020-12-11 09:08:47 +0000274 struct diff_filespec *target = rename_dst[dst_index].p->two;
Karsten Bleesab73a9d2014-07-03 00:22:11 +0200275 struct file_similarity *p, *best = NULL;
Karsten Blees48f64072013-11-14 20:19:04 +0100276 int i = 100, best_score = -1;
Eric Wongf0e63c42019-10-06 23:30:35 +0000277 unsigned int hash = hash_filespec(options->repo, target);
Linus Torvalds9027f532007-10-25 11:23:26 -0700278
Karsten Blees48f64072013-11-14 20:19:04 +0100279 /*
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100280 * Find the best source match for specified destination.
Karsten Blees48f64072013-11-14 20:19:04 +0100281 */
Eric Wongf0e63c42019-10-06 23:30:35 +0000282 p = hashmap_get_entry_from_hash(srcs, hash, NULL,
283 struct file_similarity, entry);
Eric Wong23dee692019-10-06 23:30:41 +0000284 hashmap_for_each_entry_from(srcs, p, entry) {
Karsten Blees48f64072013-11-14 20:19:04 +0100285 int score;
286 struct diff_filespec *source = p->filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700287
Karsten Blees48f64072013-11-14 20:19:04 +0100288 /* False hash collision? */
Jeff King9001dc22018-08-28 17:22:48 -0400289 if (!oideq(&source->oid, &target->oid))
Karsten Blees48f64072013-11-14 20:19:04 +0100290 continue;
291 /* Non-regular files? If so, the modes must match! */
292 if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
293 if (source->mode != target->mode)
Linus Torvalds9027f532007-10-25 11:23:26 -0700294 continue;
Karsten Blees48f64072013-11-14 20:19:04 +0100295 }
296 /* Give higher scores to sources that haven't been used already */
297 score = !source->rename_used;
298 if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
299 continue;
300 score += basename_same(source, target);
301 if (score > best_score) {
302 best = p;
303 best_score = score;
304 if (score == 2)
Linus Torvalds9027f532007-10-25 11:23:26 -0700305 break;
306 }
Karsten Blees48f64072013-11-14 20:19:04 +0100307
308 /* Too many identical alternatives? Pick one */
309 if (!--i)
310 break;
311 }
312 if (best) {
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100313 record_rename_pair(dst_index, best->index, MAX_SCORE);
Karsten Blees48f64072013-11-14 20:19:04 +0100314 renames++;
315 }
Linus Torvalds9027f532007-10-25 11:23:26 -0700316 return renames;
317}
318
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200319static void insert_file_table(struct repository *r,
320 struct hashmap *table, int index,
321 struct diff_filespec *filespec)
Linus Torvalds9027f532007-10-25 11:23:26 -0700322{
Linus Torvalds9027f532007-10-25 11:23:26 -0700323 struct file_similarity *entry = xmalloc(sizeof(*entry));
324
Linus Torvalds9027f532007-10-25 11:23:26 -0700325 entry->index = index;
326 entry->filespec = filespec;
Linus Torvalds9027f532007-10-25 11:23:26 -0700327
Eric Wongd22245a2019-10-06 23:30:27 +0000328 hashmap_entry_init(&entry->entry, hash_filespec(r, filespec));
Eric Wongb94e5c12019-10-06 23:30:29 +0000329 hashmap_add(table, &entry->entry);
Linus Torvalds9027f532007-10-25 11:23:26 -0700330}
331
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700332/*
333 * Find exact renames first.
334 *
335 * The first round matches up the up-to-date entries,
336 * and then during the second round we try to match
337 * cache-dirty entries as well.
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700338 */
Linus Torvalds11f944d2011-02-18 19:55:19 -0800339static int find_exact_renames(struct diff_options *options)
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700340{
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100341 int i, renames = 0;
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100342 struct hashmap file_table;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700343
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200344 /* Add all sources to the hash table in reverse order, because
345 * later on they will be retrieved in LIFO order.
346 */
Stefan Beller7663cdc2017-06-30 12:14:05 -0700347 hashmap_init(&file_table, NULL, NULL, rename_src_nr);
SZEDER Gáborca4e3ca2016-03-30 10:35:07 +0200348 for (i = rename_src_nr-1; i >= 0; i--)
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +0200349 insert_file_table(options->repo,
350 &file_table, i,
351 rename_src[i].p->one);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700352
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100353 /* Walk the destinations and find best source match */
Linus Torvalds9027f532007-10-25 11:23:26 -0700354 for (i = 0; i < rename_dst_nr; i++)
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100355 renames += find_identical_files(&file_table, i, options);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700356
Karsten Bleesf79d9c52013-11-14 20:20:26 +0100357 /* Free the hash data structure and entries */
Elijah Newren6da1a252020-11-02 18:55:05 +0000358 hashmap_clear_and_free(&file_table, struct file_similarity, entry);
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700359
Karsten Blees7c85f8a2013-11-14 20:19:34 +0100360 return renames;
Linus Torvaldscb1491b2007-10-25 11:17:55 -0700361}
362
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000363struct dir_rename_info {
364 struct strintmap idx_map;
365 struct strmap dir_rename_guess;
366 struct strmap *dir_rename_count;
Elijah Newrena49b55d2021-03-13 22:22:02 +0000367 struct strintmap *relevant_source_dirs;
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000368 unsigned setup;
369};
370
371static char *get_dirname(const char *filename)
372{
373 char *slash = strrchr(filename, '/');
374 return slash ? xstrndup(filename, slash - filename) : xstrdup("");
375}
376
Elijah Newren0c4fd732021-02-27 00:30:42 +0000377static void dirname_munge(char *filename)
378{
379 char *slash = strrchr(filename, '/');
380 if (!slash)
381 slash = filename;
382 *slash = '\0';
383}
384
Elijah Newren81afdf72021-02-27 00:30:48 +0000385static const char *get_highest_rename_path(struct strintmap *counts)
386{
387 int highest_count = 0;
388 const char *highest_destination_dir = NULL;
389 struct hashmap_iter iter;
390 struct strmap_entry *entry;
391
392 strintmap_for_each_entry(counts, &iter, entry) {
393 const char *destination_dir = entry->key;
394 intptr_t count = (intptr_t)entry->value;
395 if (count > highest_count) {
396 highest_count = count;
397 highest_destination_dir = destination_dir;
398 }
399 }
400 return highest_destination_dir;
401}
402
Elijah Newren0491d392021-03-13 22:22:05 +0000403static char *UNKNOWN_DIR = "/"; /* placeholder -- short, illegal directory */
404
405static int dir_rename_already_determinable(struct strintmap *counts)
406{
407 struct hashmap_iter iter;
408 struct strmap_entry *entry;
409 int first = 0, second = 0, unknown = 0;
410 strintmap_for_each_entry(counts, &iter, entry) {
411 const char *destination_dir = entry->key;
412 intptr_t count = (intptr_t)entry->value;
413 if (!strcmp(destination_dir, UNKNOWN_DIR)) {
414 unknown = count;
415 } else if (count >= first) {
416 second = first;
417 first = count;
418 } else if (count >= second) {
419 second = count;
420 }
421 }
422 return first > second + unknown;
423}
424
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000425static void increment_count(struct dir_rename_info *info,
Elijah Newren0c4fd732021-02-27 00:30:42 +0000426 char *old_dir,
427 char *new_dir)
428{
429 struct strintmap *counts;
430 struct strmap_entry *e;
431
432 /* Get the {new_dirs -> counts} mapping using old_dir */
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000433 e = strmap_get_entry(info->dir_rename_count, old_dir);
Elijah Newren0c4fd732021-02-27 00:30:42 +0000434 if (e) {
435 counts = e->value;
436 } else {
437 counts = xmalloc(sizeof(*counts));
438 strintmap_init_with_options(counts, 0, NULL, 1);
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000439 strmap_put(info->dir_rename_count, old_dir, counts);
Elijah Newren0c4fd732021-02-27 00:30:42 +0000440 }
441
442 /* Increment the count for new_dir */
443 strintmap_incr(counts, new_dir, 1);
444}
445
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000446static void update_dir_rename_counts(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000447 struct strintmap *dirs_removed,
Elijah Newren0c4fd732021-02-27 00:30:42 +0000448 const char *oldname,
449 const char *newname)
450{
451 char *old_dir = xstrdup(oldname);
452 char *new_dir = xstrdup(newname);
453 char new_dir_first_char = new_dir[0];
454 int first_time_in_loop = 1;
455
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000456 if (!info->setup)
457 /*
458 * info->setup is 0 here in two cases: (1) all auxiliary
459 * vars (like dirs_removed) were NULL so
460 * initialize_dir_rename_info() returned early, or (2)
461 * either break detection or copy detection are active so
462 * that we never called initialize_dir_rename_info(). In
463 * the former case, we don't have enough info to know if
464 * directories were renamed (because dirs_removed lets us
465 * know about a necessary prerequisite, namely if they were
466 * removed), and in the latter, we don't care about
467 * directory renames or find_basename_matches.
468 *
469 * This matters because both basename and inexact matching
470 * will also call update_dir_rename_counts(). In either of
471 * the above two cases info->dir_rename_counts will not
472 * have been properly initialized which prevents us from
473 * updating it, but in these two cases we don't care about
474 * dir_rename_counts anyway, so we can just exit early.
475 */
476 return;
477
Elijah Newren0c4fd732021-02-27 00:30:42 +0000478 while (1) {
Elijah Newrene54385b2021-03-13 22:22:04 +0000479 int drd_flag = NOT_RELEVANT;
480
Elijah Newren333899e2021-02-27 00:30:47 +0000481 /* Get old_dir, skip if its directory isn't relevant. */
Elijah Newren0c4fd732021-02-27 00:30:42 +0000482 dirname_munge(old_dir);
Elijah Newren333899e2021-02-27 00:30:47 +0000483 if (info->relevant_source_dirs &&
Elijah Newrena49b55d2021-03-13 22:22:02 +0000484 !strintmap_contains(info->relevant_source_dirs, old_dir))
Elijah Newren333899e2021-02-27 00:30:47 +0000485 break;
486
487 /* Get new_dir */
Elijah Newren0c4fd732021-02-27 00:30:42 +0000488 dirname_munge(new_dir);
489
490 /*
491 * When renaming
492 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
493 * then this suggests that both
494 * a/b/c/d/e/ => a/b/some/thing/else/e/
495 * a/b/c/d/ => a/b/some/thing/else/
496 * so we want to increment counters for both. We do NOT,
497 * however, also want to suggest that there was the following
498 * rename:
499 * a/b/c/ => a/b/some/thing/
500 * so we need to quit at that point.
501 *
502 * Note the when first_time_in_loop, we only strip off the
503 * basename, and we don't care if that's different.
504 */
505 if (!first_time_in_loop) {
506 char *old_sub_dir = strchr(old_dir, '\0')+1;
507 char *new_sub_dir = strchr(new_dir, '\0')+1;
508 if (!*new_dir) {
509 /*
510 * Special case when renaming to root directory,
511 * i.e. when new_dir == "". In this case, we had
512 * something like
513 * a/b/subdir => subdir
514 * and so dirname_munge() sets things up so that
515 * old_dir = "a/b\0subdir\0"
516 * new_dir = "\0ubdir\0"
517 * We didn't have a '/' to overwrite a '\0' onto
518 * in new_dir, so we have to compare differently.
519 */
520 if (new_dir_first_char != old_sub_dir[0] ||
521 strcmp(old_sub_dir+1, new_sub_dir))
522 break;
523 } else {
524 if (strcmp(old_sub_dir, new_sub_dir))
525 break;
526 }
527 }
528
Elijah Newrene54385b2021-03-13 22:22:04 +0000529 /*
530 * Above we suggested that we'd keep recording renames for
531 * all ancestor directories where the trailing directories
532 * matched, i.e. for
533 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
534 * we'd increment rename counts for each of
535 * a/b/c/d/e/ => a/b/some/thing/else/e/
536 * a/b/c/d/ => a/b/some/thing/else/
537 * However, we only need the rename counts for directories
538 * in dirs_removed whose value is RELEVANT_FOR_SELF.
539 * However, we add one special case of also recording it for
540 * first_time_in_loop because find_basename_matches() can
541 * use that as a hint to find a good pairing.
542 */
543 if (dirs_removed)
544 drd_flag = strintmap_get(dirs_removed, old_dir);
545 if (drd_flag == RELEVANT_FOR_SELF || first_time_in_loop)
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000546 increment_count(info, old_dir, new_dir);
Elijah Newren0c4fd732021-02-27 00:30:42 +0000547
Elijah Newrene54385b2021-03-13 22:22:04 +0000548 first_time_in_loop = 0;
549 if (drd_flag == NOT_RELEVANT)
550 break;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000551 /* If we hit toplevel directory ("") for old or new dir, quit */
552 if (!*old_dir || !*new_dir)
553 break;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000554 }
555
556 /* Free resources we don't need anymore */
557 free(old_dir);
558 free(new_dir);
559}
560
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000561static void initialize_dir_rename_info(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000562 struct strintmap *relevant_sources,
563 struct strintmap *dirs_removed,
Elijah Newren25e65b62021-05-20 06:09:41 +0000564 struct strmap *dir_rename_count,
565 struct strmap *cached_pairs)
Elijah Newren0c4fd732021-02-27 00:30:42 +0000566{
Elijah Newren81afdf72021-02-27 00:30:48 +0000567 struct hashmap_iter iter;
568 struct strmap_entry *entry;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000569 int i;
570
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000571 if (!dirs_removed && !relevant_sources) {
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000572 info->setup = 0;
573 return;
Elijah Newren0c4fd732021-02-27 00:30:42 +0000574 }
Elijah Newrenae8cf742021-02-27 00:30:41 +0000575 info->setup = 1;
576
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000577 info->dir_rename_count = dir_rename_count;
578 if (!info->dir_rename_count) {
579 info->dir_rename_count = xmalloc(sizeof(*dir_rename_count));
580 strmap_init(info->dir_rename_count);
581 }
Elijah Newrenae8cf742021-02-27 00:30:41 +0000582 strintmap_init_with_options(&info->idx_map, -1, NULL, 0);
583 strmap_init_with_options(&info->dir_rename_guess, NULL, 0);
Elijah Newrenae8cf742021-02-27 00:30:41 +0000584
Elijah Newren333899e2021-02-27 00:30:47 +0000585 /* Setup info->relevant_source_dirs */
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000586 info->relevant_source_dirs = NULL;
587 if (dirs_removed || !relevant_sources) {
588 info->relevant_source_dirs = dirs_removed; /* might be NULL */
589 } else {
590 info->relevant_source_dirs = xmalloc(sizeof(struct strintmap));
Elijah Newrena49b55d2021-03-13 22:22:02 +0000591 strintmap_init(info->relevant_source_dirs, 0 /* unused */);
592 strintmap_for_each_entry(relevant_sources, &iter, entry) {
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000593 char *dirname = get_dirname(entry->key);
594 if (!dirs_removed ||
Elijah Newrena49b55d2021-03-13 22:22:02 +0000595 strintmap_contains(dirs_removed, dirname))
596 strintmap_set(info->relevant_source_dirs,
597 dirname, 0 /* value irrelevant */);
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000598 free(dirname);
599 }
600 }
Elijah Newren333899e2021-02-27 00:30:47 +0000601
Elijah Newrenae8cf742021-02-27 00:30:41 +0000602 /*
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000603 * Loop setting up both info->idx_map, and doing setup of
604 * info->dir_rename_count.
Elijah Newrenae8cf742021-02-27 00:30:41 +0000605 */
606 for (i = 0; i < rename_dst_nr; ++i) {
607 /*
608 * For non-renamed files, make idx_map contain mapping of
609 * filename -> index (index within rename_dst, that is)
610 */
611 if (!rename_dst[i].is_rename) {
612 char *filename = rename_dst[i].p->two->path;
613 strintmap_set(&info->idx_map, filename, i);
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000614 continue;
Elijah Newrenae8cf742021-02-27 00:30:41 +0000615 }
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000616
617 /*
618 * For everything else (i.e. renamed files), make
619 * dir_rename_count contain a map of a map:
620 * old_directory -> {new_directory -> count}
621 * In other words, for every pair look at the directories for
622 * the old filename and the new filename and count how many
623 * times that pairing occurs.
624 */
625 update_dir_rename_counts(info, dirs_removed,
626 rename_dst[i].p->one->path,
627 rename_dst[i].p->two->path);
Elijah Newrenae8cf742021-02-27 00:30:41 +0000628 }
Elijah Newren81afdf72021-02-27 00:30:48 +0000629
Elijah Newren25e65b62021-05-20 06:09:41 +0000630 /* Add cached_pairs to counts */
631 strmap_for_each_entry(cached_pairs, &iter, entry) {
632 const char *old_name = entry->key;
633 const char *new_name = entry->value;
634 if (!new_name)
635 /* known delete; ignore it */
636 continue;
637
638 update_dir_rename_counts(info, dirs_removed, old_name, new_name);
639 }
640
Elijah Newren81afdf72021-02-27 00:30:48 +0000641 /*
642 * Now we collapse
643 * dir_rename_count: old_directory -> {new_directory -> count}
644 * down to
645 * dir_rename_guess: old_directory -> best_new_directory
646 * where best_new_directory is the one with the highest count.
647 */
648 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
649 /* entry->key is source_dir */
650 struct strintmap *counts = entry->value;
651 char *best_newdir;
652
653 best_newdir = xstrdup(get_highest_rename_path(counts));
654 strmap_put(&info->dir_rename_guess, entry->key,
655 best_newdir);
656 }
Elijah Newrenae8cf742021-02-27 00:30:41 +0000657}
658
Elijah Newrencd52e002021-02-27 00:30:43 +0000659void partial_clear_dir_rename_count(struct strmap *dir_rename_count)
660{
661 struct hashmap_iter iter;
662 struct strmap_entry *entry;
663
664 strmap_for_each_entry(dir_rename_count, &iter, entry) {
665 struct strintmap *counts = entry->value;
666 strintmap_clear(counts);
667 }
668 strmap_partial_clear(dir_rename_count, 1);
669}
670
Elijah Newrenb1473012021-02-27 00:30:45 +0000671static void cleanup_dir_rename_info(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000672 struct strintmap *dirs_removed,
Elijah Newrenb1473012021-02-27 00:30:45 +0000673 int keep_dir_rename_count)
Elijah Newrenae8cf742021-02-27 00:30:41 +0000674{
Elijah Newrenb1473012021-02-27 00:30:45 +0000675 struct hashmap_iter iter;
676 struct strmap_entry *entry;
677 struct string_list to_remove = STRING_LIST_INIT_NODUP;
678 int i;
679
Elijah Newrenae8cf742021-02-27 00:30:41 +0000680 if (!info->setup)
681 return;
682
683 /* idx_map */
684 strintmap_clear(&info->idx_map);
685
686 /* dir_rename_guess */
687 strmap_clear(&info->dir_rename_guess, 1);
688
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000689 /* relevant_source_dirs */
690 if (info->relevant_source_dirs &&
691 info->relevant_source_dirs != dirs_removed) {
Elijah Newrena49b55d2021-03-13 22:22:02 +0000692 strintmap_clear(info->relevant_source_dirs);
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000693 FREE_AND_NULL(info->relevant_source_dirs);
694 }
695
Elijah Newrenb6e3d272021-02-27 00:30:44 +0000696 /* dir_rename_count */
Elijah Newrenb1473012021-02-27 00:30:45 +0000697 if (!keep_dir_rename_count) {
698 partial_clear_dir_rename_count(info->dir_rename_count);
699 strmap_clear(info->dir_rename_count, 1);
700 FREE_AND_NULL(info->dir_rename_count);
701 return;
702 }
703
704 /*
705 * Although dir_rename_count was passed in
706 * diffcore_rename_extended() and we want to keep it around and
Elijah Newrenbf238b72021-03-13 22:22:06 +0000707 * return it to that caller, we first want to remove any counts in
708 * the maps associated with UNKNOWN_DIR entries and any data
Elijah Newrenb1473012021-02-27 00:30:45 +0000709 * associated with directories that weren't renamed.
710 */
711 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
712 const char *source_dir = entry->key;
713 struct strintmap *counts = entry->value;
714
Elijah Newrenfb529382021-03-13 22:22:03 +0000715 if (!strintmap_get(dirs_removed, source_dir)) {
Elijah Newrenb1473012021-02-27 00:30:45 +0000716 string_list_append(&to_remove, source_dir);
717 strintmap_clear(counts);
718 continue;
719 }
Elijah Newrenbf238b72021-03-13 22:22:06 +0000720
721 if (strintmap_contains(counts, UNKNOWN_DIR))
722 strintmap_remove(counts, UNKNOWN_DIR);
Elijah Newrenb1473012021-02-27 00:30:45 +0000723 }
724 for (i = 0; i < to_remove.nr; ++i)
725 strmap_remove(info->dir_rename_count,
726 to_remove.items[i].string, 1);
727 string_list_clear(&to_remove, 0);
Elijah Newrenae8cf742021-02-27 00:30:41 +0000728}
729
Elijah Newrena35df332021-02-14 07:51:47 +0000730static const char *get_basename(const char *filename)
731{
732 /*
733 * gitbasename() has to worry about special drives, multiple
734 * directory separator characters, trailing slashes, NULL or
735 * empty strings, etc. We only work on filenames as stored in
736 * git, and thus get to ignore all those complications.
737 */
738 const char *base = strrchr(filename, '/');
739 return base ? base + 1 : filename;
740}
741
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000742static int idx_possible_rename(char *filename, struct dir_rename_info *info)
Elijah Newren37a25142021-02-27 00:30:39 +0000743{
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000744 /*
745 * Our comparison of files with the same basename (see
746 * find_basename_matches() below), is only helpful when after exact
747 * rename detection we have exactly one file with a given basename
748 * among the rename sources and also only exactly one file with
749 * that basename among the rename destinations. When we have
750 * multiple files with the same basename in either set, we do not
751 * know which to compare against. However, there are some
752 * filenames that occur in large numbers (particularly
753 * build-related filenames such as 'Makefile', '.gitignore', or
754 * 'build.gradle' that potentially exist within every single
755 * subdirectory), and for performance we want to be able to quickly
756 * find renames for these files too.
757 *
758 * The reason basename comparisons are a useful heuristic was that it
759 * is common for people to move files across directories while keeping
760 * their filename the same. If we had a way of determining or even
761 * making a good educated guess about which directory these non-unique
762 * basename files had moved the file to, we could check it.
763 * Luckily...
764 *
765 * When an entire directory is in fact renamed, we have two factors
766 * helping us out:
767 * (a) the original directory disappeared giving us a hint
768 * about when we can apply an extra heuristic.
769 * (a) we often have several files within that directory and
770 * subdirectories that are renamed without changes
771 * So, rules for a heuristic:
772 * (0) If there basename matches are non-unique (the condition under
773 * which this function is called) AND
774 * (1) the directory in which the file was found has disappeared
775 * (i.e. dirs_removed is non-NULL and has a relevant entry) THEN
776 * (2) use exact renames of files within the directory to determine
777 * where the directory is likely to have been renamed to. IF
778 * there is at least one exact rename from within that
779 * directory, we can proceed.
780 * (3) If there are multiple places the directory could have been
781 * renamed to based on exact renames, ignore all but one of them.
782 * Just use the destination with the most renames going to it.
783 * (4) Check if applying that directory rename to the original file
784 * would result in a destination filename that is in the
785 * potential rename set. If so, return the index of the
786 * destination file (the index within rename_dst).
787 * (5) Compare the original file and returned destination for
788 * similarity, and if they are sufficiently similar, record the
789 * rename.
790 *
791 * This function, idx_possible_rename(), is only responsible for (4).
Elijah Newren81afdf72021-02-27 00:30:48 +0000792 * The conditions/steps in (1)-(3) are handled via setting up
793 * dir_rename_count and dir_rename_guess in
794 * initialize_dir_rename_info(). Steps (0) and (5) are handled by
795 * the caller of this function.
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000796 */
797 char *old_dir, *new_dir;
798 struct strbuf new_path = STRBUF_INIT;
799 int idx;
800
801 if (!info->setup)
802 return -1;
803
804 old_dir = get_dirname(filename);
805 new_dir = strmap_get(&info->dir_rename_guess, old_dir);
806 free(old_dir);
807 if (!new_dir)
808 return -1;
809
810 strbuf_addstr(&new_path, new_dir);
811 strbuf_addch(&new_path, '/');
812 strbuf_addstr(&new_path, get_basename(filename));
813
814 idx = strintmap_get(&info->idx_map, new_path.buf);
815 strbuf_release(&new_path);
816 return idx;
Elijah Newren37a25142021-02-27 00:30:39 +0000817}
818
Elijah Newren1aedd032021-06-22 08:04:40 +0000819struct basename_prefetch_options {
820 struct repository *repo;
821 struct strintmap *relevant_sources;
822 struct strintmap *sources;
823 struct strintmap *dests;
824 struct dir_rename_info *info;
825};
826static void basename_prefetch(void *prefetch_options)
827{
828 struct basename_prefetch_options *options = prefetch_options;
829 struct strintmap *relevant_sources = options->relevant_sources;
830 struct strintmap *sources = options->sources;
831 struct strintmap *dests = options->dests;
832 struct dir_rename_info *info = options->info;
833 int i;
834 struct oid_array to_fetch = OID_ARRAY_INIT;
835
836 /*
837 * TODO: The following loops mirror the code/logic from
838 * find_basename_matches(), though not quite exactly. Maybe
839 * abstract the iteration logic out somehow?
840 */
841 for (i = 0; i < rename_src_nr; ++i) {
842 char *filename = rename_src[i].p->one->path;
843 const char *base = NULL;
844 intptr_t src_index;
845 intptr_t dst_index;
846
847 /* Skip irrelevant sources */
848 if (relevant_sources &&
849 !strintmap_contains(relevant_sources, filename))
850 continue;
851
852 /*
853 * If the basename is unique among remaining sources, then
854 * src_index will equal 'i' and we can attempt to match it
855 * to a unique basename in the destinations. Otherwise,
856 * use directory rename heuristics, if possible.
857 */
858 base = get_basename(filename);
859 src_index = strintmap_get(sources, base);
860 assert(src_index == -1 || src_index == i);
861
862 if (strintmap_contains(dests, base)) {
863 struct diff_filespec *one, *two;
864
865 /* Find a matching destination, if possible */
866 dst_index = strintmap_get(dests, base);
867 if (src_index == -1 || dst_index == -1) {
868 src_index = i;
869 dst_index = idx_possible_rename(filename, info);
870 }
871 if (dst_index == -1)
872 continue;
873
874 /* Ignore this dest if already used in a rename */
875 if (rename_dst[dst_index].is_rename)
876 continue; /* already used previously */
877
878 one = rename_src[src_index].p->one;
879 two = rename_dst[dst_index].p->two;
880
881 /* Add the pairs */
882 diff_add_if_missing(options->repo, &to_fetch, two);
883 diff_add_if_missing(options->repo, &to_fetch, one);
884 }
885 }
886
887 promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
888 oid_array_clear(&to_fetch);
889}
890
Elijah Newrena35df332021-02-14 07:51:47 +0000891static int find_basename_matches(struct diff_options *options,
Elijah Newrenbde8b9f2021-02-27 00:30:40 +0000892 int minimum_score,
Elijah Newren1ad69eb2021-02-27 00:30:46 +0000893 struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +0000894 struct strintmap *relevant_sources,
895 struct strintmap *dirs_removed)
Elijah Newrena35df332021-02-14 07:51:47 +0000896{
Elijah Newrenda09f652021-02-14 07:51:48 +0000897 /*
898 * When I checked in early 2020, over 76% of file renames in linux
899 * just moved files to a different directory but kept the same
900 * basename. gcc did that with over 64% of renames, gecko did it
901 * with over 79%, and WebKit did it with over 89%.
902 *
903 * Therefore we can bypass the normal exhaustive NxM matrix
904 * comparison of similarities between all potential rename sources
905 * and destinations by instead using file basename as a hint (i.e.
906 * the portion of the filename after the last '/'), checking for
907 * similarity between files with the same basename, and if we find
908 * a pair that are sufficiently similar, record the rename pair and
909 * exclude those two from the NxM matrix.
910 *
911 * This *might* cause us to find a less than optimal pairing (if
912 * there is another file that we are even more similar to but has a
913 * different basename). Given the huge performance advantage
914 * basename matching provides, and given the frequency with which
915 * people use the same basename in real world projects, that's a
916 * trade-off we are willing to accept when doing just rename
917 * detection.
918 *
919 * If someone wants copy detection that implies they are willing to
920 * spend more cycles to find similarities between files, so it may
921 * be less likely that this heuristic is wanted. If someone is
922 * doing break detection, that means they do not want filename
923 * similarity to imply any form of content similiarity, and thus
924 * this heuristic would definitely be incompatible.
925 */
926
927 int i, renames = 0;
Elijah Newrena35df332021-02-14 07:51:47 +0000928 struct strintmap sources;
929 struct strintmap dests;
Elijah Newrend331dd32021-06-22 08:04:39 +0000930 struct diff_populate_filespec_options dpf_options = {
931 .check_binary = 0,
932 .missing_object_cb = NULL,
933 .missing_object_data = NULL
934 };
Elijah Newren1aedd032021-06-22 08:04:40 +0000935 struct basename_prefetch_options prefetch_options = {
Elijah Newrend331dd32021-06-22 08:04:39 +0000936 .repo = options->repo,
Elijah Newren1aedd032021-06-22 08:04:40 +0000937 .relevant_sources = relevant_sources,
938 .sources = &sources,
939 .dests = &dests,
940 .info = info
Elijah Newrend331dd32021-06-22 08:04:39 +0000941 };
Elijah Newrena35df332021-02-14 07:51:47 +0000942
943 /*
944 * Create maps of basename -> fullname(s) for remaining sources and
945 * dests.
946 */
947 strintmap_init_with_options(&sources, -1, NULL, 0);
948 strintmap_init_with_options(&dests, -1, NULL, 0);
949 for (i = 0; i < rename_src_nr; ++i) {
950 char *filename = rename_src[i].p->one->path;
951 const char *base;
952
953 /* exact renames removed in remove_unneeded_paths_from_src() */
954 assert(!rename_src[i].p->one->rename_used);
955
956 /* Record index within rename_src (i) if basename is unique */
957 base = get_basename(filename);
958 if (strintmap_contains(&sources, base))
959 strintmap_set(&sources, base, -1);
960 else
961 strintmap_set(&sources, base, i);
962 }
963 for (i = 0; i < rename_dst_nr; ++i) {
964 char *filename = rename_dst[i].p->two->path;
965 const char *base;
966
967 if (rename_dst[i].is_rename)
968 continue; /* involved in exact match already. */
969
970 /* Record index within rename_dst (i) if basename is unique */
971 base = get_basename(filename);
972 if (strintmap_contains(&dests, base))
973 strintmap_set(&dests, base, -1);
974 else
975 strintmap_set(&dests, base, i);
976 }
977
Elijah Newrend331dd32021-06-22 08:04:39 +0000978 if (options->repo == the_repository && has_promisor_remote()) {
Elijah Newren1aedd032021-06-22 08:04:40 +0000979 dpf_options.missing_object_cb = basename_prefetch;
Elijah Newrend331dd32021-06-22 08:04:39 +0000980 dpf_options.missing_object_data = &prefetch_options;
981 }
982
Elijah Newrenda09f652021-02-14 07:51:48 +0000983 /* Now look for basename matchups and do similarity estimation */
Elijah Newren37a25142021-02-27 00:30:39 +0000984 for (i = 0; i < rename_src_nr; ++i) {
985 char *filename = rename_src[i].p->one->path;
986 const char *base = NULL;
987 intptr_t src_index;
Elijah Newrenda09f652021-02-14 07:51:48 +0000988 intptr_t dst_index;
Elijah Newrenda09f652021-02-14 07:51:48 +0000989
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000990 /* Skip irrelevant sources */
991 if (relevant_sources &&
Elijah Newrena49b55d2021-03-13 22:22:02 +0000992 !strintmap_contains(relevant_sources, filename))
Elijah Newrene4fd06e2021-03-11 00:38:31 +0000993 continue;
994
Elijah Newren37a25142021-02-27 00:30:39 +0000995 /*
996 * If the basename is unique among remaining sources, then
997 * src_index will equal 'i' and we can attempt to match it
998 * to a unique basename in the destinations. Otherwise,
999 * use directory rename heuristics, if possible.
1000 */
1001 base = get_basename(filename);
1002 src_index = strintmap_get(&sources, base);
1003 assert(src_index == -1 || src_index == i);
1004
1005 if (strintmap_contains(&dests, base)) {
Elijah Newrenda09f652021-02-14 07:51:48 +00001006 struct diff_filespec *one, *two;
1007 int score;
1008
Elijah Newren37a25142021-02-27 00:30:39 +00001009 /* Find a matching destination, if possible */
1010 dst_index = strintmap_get(&dests, base);
1011 if (src_index == -1 || dst_index == -1) {
1012 src_index = i;
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001013 dst_index = idx_possible_rename(filename, info);
Elijah Newren37a25142021-02-27 00:30:39 +00001014 }
1015 if (dst_index == -1)
1016 continue;
1017
1018 /* Ignore this dest if already used in a rename */
1019 if (rename_dst[dst_index].is_rename)
1020 continue; /* already used previously */
1021
Elijah Newrenda09f652021-02-14 07:51:48 +00001022 /* Estimate the similarity */
1023 one = rename_src[src_index].p->one;
1024 two = rename_dst[dst_index].p->two;
1025 score = estimate_similarity(options->repo, one, two,
Elijah Newrend331dd32021-06-22 08:04:39 +00001026 minimum_score, &dpf_options);
Elijah Newrenda09f652021-02-14 07:51:48 +00001027
1028 /* If sufficiently similar, record as rename pair */
1029 if (score < minimum_score)
1030 continue;
1031 record_rename_pair(dst_index, src_index, score);
1032 renames++;
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001033 update_dir_rename_counts(info, dirs_removed,
1034 one->path, two->path);
Elijah Newrenda09f652021-02-14 07:51:48 +00001035
1036 /*
1037 * Found a rename so don't need text anymore; if we
1038 * didn't find a rename, the filespec_blob would get
1039 * re-used when doing the matrix of comparisons.
1040 */
1041 diff_free_filespec_blob(one);
1042 diff_free_filespec_blob(two);
1043 }
1044 }
Elijah Newrena35df332021-02-14 07:51:47 +00001045
1046 strintmap_clear(&sources);
1047 strintmap_clear(&dests);
1048
Elijah Newrenda09f652021-02-14 07:51:48 +00001049 return renames;
Elijah Newrena35df332021-02-14 07:51:47 +00001050}
1051
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001052#define NUM_CANDIDATE_PER_DST 4
1053static void record_if_better(struct diff_score m[], struct diff_score *o)
1054{
1055 int i, worst;
1056
1057 /* find the worst one */
1058 worst = 0;
1059 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
1060 if (score_compare(&m[i], &m[worst]) > 0)
1061 worst = i;
1062
1063 /* is it better than the worst one? */
1064 if (score_compare(&m[worst], o) > 0)
1065 m[worst] = *o;
1066}
1067
Junio C Hamanof31027c2011-01-06 13:50:06 -08001068/*
1069 * Returns:
1070 * 0 if we are under the limit;
1071 * 1 if we need to disable inexact rename detection;
1072 * 2 if we would be under the limit if we were given -C instead of -C -C.
1073 */
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001074static int too_many_rename_candidates(int num_destinations, int num_sources,
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001075 struct diff_options *options)
1076{
1077 int rename_limit = options->rename_limit;
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001078 int i, limited_sources;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001079
1080 options->needed_rename_limit = 0;
1081
1082 /*
1083 * This basically does a test for the rename matrix not
1084 * growing larger than a "rename_limit" square matrix, ie:
1085 *
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001086 * num_destinations * num_sources > rename_limit * rename_limit
Elijah Newrenad8a1be2020-12-11 09:08:42 +00001087 *
1088 * We use st_mult() to check overflow conditions; in the
1089 * exceptional circumstance that size_t isn't large enough to hold
1090 * the multiplication, the system won't be able to allocate enough
1091 * memory for the matrix anyway.
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001092 */
Jonathan Tan89973552017-11-29 12:11:54 -08001093 if (rename_limit <= 0)
1094 rename_limit = 32767;
Elijah Newrenad8a1be2020-12-11 09:08:42 +00001095 if (st_mult(num_destinations, num_sources)
1096 <= st_mult(rename_limit, rename_limit))
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001097 return 0;
1098
1099 options->needed_rename_limit =
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001100 num_sources > num_destinations ? num_sources : num_destinations;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001101
1102 /* Are we running under -C -C? */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001103 if (!options->flags.find_copies_harder)
Junio C Hamanof31027c2011-01-06 13:50:06 -08001104 return 1;
1105
1106 /* Would we bust the limit if we were running under -C? */
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001107 for (limited_sources = i = 0; i < num_sources; i++) {
Junio C Hamanof31027c2011-01-06 13:50:06 -08001108 if (diff_unmodified_pair(rename_src[i].p))
1109 continue;
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001110 limited_sources++;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001111 }
Elijah Newrenad8a1be2020-12-11 09:08:42 +00001112 if (st_mult(num_destinations, limited_sources)
1113 <= st_mult(rename_limit, rename_limit))
Junio C Hamanof31027c2011-01-06 13:50:06 -08001114 return 2;
Junio C Hamano9d8a5a52011-01-06 13:50:04 -08001115 return 1;
1116}
1117
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001118static int find_renames(struct diff_score *mx,
1119 int dst_cnt,
1120 int minimum_score,
1121 int copies,
1122 struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001123 struct strintmap *dirs_removed)
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001124{
1125 int count = 0, i;
1126
1127 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
1128 struct diff_rename_dst *dst;
1129
1130 if ((mx[i].dst < 0) ||
1131 (mx[i].score < minimum_score))
1132 break; /* there is no more usable pair. */
1133 dst = &rename_dst[mx[i].dst];
Elijah Newren9db2ac52020-12-11 09:08:47 +00001134 if (dst->is_rename)
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001135 continue; /* already done, either exact or fuzzy. */
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001136 if (!copies && rename_src[mx[i].src].p->one->rename_used)
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001137 continue;
1138 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
1139 count++;
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001140 update_dir_rename_counts(info, dirs_removed,
1141 rename_src[mx[i].src].p->one->path,
1142 rename_dst[mx[i].dst].p->two->path);
Linus Torvalds0940e5f2011-02-18 20:10:32 -08001143 }
1144 return count;
1145}
1146
Elijah Newren97998892021-03-11 00:38:24 +00001147static void remove_unneeded_paths_from_src(int detecting_copies,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001148 struct strintmap *interesting)
Elijah Newren829514c2021-02-14 07:35:01 +00001149{
1150 int i, new_num_src;
1151
Elijah Newren97998892021-03-11 00:38:24 +00001152 if (detecting_copies && !interesting)
Elijah Newren829514c2021-02-14 07:35:01 +00001153 return; /* nothing to remove */
1154 if (break_idx)
1155 return; /* culling incompatible with break detection */
1156
1157 /*
1158 * Note on reasons why we cull unneeded sources but not destinations:
1159 * 1) Pairings are stored in rename_dst (not rename_src), which we
1160 * need to keep around. So, we just can't cull rename_dst even
1161 * if we wanted to. But doing so wouldn't help because...
1162 *
1163 * 2) There is a matrix pairwise comparison that follows the
1164 * "Performing inexact rename detection" progress message.
1165 * Iterating over the destinations is done in the outer loop,
1166 * hence we only iterate over each of those once and we can
1167 * easily skip the outer loop early if the destination isn't
1168 * relevant. That's only one check per destination path to
1169 * skip.
1170 *
1171 * By contrast, the sources are iterated in the inner loop; if
1172 * we check whether a source can be skipped, then we'll be
1173 * checking it N separate times, once for each destination.
1174 * We don't want to have to iterate over known-not-needed
1175 * sources N times each, so avoid that by removing the sources
1176 * from rename_src here.
1177 */
1178 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
Elijah Newren97998892021-03-11 00:38:24 +00001179 struct diff_filespec *one = rename_src[i].p->one;
1180
Elijah Newren829514c2021-02-14 07:35:01 +00001181 /*
1182 * renames are stored in rename_dst, so if a rename has
1183 * already been detected using this source, we can just
1184 * remove the source knowing rename_dst has its info.
1185 */
Elijah Newren97998892021-03-11 00:38:24 +00001186 if (!detecting_copies && one->rename_used)
1187 continue;
1188
1189 /* If we don't care about the source path, skip it */
Elijah Newrena49b55d2021-03-13 22:22:02 +00001190 if (interesting && !strintmap_contains(interesting, one->path))
Elijah Newren829514c2021-02-14 07:35:01 +00001191 continue;
1192
1193 if (new_num_src < i)
1194 memcpy(&rename_src[new_num_src], &rename_src[i],
1195 sizeof(struct diff_rename_src));
1196 new_num_src++;
1197 }
1198
1199 rename_src_nr = new_num_src;
1200}
1201
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001202static void handle_early_known_dir_renames(struct dir_rename_info *info,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001203 struct strintmap *relevant_sources,
1204 struct strintmap *dirs_removed)
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001205{
1206 /*
Elijah Newren0491d392021-03-13 22:22:05 +00001207 * Directory renames are determined via an aggregate of all renames
1208 * under them and using a "majority wins" rule. The fact that
1209 * "majority wins", though, means we don't need all the renames
1210 * under the given directory, we only need enough to ensure we have
1211 * a majority.
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001212 */
Elijah Newren0491d392021-03-13 22:22:05 +00001213
Elijah Newren9bd34212021-03-13 22:22:08 +00001214 int i, new_num_src;
Elijah Newren0491d392021-03-13 22:22:05 +00001215 struct hashmap_iter iter;
1216 struct strmap_entry *entry;
1217
1218 if (!dirs_removed || !relevant_sources)
1219 return; /* nothing to cull */
1220 if (break_idx)
1221 return; /* culling incompatbile with break detection */
1222
1223 /*
Elijah Newrenbf238b72021-03-13 22:22:06 +00001224 * Supplement dir_rename_count with number of potential renames,
1225 * marking all potential rename sources as mapping to UNKNOWN_DIR.
Elijah Newren0491d392021-03-13 22:22:05 +00001226 */
Elijah Newrenbf238b72021-03-13 22:22:06 +00001227 for (i = 0; i < rename_src_nr; i++) {
1228 char *old_dir;
1229 struct diff_filespec *one = rename_src[i].p->one;
1230
1231 /*
1232 * sources that are part of a rename will have already been
1233 * removed by a prior call to remove_unneeded_paths_from_src()
1234 */
1235 assert(!one->rename_used);
1236
1237 old_dir = get_dirname(one->path);
1238 while (*old_dir != '\0' &&
1239 NOT_RELEVANT != strintmap_get(dirs_removed, old_dir)) {
1240 char *freeme = old_dir;
1241
1242 increment_count(info, old_dir, UNKNOWN_DIR);
1243 old_dir = get_dirname(old_dir);
1244
1245 /* Free resources we don't need anymore */
1246 free(freeme);
1247 }
1248 /*
1249 * old_dir and new_dir free'd in increment_count, but
1250 * get_dirname() gives us a new pointer we need to free for
1251 * old_dir. Also, if the loop runs 0 times we need old_dir
1252 * to be freed.
1253 */
1254 free(old_dir);
1255 }
Elijah Newren0491d392021-03-13 22:22:05 +00001256
1257 /*
1258 * For any directory which we need a potential rename detected for
1259 * (i.e. those marked as RELEVANT_FOR_SELF in dirs_removed), check
1260 * whether we have enough renames to satisfy the "majority rules"
1261 * requirement such that detecting any more renames of files under
1262 * it won't change the result. For any such directory, mark that
1263 * we no longer need to detect a rename for it. However, since we
1264 * might need to still detect renames for an ancestor of that
1265 * directory, use RELEVANT_FOR_ANCESTOR.
1266 */
1267 strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
1268 /* entry->key is source_dir */
1269 struct strintmap *counts = entry->value;
1270
1271 if (strintmap_get(dirs_removed, entry->key) ==
1272 RELEVANT_FOR_SELF &&
1273 dir_rename_already_determinable(counts)) {
1274 strintmap_set(dirs_removed, entry->key,
1275 RELEVANT_FOR_ANCESTOR);
1276 }
1277 }
Elijah Newren9bd34212021-03-13 22:22:08 +00001278
1279 for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
1280 struct diff_filespec *one = rename_src[i].p->one;
1281 int val;
1282
1283 val = strintmap_get(relevant_sources, one->path);
1284
1285 /*
1286 * sources that were not found in relevant_sources should
1287 * have already been removed by a prior call to
1288 * remove_unneeded_paths_from_src()
1289 */
1290 assert(val != -1);
1291
1292 if (val == RELEVANT_LOCATION) {
1293 int removable = 1;
1294 char *dir = get_dirname(one->path);
1295 while (1) {
1296 char *freeme = dir;
1297 int res = strintmap_get(dirs_removed, dir);
1298
1299 /* Quit if not found or irrelevant */
1300 if (res == NOT_RELEVANT)
1301 break;
1302 /* If RELEVANT_FOR_SELF, can't remove */
1303 if (res == RELEVANT_FOR_SELF) {
1304 removable = 0;
1305 break;
1306 }
1307 /* Else continue searching upwards */
1308 assert(res == RELEVANT_FOR_ANCESTOR);
1309 dir = get_dirname(dir);
1310 free(freeme);
1311 }
1312 free(dir);
1313 if (removable) {
1314 strintmap_set(relevant_sources, one->path,
1315 RELEVANT_NO_MORE);
1316 continue;
1317 }
1318 }
1319
1320 if (new_num_src < i)
1321 memcpy(&rename_src[new_num_src], &rename_src[i],
1322 sizeof(struct diff_rename_src));
1323 new_num_src++;
1324 }
1325
1326 rename_src_nr = new_num_src;
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001327}
1328
Elijah Newren0c4fd732021-02-27 00:30:42 +00001329void diffcore_rename_extended(struct diff_options *options,
Elijah Newrena49b55d2021-03-13 22:22:02 +00001330 struct strintmap *relevant_sources,
1331 struct strintmap *dirs_removed,
Elijah Newren25e65b62021-05-20 06:09:41 +00001332 struct strmap *dir_rename_count,
1333 struct strmap *cached_pairs)
Junio C Hamano427dcb42005-05-21 02:39:09 -07001334{
Junio C Hamano8082d8d2005-09-21 00:18:27 -07001335 int detect_rename = options->detect_rename;
1336 int minimum_score = options->rename_score;
Junio C Hamano38c6f782005-05-21 19:40:36 -07001337 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano5098baf2005-09-15 16:13:43 -07001338 struct diff_queue_struct outq;
Junio C Hamano427dcb42005-05-21 02:39:09 -07001339 struct diff_score *mx;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001340 int i, j, rename_count, skip_unmodified = 0;
Elijah Newren26a66a62020-12-11 09:08:40 +00001341 int num_destinations, dst_cnt;
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001342 int num_sources, want_copies;
Jeff King3ac942d2011-02-20 04:51:16 -05001343 struct progress *progress = NULL;
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001344 struct dir_rename_info info;
Elijah Newrend331dd32021-06-22 08:04:39 +00001345 struct diff_populate_filespec_options dpf_options = {
1346 .check_binary = 0,
1347 .missing_object_cb = NULL,
1348 .missing_object_data = NULL
1349 };
Elijah Newren1aedd032021-06-22 08:04:40 +00001350 struct inexact_prefetch_options prefetch_options = {
Elijah Newrend331dd32021-06-22 08:04:39 +00001351 .repo = options->repo
1352 };
Junio C Hamano427dcb42005-05-21 02:39:09 -07001353
Elijah Newren557ac032021-01-23 22:01:12 -08001354 trace2_region_enter("diff", "setup", options->repo);
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001355 info.setup = 0;
Elijah Newren0c4fd732021-02-27 00:30:42 +00001356 assert(!dir_rename_count || strmap_empty(dir_rename_count));
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001357 want_copies = (detect_rename == DIFF_DETECT_COPY);
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001358 if (dirs_removed && (break_idx || want_copies))
1359 BUG("dirs_removed incompatible with break/copy detection");
Elijah Newren97998892021-03-11 00:38:24 +00001360 if (break_idx && relevant_sources)
1361 BUG("break detection incompatible with source specification");
Junio C Hamano26dee0a2005-05-21 23:33:32 -07001362 if (!minimum_score)
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001363 minimum_score = DEFAULT_RENAME_SCORE;
Junio C Hamano427dcb42005-05-21 02:39:09 -07001364
Junio C Hamano427dcb42005-05-21 02:39:09 -07001365 for (i = 0; i < q->nr; i++) {
Junio C Hamano52e95782005-05-21 02:40:01 -07001366 struct diff_filepair *p = q->queue[i];
Junio C Hamano2f3f8b22006-11-02 00:02:11 -08001367 if (!DIFF_FILE_VALID(p->one)) {
Junio C Hamano81e50ea2005-05-21 19:42:18 -07001368 if (!DIFF_FILE_VALID(p->two))
Junio C Hamano60896c72005-05-22 21:24:49 -07001369 continue; /* unmerged */
Junio C Hamano2f3f8b22006-11-02 00:02:11 -08001370 else if (options->single_follow &&
1371 strcmp(options->single_follow, p->two->path))
1372 continue; /* not interested */
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001373 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -07001374 is_empty_blob_oid(&p->two->oid))
Jeff King90d43b02012-03-22 18:52:13 -04001375 continue;
Elijah Newren9db2ac52020-12-11 09:08:47 +00001376 else if (add_rename_dst(p) < 0) {
Jeff King4d6be032015-02-26 20:42:27 -05001377 warning("skipping rename detection, detected"
1378 " duplicate destination '%s'",
1379 p->two->path);
1380 goto cleanup;
1381 }
Junio C Hamano2f3f8b22006-11-02 00:02:11 -08001382 }
Brandon Williams0d1e0e72017-10-31 11:19:11 -07001383 else if (!options->flags.rename_empty &&
Brandon Williams02491b62017-05-30 10:31:08 -07001384 is_empty_blob_oid(&p->one->oid))
Jeff King90d43b02012-03-22 18:52:13 -04001385 continue;
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -04001386 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
Linus Torvalds64479712007-10-25 11:20:56 -07001387 /*
1388 * If the source is a broken "delete", and
Junio C Hamano22101002005-06-11 20:55:20 -07001389 * they did not really want to get broken,
1390 * that means the source actually stays.
Linus Torvalds64479712007-10-25 11:20:56 -07001391 * So we increment the "rename_used" score
1392 * by one, to indicate ourselves as a user
Junio C Hamano22101002005-06-11 20:55:20 -07001393 */
Linus Torvalds64479712007-10-25 11:20:56 -07001394 if (p->broken_pair && !p->score)
1395 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001396 register_rename_src(p);
Junio C Hamano22101002005-06-11 20:55:20 -07001397 }
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001398 else if (want_copies) {
Linus Torvalds64479712007-10-25 11:20:56 -07001399 /*
1400 * Increment the "rename_used" score by
1401 * one, to indicate ourselves as a user.
1402 */
1403 p->one->rename_used++;
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001404 register_rename_src(p);
Linus Torvalds64479712007-10-25 11:20:56 -07001405 }
Junio C Hamano427dcb42005-05-21 02:39:09 -07001406 }
Elijah Newren557ac032021-01-23 22:01:12 -08001407 trace2_region_leave("diff", "setup", options->repo);
Linus Torvalds0024a542007-09-14 10:39:48 -07001408 if (rename_dst_nr == 0 || rename_src_nr == 0)
Junio C Hamano427dcb42005-05-21 02:39:09 -07001409 goto cleanup; /* nothing to do */
1410
Elijah Newren557ac032021-01-23 22:01:12 -08001411 trace2_region_enter("diff", "exact renames", options->repo);
Linus Torvalds0024a542007-09-14 10:39:48 -07001412 /*
Linus Torvalds17559a62007-10-25 11:24:47 -07001413 * We really want to cull the candidates list early
1414 * with cheap tests in order to avoid doing deltas.
1415 */
Linus Torvalds11f944d2011-02-18 19:55:19 -08001416 rename_count = find_exact_renames(options);
Elijah Newren557ac032021-01-23 22:01:12 -08001417 trace2_region_leave("diff", "exact renames", options->repo);
Linus Torvalds17559a62007-10-25 11:24:47 -07001418
Linus Torvalds42899ac2007-10-26 16:56:34 -07001419 /* Did we only want exact renames? */
1420 if (minimum_score == MAX_SCORE)
1421 goto cleanup;
1422
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001423 num_sources = rename_src_nr;
Linus Torvalds42899ac2007-10-26 16:56:34 -07001424
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001425 if (want_copies || break_idx) {
1426 /*
1427 * Cull sources:
1428 * - remove ones corresponding to exact renames
Elijah Newren97998892021-03-11 00:38:24 +00001429 * - remove ones not found in relevant_sources
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001430 */
1431 trace2_region_enter("diff", "cull after exact", options->repo);
Elijah Newren97998892021-03-11 00:38:24 +00001432 remove_unneeded_paths_from_src(want_copies, relevant_sources);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001433 trace2_region_leave("diff", "cull after exact", options->repo);
1434 } else {
1435 /* Determine minimum score to match basenames */
1436 double factor = 0.5;
1437 char *basename_factor = getenv("GIT_BASENAME_FACTOR");
1438 int min_basename_score;
1439
1440 if (basename_factor)
1441 factor = strtol(basename_factor, NULL, 10)/100.0;
1442 assert(factor >= 0.0 && factor <= 1.0);
1443 min_basename_score = minimum_score +
1444 (int)(factor * (MAX_SCORE - minimum_score));
1445
1446 /*
1447 * Cull sources:
1448 * - remove ones involved in renames (found via exact match)
1449 */
1450 trace2_region_enter("diff", "cull after exact", options->repo);
Elijah Newren97998892021-03-11 00:38:24 +00001451 remove_unneeded_paths_from_src(want_copies, NULL);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001452 trace2_region_leave("diff", "cull after exact", options->repo);
1453
Elijah Newrenae8cf742021-02-27 00:30:41 +00001454 /* Preparation for basename-driven matching. */
1455 trace2_region_enter("diff", "dir rename setup", options->repo);
Elijah Newrene4fd06e2021-03-11 00:38:31 +00001456 initialize_dir_rename_info(&info, relevant_sources,
Elijah Newren25e65b62021-05-20 06:09:41 +00001457 dirs_removed, dir_rename_count,
1458 cached_pairs);
Elijah Newrenae8cf742021-02-27 00:30:41 +00001459 trace2_region_leave("diff", "dir rename setup", options->repo);
1460
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001461 /* Utilize file basenames to quickly find renames. */
1462 trace2_region_enter("diff", "basename matches", options->repo);
1463 rename_count += find_basename_matches(options,
Elijah Newrenbde8b9f2021-02-27 00:30:40 +00001464 min_basename_score,
Elijah Newrene4fd06e2021-03-11 00:38:31 +00001465 &info,
1466 relevant_sources,
1467 dirs_removed);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001468 trace2_region_leave("diff", "basename matches", options->repo);
1469
1470 /*
1471 * Cull sources, again:
1472 * - remove ones involved in renames (found via basenames)
Elijah Newren97998892021-03-11 00:38:24 +00001473 * - remove ones not found in relevant_sources
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001474 * and
1475 * - remove ones in relevant_sources which are needed only
1476 * for directory renames IF no ancestory directory
1477 * actually needs to know any more individual path
1478 * renames under them
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001479 */
1480 trace2_region_enter("diff", "cull basename", options->repo);
Elijah Newren97998892021-03-11 00:38:24 +00001481 remove_unneeded_paths_from_src(want_copies, relevant_sources);
Elijah Newrenae1db7b2021-03-13 22:22:01 +00001482 handle_early_known_dir_renames(&info, relevant_sources,
1483 dirs_removed);
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001484 trace2_region_leave("diff", "cull basename", options->repo);
1485 }
1486
1487 /* Calculate how many rename destinations are left */
1488 num_destinations = (rename_dst_nr - rename_count);
1489 num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
1490
Linus Torvalds42899ac2007-10-26 16:56:34 -07001491 /* All done? */
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001492 if (!num_destinations || !num_sources)
Linus Torvalds42899ac2007-10-26 16:56:34 -07001493 goto cleanup;
1494
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001495 switch (too_many_rename_candidates(num_destinations, num_sources,
Elijah Newren00b8ccc2020-12-11 09:08:41 +00001496 options)) {
Junio C Hamanof31027c2011-01-06 13:50:06 -08001497 case 1:
Linus Torvalds0024a542007-09-14 10:39:48 -07001498 goto cleanup;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001499 case 2:
1500 options->degraded_cc_to_c = 1;
1501 skip_unmodified = 1;
1502 break;
1503 default:
1504 break;
1505 }
Linus Torvalds0024a542007-09-14 10:39:48 -07001506
Elijah Newren557ac032021-01-23 22:01:12 -08001507 trace2_region_enter("diff", "inexact renames", options->repo);
Jeff King3ac942d2011-02-20 04:51:16 -05001508 if (options->show_rename_progress) {
Junio C Hamano8aade102017-08-19 10:39:41 -07001509 progress = start_delayed_progress(
Nguyễn Thái Ngọc Duy754dbc42014-02-21 19:50:18 +07001510 _("Performing inexact rename detection"),
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001511 (uint64_t)num_destinations * (uint64_t)num_sources);
Jeff King3ac942d2011-02-20 04:51:16 -05001512 }
1513
Elijah Newrend331dd32021-06-22 08:04:39 +00001514 /* Finish setting up dpf_options */
1515 prefetch_options.skip_unmodified = skip_unmodified;
1516 if (options->repo == the_repository && has_promisor_remote()) {
Elijah Newren1aedd032021-06-22 08:04:40 +00001517 dpf_options.missing_object_cb = inexact_prefetch;
Elijah Newrend331dd32021-06-22 08:04:39 +00001518 dpf_options.missing_object_data = &prefetch_options;
1519 }
1520
René Scharfeca56dad2021-03-13 17:17:22 +01001521 CALLOC_ARRAY(mx, st_mult(NUM_CANDIDATE_PER_DST, num_destinations));
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001522 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
Elijah Newren9db2ac52020-12-11 09:08:47 +00001523 struct diff_filespec *two = rename_dst[i].p->two;
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001524 struct diff_score *m;
1525
Elijah Newren9db2ac52020-12-11 09:08:47 +00001526 if (rename_dst[i].is_rename)
Elijah Newrenbd24aa22021-02-14 07:51:49 +00001527 continue; /* exact or basename match already handled */
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001528
1529 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
1530 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
1531 m[j].dst = -1;
1532
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001533 for (j = 0; j < rename_src_nr; j++) {
Junio C Hamanoe88d6bc2011-01-06 13:50:05 -08001534 struct diff_filespec *one = rename_src[j].p->one;
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001535 struct diff_score this_src;
Junio C Hamanof31027c2011-01-06 13:50:06 -08001536
Elijah Newren829514c2021-02-14 07:35:01 +00001537 assert(!one->rename_used || want_copies || break_idx);
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001538
Junio C Hamanof31027c2011-01-06 13:50:06 -08001539 if (skip_unmodified &&
1540 diff_unmodified_pair(rename_src[j].p))
1541 continue;
1542
Nguyễn Thái Ngọc Duyb78ea5f2018-09-21 17:57:19 +02001543 this_src.score = estimate_similarity(options->repo,
1544 one, two,
Jonathan Tan95acf112020-04-07 15:11:43 -07001545 minimum_score,
Elijah Newrend331dd32021-06-22 08:04:39 +00001546 &dpf_options);
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001547 this_src.name_score = basename_same(one, two);
1548 this_src.dst = i;
1549 this_src.src = j;
1550 record_if_better(m, &this_src);
Junio C Hamano809809b2009-11-20 22:13:47 -08001551 /*
1552 * Once we run estimate_similarity,
1553 * We do not need the text anymore.
1554 */
Junio C Hamano8ae92e62007-10-02 21:01:03 -07001555 diff_free_filespec_blob(one);
Junio C Hamano809809b2009-11-20 22:13:47 -08001556 diff_free_filespec_blob(two);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001557 }
1558 dst_cnt++;
Elijah Newren81c4bf02020-12-11 09:08:43 +00001559 display_progress(progress,
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001560 (uint64_t)dst_cnt * (uint64_t)num_sources);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001561 }
Jeff King3ac942d2011-02-20 04:51:16 -05001562 stop_progress(&progress);
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001563
Junio C Hamano427dcb42005-05-21 02:39:09 -07001564 /* cost matrix sorted by most to least similar pair */
Johannes Schindelin2049b8d2019-09-30 10:21:55 -07001565 STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
Junio C Hamano6d24ad92008-01-29 20:54:56 -08001566
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001567 rename_count += find_renames(mx, dst_cnt, minimum_score, 0,
1568 &info, dirs_removed);
Elijah Newrenf15eb7c2021-02-03 20:03:46 +00001569 if (want_copies)
Elijah Newren1ad69eb2021-02-27 00:30:46 +00001570 rename_count += find_renames(mx, dst_cnt, minimum_score, 1,
1571 &info, dirs_removed);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001572 free(mx);
Elijah Newren557ac032021-01-23 22:01:12 -08001573 trace2_region_leave("diff", "inexact renames", options->repo);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001574
Junio C Hamano15d061b2005-05-27 15:55:55 -07001575 cleanup:
Junio C Hamano427dcb42005-05-21 02:39:09 -07001576 /* At this point, we have found some renames and copies and they
Junio C Hamano5098baf2005-09-15 16:13:43 -07001577 * are recorded in rename_dst. The original list is still in *q.
Junio C Hamano427dcb42005-05-21 02:39:09 -07001578 */
Elijah Newren557ac032021-01-23 22:01:12 -08001579 trace2_region_enter("diff", "write back to queue", options->repo);
Bo Yang9ca5df92010-05-06 21:52:27 -07001580 DIFF_QUEUE_CLEAR(&outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001581 for (i = 0; i < q->nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001582 struct diff_filepair *p = q->queue[i];
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001583 struct diff_filepair *pair_to_free = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -07001584
Martin von Zweigbergkd7c9bf22011-03-23 22:41:01 -04001585 if (DIFF_PAIR_UNMERGED(p)) {
1586 diff_q(&outq, p);
1587 }
1588 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
Elijah Newren9db2ac52020-12-11 09:08:47 +00001589 /* Creation */
1590 diff_q(&outq, p);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001591 }
Junio C Hamano2cd68882005-05-30 00:08:07 -07001592 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
1593 /*
1594 * Deletion
1595 *
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001596 * We would output this delete record if:
1597 *
1598 * (1) this is a broken delete and the counterpart
1599 * broken create remains in the output; or
Junio C Hamano5098baf2005-09-15 16:13:43 -07001600 * (2) this is not a broken delete, and rename_dst
1601 * does not have a rename/copy to move p->one->path
1602 * out of existence.
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001603 *
1604 * Otherwise, the counterpart broken create
1605 * has been turned into a rename-edit; or
1606 * delete did not have a matching create to
1607 * begin with.
Junio C Hamano2cd68882005-05-30 00:08:07 -07001608 */
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001609 if (DIFF_PAIR_BROKEN(p)) {
1610 /* broken delete */
Elijah Newren9db2ac52020-12-11 09:08:47 +00001611 struct diff_rename_dst *dst = locate_rename_dst(p);
1612 if (!dst)
1613 BUG("tracking failed somehow; failed to find associated dst for broken pair");
1614 if (dst->is_rename)
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001615 /* counterpart is now rename/copy */
1616 pair_to_free = p;
1617 }
1618 else {
Linus Torvalds64479712007-10-25 11:20:56 -07001619 if (p->one->rename_used)
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001620 /* this path remains */
1621 pair_to_free = p;
1622 }
Junio C Hamano2cd68882005-05-30 00:08:07 -07001623
Elijah Newren9db2ac52020-12-11 09:08:47 +00001624 if (!pair_to_free)
Junio C Hamano2cd68882005-05-30 00:08:07 -07001625 diff_q(&outq, p);
1626 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001627 else if (!diff_unmodified_pair(p))
Junio C Hamano15d061b2005-05-27 15:55:55 -07001628 /* all the usual ones need to be kept */
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001629 diff_q(&outq, p);
Junio C Hamano15d061b2005-05-27 15:55:55 -07001630 else
Elijah Newren356da0f2021-06-08 16:11:41 +00001631 /* no need to keep unmodified pairs */
Junio C Hamano15d061b2005-05-27 15:55:55 -07001632 pair_to_free = p;
1633
Junio C Hamano226406f2005-05-27 15:50:30 -07001634 if (pair_to_free)
1635 diff_free_filepair(pair_to_free);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001636 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001637 diff_debug_queue("done copying original", &outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001638
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001639 free(q->queue);
1640 *q = outq;
1641 diff_debug_queue("done collapsing", q);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001642
Linus Torvalds9fb88412007-10-25 11:19:10 -07001643 for (i = 0; i < rename_dst_nr; i++)
Elijah Newren9db2ac52020-12-11 09:08:47 +00001644 if (rename_dst[i].filespec_to_free)
1645 free_filespec(rename_dst[i].filespec_to_free);
Junio C Hamano5098baf2005-09-15 16:13:43 -07001646
Elijah Newrenb1473012021-02-27 00:30:45 +00001647 cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +00001648 FREE_AND_NULL(rename_dst);
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001649 rename_dst_nr = rename_dst_alloc = 0;
Ævar Arnfjörð Bjarmason6a83d902017-06-15 23:15:46 +00001650 FREE_AND_NULL(rename_src);
Junio C Hamano25d5ea42005-05-24 01:10:48 -07001651 rename_src_nr = rename_src_alloc = 0;
Elijah Newren9db2ac52020-12-11 09:08:47 +00001652 if (break_idx) {
1653 strintmap_clear(break_idx);
1654 FREE_AND_NULL(break_idx);
1655 }
Elijah Newren557ac032021-01-23 22:01:12 -08001656 trace2_region_leave("diff", "write back to queue", options->repo);
Junio C Hamano427dcb42005-05-21 02:39:09 -07001657 return;
1658}
Elijah Newren0c4fd732021-02-27 00:30:42 +00001659
1660void diffcore_rename(struct diff_options *options)
1661{
Elijah Newren25e65b62021-05-20 06:09:41 +00001662 diffcore_rename_extended(options, NULL, NULL, NULL, NULL);
Elijah Newren0c4fd732021-02-27 00:30:42 +00001663}