sequencer: warn when internal merge may be suboptimal due to renameLimit
[git/git.git] / diffcore-rename.c
CommitLineData
427dcb4b
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#include "cache.h"
5#include "diff.h"
6#include "diffcore.h"
f79d9c58 7#include "hashmap.h"
3ac942d4 8#include "progress.h"
427dcb4b 9
25d5ea41
JH
10/* Table of rename/copy destinations */
11
12static struct diff_rename_dst {
13 struct diff_filespec *two;
14 struct diff_filepair *pair;
15} *rename_dst;
16static int rename_dst_nr, rename_dst_alloc;
427dcb4b 17
f98c2f7e 18static int find_rename_dst(struct diff_filespec *two)
427dcb4b 19{
25d5ea41
JH
20 int first, last;
21
22 first = 0;
23 last = rename_dst_nr;
24 while (last > first) {
25 int next = (last + first) >> 1;
26 struct diff_rename_dst *dst = &(rename_dst[next]);
27 int cmp = strcmp(two->path, dst->two->path);
28 if (!cmp)
f98c2f7e 29 return next;
25d5ea41
JH
30 if (cmp < 0) {
31 last = next;
32 continue;
33 }
34 first = next+1;
35 }
f98c2f7e
JK
36 return -first - 1;
37}
38
39static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two)
40{
41 int ofs = find_rename_dst(two);
42 return ofs < 0 ? NULL : &rename_dst[ofs];
43}
44
45/*
46 * Returns 0 on success, -1 if we found a duplicate.
47 */
48static int add_rename_dst(struct diff_filespec *two)
49{
50 int first = find_rename_dst(two);
51
52 if (first >= 0)
53 return -1;
54 first = -first - 1;
55
25d5ea41 56 /* insert to make it at "first" */
337ce247 57 ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
25d5ea41
JH
58 rename_dst_nr++;
59 if (first < rename_dst_nr)
60 memmove(rename_dst + first + 1, rename_dst + first,
61 (rename_dst_nr - first - 1) * sizeof(*rename_dst));
5098bafb 62 rename_dst[first].two = alloc_filespec(two->path);
f9704c2d 63 fill_filespec(rename_dst[first].two, &two->oid, two->oid_valid,
a0d12c44 64 two->mode);
25d5ea41 65 rename_dst[first].pair = NULL;
f98c2f7e 66 return 0;
427dcb4b
JH
67}
68
15d061b4 69/* Table of rename/copy src files */
25d5ea41 70static struct diff_rename_src {
e88d6bc6 71 struct diff_filepair *p;
fc580719 72 unsigned short score; /* to remember the break score */
25d5ea41
JH
73} *rename_src;
74static int rename_src_nr, rename_src_alloc;
427dcb4b 75
e88d6bc6 76static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
25d5ea41
JH
77{
78 int first, last;
e88d6bc6
JH
79 struct diff_filespec *one = p->one;
80 unsigned short score = p->score;
25d5ea41
JH
81
82 first = 0;
83 last = rename_src_nr;
84 while (last > first) {
85 int next = (last + first) >> 1;
86 struct diff_rename_src *src = &(rename_src[next]);
e88d6bc6 87 int cmp = strcmp(one->path, src->p->one->path);
25d5ea41
JH
88 if (!cmp)
89 return src;
90 if (cmp < 0) {
91 last = next;
92 continue;
93 }
94 first = next+1;
95 }
15d061b4 96
25d5ea41 97 /* insert to make it at "first" */
337ce247 98 ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
25d5ea41
JH
99 rename_src_nr++;
100 if (first < rename_src_nr)
101 memmove(rename_src + first + 1, rename_src + first,
102 (rename_src_nr - first - 1) * sizeof(*rename_src));
e88d6bc6 103 rename_src[first].p = p;
fc580719 104 rename_src[first].score = score;
25d5ea41 105 return &(rename_src[first]);
427dcb4b
JH
106}
107
0ce39643
JS
108static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
109{
110 int src_len = strlen(src->path), dst_len = strlen(dst->path);
111 while (src_len && dst_len) {
112 char c1 = src->path[--src_len];
113 char c2 = dst->path[--dst_len];
114 if (c1 != c2)
115 return 0;
116 if (c1 == '/')
117 return 1;
118 }
119 return (!src_len || src->path[src_len - 1] == '/') &&
120 (!dst_len || dst->path[dst_len - 1] == '/');
121}
122
427dcb4b 123struct diff_score {
25d5ea41
JH
124 int src; /* index in rename_src */
125 int dst; /* index in rename_dst */
6d24ad97
JH
126 unsigned short score;
127 short name_score;
427dcb4b
JH
128};
129
130static int estimate_similarity(struct diff_filespec *src,
131 struct diff_filespec *dst,
132 int minimum_score)
133{
134 /* src points at a file that existed in the original tree (or
135 * optionally a file in the destination tree) and dst points
136 * at a newly created file. They may be quite similar, in which
137 * case we want to say src is renamed to dst or src is copied into
138 * dst, and then some edit has been applied to dst.
139 *
140 * Compare them and return how similar they are, representing
f0c6b2a2
JH
141 * the score as an integer between 0 and MAX_SCORE.
142 *
143 * When there is an exact match, it is considered a better
144 * match than anything else; the destination does not even
145 * call into this function in that case.
427dcb4b 146 */
90bd932c 147 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
427dcb4b
JH
148 int score;
149
60896c7b
JH
150 /* We deal only with regular files. Symlink renames are handled
151 * only when they are exact matches --- in other words, no edits
152 * after renaming.
153 */
154 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
155 return 0;
156
81ac051d
LT
157 /*
158 * Need to check that source and destination sizes are
159 * filled in before comparing them.
160 *
161 * If we already have "cnt_data" filled in, we know it's
162 * all good (avoid checking the size for zero, as that
163 * is a possible size - we really should have a flag to
164 * say whether the size is valid or not!)
165 */
8e5dd3d6
NTND
166 if (!src->cnt_data &&
167 diff_populate_filespec(src, CHECK_SIZE_ONLY))
81ac051d 168 return 0;
8e5dd3d6
NTND
169 if (!dst->cnt_data &&
170 diff_populate_filespec(dst, CHECK_SIZE_ONLY))
81ac051d
LT
171 return 0;
172
90bd932c 173 max_size = ((src->size > dst->size) ? src->size : dst->size);
58b103f5 174 base_size = ((src->size < dst->size) ? src->size : dst->size);
90bd932c 175 delta_size = max_size - base_size;
427dcb4b 176
58b103f5
JH
177 /* We would not consider edits that change the file size so
178 * drastically. delta_size must be smaller than
cd1870ed 179 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
f0c6b2a2 180 *
58b103f5
JH
181 * Note that base_size == 0 case is handled here already
182 * and the final score computation below would not have a
183 * divide-by-zero issue.
427dcb4b 184 */
3a4d6769 185 if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
427dcb4b
JH
186 return 0;
187
885c716f
BS
188 if (!src->cnt_data && diff_populate_filespec(src, 0))
189 return 0;
190 if (!dst->cnt_data && diff_populate_filespec(dst, 0))
191 return 0;
192
d8c3d03a 193 if (diffcore_count_changes(src, dst,
c06c7966 194 &src->cnt_data, &dst->cnt_data,
65416758 195 &src_copied, &literal_added))
85976974 196 return 0;
355e76a4 197
1706306a
JH
198 /* How similar are they?
199 * what percentage of material in dst are from source?
427dcb4b 200 */
90bd932c 201 if (!dst->size)
1706306a 202 score = 0; /* should not happen */
cfc0aef1 203 else
dc49cd76 204 score = (int)(src_copied * MAX_SCORE / max_size);
427dcb4b
JH
205 return score;
206}
207
5098bafb 208static void record_rename_pair(int dst_index, int src_index, int score)
427dcb4b 209{
9fb88419 210 struct diff_filespec *src, *dst;
25d5ea41 211 struct diff_filepair *dp;
f7c1512a 212
25d5ea41
JH
213 if (rename_dst[dst_index].pair)
214 die("internal error: dst already matched.");
427dcb4b 215
e88d6bc6 216 src = rename_src[src_index].p->one;
64479711 217 src->rename_used++;
9fb88419 218 src->count++;
427dcb4b 219
25d5ea41 220 dst = rename_dst[dst_index].two;
9fb88419 221 dst->count++;
427dcb4b 222
9fb88419 223 dp = diff_queue(NULL, src, dst);
ef677686 224 dp->renamed_pair = 1;
fc580719
JH
225 if (!strcmp(src->path, dst->path))
226 dp->score = rename_src[src_index].score;
227 else
228 dp->score = score;
25d5ea41 229 rename_dst[dst_index].pair = dp;
427dcb4b
JH
230}
231
232/*
233 * We sort the rename similarity matrix with the score, in descending
15d061b4 234 * order (the most similar first).
427dcb4b
JH
235 */
236static int score_compare(const void *a_, const void *b_)
237{
238 const struct diff_score *a = a_, *b = b_;
cfc0aef1 239
6d24ad97
JH
240 /* sink the unused ones to the bottom */
241 if (a->dst < 0)
242 return (0 <= b->dst);
243 else if (b->dst < 0)
244 return -1;
245
cfc0aef1
RS
246 if (a->score == b->score)
247 return b->name_score - a->name_score;
248
427dcb4b
JH
249 return b->score - a->score;
250}
251
9027f53c 252struct file_similarity {
f79d9c58 253 struct hashmap_entry entry;
7c85f8ac 254 int index;
9027f53c 255 struct diff_filespec *filespec;
9027f53c
LT
256};
257
48f6407f
KB
258static unsigned int hash_filespec(struct diff_filespec *filespec)
259{
41c9560e 260 if (!filespec->oid_valid) {
48f6407f
KB
261 if (diff_populate_filespec(filespec, 0))
262 return 0;
a0d12c44 263 hash_sha1_file(filespec->data, filespec->size, "blob",
264 filespec->oid.hash);
48f6407f 265 }
a0d12c44 266 return sha1hash(filespec->oid.hash);
48f6407f
KB
267}
268
f79d9c58 269static int find_identical_files(struct hashmap *srcs,
7c85f8ac 270 int dst_index,
11f944dd 271 struct diff_options *options)
9027f53c
LT
272{
273 int renames = 0;
274
7c85f8ac 275 struct diff_filespec *target = rename_dst[dst_index].two;
ab73a9d1 276 struct file_similarity *p, *best = NULL;
48f6407f
KB
277 int i = 100, best_score = -1;
278
279 /*
7c85f8ac 280 * Find the best source match for specified destination.
48f6407f 281 */
ab73a9d1
KB
282 p = hashmap_get_from_hash(srcs, hash_filespec(target), NULL);
283 for (; p; p = hashmap_get_next(srcs, p)) {
48f6407f
KB
284 int score;
285 struct diff_filespec *source = p->filespec;
286
287 /* False hash collision? */
a0d12c44 288 if (oidcmp(&source->oid, &target->oid))
48f6407f
KB
289 continue;
290 /* Non-regular files? If so, the modes must match! */
291 if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
292 if (source->mode != target->mode)
0940e5f2 293 continue;
9027f53c 294 }
48f6407f
KB
295 /* Give higher scores to sources that haven't been used already */
296 score = !source->rename_used;
297 if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
298 continue;
299 score += basename_same(source, target);
300 if (score > best_score) {
301 best = p;
302 best_score = score;
303 if (score == 2)
304 break;
9027f53c 305 }
48f6407f
KB
306
307 /* Too many identical alternatives? Pick one */
308 if (!--i)
309 break;
310 }
311 if (best) {
7c85f8ac 312 record_rename_pair(dst_index, best->index, MAX_SCORE);
48f6407f
KB
313 renames++;
314 }
9027f53c
LT
315 return renames;
316}
317
f79d9c58 318static void insert_file_table(struct hashmap *table, int index, struct diff_filespec *filespec)
9027f53c 319{
9027f53c
LT
320 struct file_similarity *entry = xmalloc(sizeof(*entry));
321
9027f53c
LT
322 entry->index = index;
323 entry->filespec = filespec;
9027f53c 324
f79d9c58
KB
325 hashmap_entry_init(entry, hash_filespec(filespec));
326 hashmap_add(table, entry);
9027f53c
LT
327}
328
cb1491b6
LT
329/*
330 * Find exact renames first.
331 *
332 * The first round matches up the up-to-date entries,
333 * and then during the second round we try to match
334 * cache-dirty entries as well.
cb1491b6 335 */
11f944dd 336static int find_exact_renames(struct diff_options *options)
cb1491b6 337{
7c85f8ac 338 int i, renames = 0;
f79d9c58 339 struct hashmap file_table;
cb1491b6 340
ca4e3ca0
SG
341 /* Add all sources to the hash table in reverse order, because
342 * later on they will be retrieved in LIFO order.
343 */
7663cdc8 344 hashmap_init(&file_table, NULL, NULL, rename_src_nr);
ca4e3ca0 345 for (i = rename_src_nr-1; i >= 0; i--)
7c85f8ac 346 insert_file_table(&file_table, i, rename_src[i].p->one);
9027f53c 347
7c85f8ac 348 /* Walk the destinations and find best source match */
9027f53c 349 for (i = 0; i < rename_dst_nr; i++)
7c85f8ac 350 renames += find_identical_files(&file_table, i, options);
9027f53c 351
f79d9c58
KB
352 /* Free the hash data structure and entries */
353 hashmap_free(&file_table, 1);
9027f53c 354
7c85f8ac 355 return renames;
cb1491b6
LT
356}
357
6d24ad97
JH
358#define NUM_CANDIDATE_PER_DST 4
359static void record_if_better(struct diff_score m[], struct diff_score *o)
360{
361 int i, worst;
362
363 /* find the worst one */
364 worst = 0;
365 for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
366 if (score_compare(&m[i], &m[worst]) > 0)
367 worst = i;
368
369 /* is it better than the worst one? */
370 if (score_compare(&m[worst], o) > 0)
371 m[worst] = *o;
372}
373
f31027c9
JH
374/*
375 * Returns:
376 * 0 if we are under the limit;
377 * 1 if we need to disable inexact rename detection;
378 * 2 if we would be under the limit if we were given -C instead of -C -C.
379 */
9d8a5a50
JH
380static int too_many_rename_candidates(int num_create,
381 struct diff_options *options)
382{
383 int rename_limit = options->rename_limit;
384 int num_src = rename_src_nr;
f31027c9 385 int i;
9d8a5a50
JH
386
387 options->needed_rename_limit = 0;
388
389 /*
390 * This basically does a test for the rename matrix not
391 * growing larger than a "rename_limit" square matrix, ie:
392 *
393 * num_create * num_src > rename_limit * rename_limit
394 *
395 * but handles the potential overflow case specially (and we
396 * assume at least 32-bit integers)
397 */
398 if (rename_limit <= 0 || rename_limit > 32767)
399 rename_limit = 32767;
400 if ((num_create <= rename_limit || num_src <= rename_limit) &&
401 (num_create * num_src <= rename_limit * rename_limit))
402 return 0;
403
404 options->needed_rename_limit =
405 num_src > num_create ? num_src : num_create;
f31027c9
JH
406
407 /* Are we running under -C -C? */
0d1e0e78 408 if (!options->flags.find_copies_harder)
f31027c9
JH
409 return 1;
410
411 /* Would we bust the limit if we were running under -C? */
412 for (num_src = i = 0; i < rename_src_nr; i++) {
413 if (diff_unmodified_pair(rename_src[i].p))
414 continue;
415 num_src++;
416 }
417 if ((num_create <= rename_limit || num_src <= rename_limit) &&
418 (num_create * num_src <= rename_limit * rename_limit))
419 return 2;
9d8a5a50
JH
420 return 1;
421}
422
0940e5f2
LT
423static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
424{
425 int count = 0, i;
426
427 for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
428 struct diff_rename_dst *dst;
429
430 if ((mx[i].dst < 0) ||
431 (mx[i].score < minimum_score))
432 break; /* there is no more usable pair. */
433 dst = &rename_dst[mx[i].dst];
434 if (dst->pair)
435 continue; /* already done, either exact or fuzzy. */
e88d6bc6 436 if (!copies && rename_src[mx[i].src].p->one->rename_used)
0940e5f2
LT
437 continue;
438 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
439 count++;
440 }
441 return count;
442}
443
8082d8d3 444void diffcore_rename(struct diff_options *options)
427dcb4b 445{
8082d8d3
JH
446 int detect_rename = options->detect_rename;
447 int minimum_score = options->rename_score;
38c6f780 448 struct diff_queue_struct *q = &diff_queued_diff;
5098bafb 449 struct diff_queue_struct outq;
427dcb4b 450 struct diff_score *mx;
f31027c9 451 int i, j, rename_count, skip_unmodified = 0;
dabdbee1 452 int num_create, dst_cnt;
3ac942d4 453 struct progress *progress = NULL;
427dcb4b 454
26dee0ad 455 if (!minimum_score)
f345b0a0 456 minimum_score = DEFAULT_RENAME_SCORE;
427dcb4b 457
427dcb4b 458 for (i = 0; i < q->nr; i++) {
52e95789 459 struct diff_filepair *p = q->queue[i];
2f3f8b21 460 if (!DIFF_FILE_VALID(p->one)) {
81e50eab 461 if (!DIFF_FILE_VALID(p->two))
60896c7b 462 continue; /* unmerged */
2f3f8b21
JH
463 else if (options->single_follow &&
464 strcmp(options->single_follow, p->two->path))
465 continue; /* not interested */
0d1e0e78 466 else if (!options->flags.rename_empty &&
02491b67 467 is_empty_blob_oid(&p->two->oid))
90d43b07 468 continue;
4d6be03b
JK
469 else if (add_rename_dst(p->two) < 0) {
470 warning("skipping rename detection, detected"
471 " duplicate destination '%s'",
472 p->two->path);
473 goto cleanup;
474 }
2f3f8b21 475 }
0d1e0e78 476 else if (!options->flags.rename_empty &&
02491b67 477 is_empty_blob_oid(&p->one->oid))
90d43b07 478 continue;
d7c9bf22 479 else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
64479711
LT
480 /*
481 * If the source is a broken "delete", and
2210100a
JH
482 * they did not really want to get broken,
483 * that means the source actually stays.
64479711
LT
484 * So we increment the "rename_used" score
485 * by one, to indicate ourselves as a user
486 */
487 if (p->broken_pair && !p->score)
488 p->one->rename_used++;
e88d6bc6 489 register_rename_src(p);
64479711
LT
490 }
491 else if (detect_rename == DIFF_DETECT_COPY) {
492 /*
493 * Increment the "rename_used" score by
494 * one, to indicate ourselves as a user.
2210100a 495 */
64479711 496 p->one->rename_used++;
e88d6bc6 497 register_rename_src(p);
2210100a 498 }
427dcb4b 499 }
0024a549 500 if (rename_dst_nr == 0 || rename_src_nr == 0)
427dcb4b
JH
501 goto cleanup; /* nothing to do */
502
17559a64
LT
503 /*
504 * We really want to cull the candidates list early
505 * with cheap tests in order to avoid doing deltas.
506 */
11f944dd 507 rename_count = find_exact_renames(options);
17559a64 508
42899ac8
LT
509 /* Did we only want exact renames? */
510 if (minimum_score == MAX_SCORE)
511 goto cleanup;
512
513 /*
514 * Calculate how many renames are left (but all the source
515 * files still remain as options for rename/copies!)
516 */
517 num_create = (rename_dst_nr - rename_count);
42899ac8
LT
518
519 /* All done? */
520 if (!num_create)
521 goto cleanup;
522
f31027c9
JH
523 switch (too_many_rename_candidates(num_create, options)) {
524 case 1:
0024a549 525 goto cleanup;
f31027c9
JH
526 case 2:
527 options->degraded_cc_to_c = 1;
528 skip_unmodified = 1;
529 break;
530 default:
531 break;
532 }
0024a549 533
3ac942d4 534 if (options->show_rename_progress) {
8aade107 535 progress = start_delayed_progress(
754dbc43 536 _("Performing inexact rename detection"),
8aade107 537 rename_dst_nr * rename_src_nr);
3ac942d4
JK
538 }
539
50492f7b 540 mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
25d5ea41 541 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
25d5ea41 542 struct diff_filespec *two = rename_dst[i].two;
6d24ad97
JH
543 struct diff_score *m;
544
25d5ea41 545 if (rename_dst[i].pair)
427dcb4b 546 continue; /* dealt with exact match already. */
6d24ad97
JH
547
548 m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
549 for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
550 m[j].dst = -1;
551
25d5ea41 552 for (j = 0; j < rename_src_nr; j++) {
e88d6bc6 553 struct diff_filespec *one = rename_src[j].p->one;
6d24ad97 554 struct diff_score this_src;
f31027c9
JH
555
556 if (skip_unmodified &&
557 diff_unmodified_pair(rename_src[j].p))
558 continue;
559
6d24ad97
JH
560 this_src.score = estimate_similarity(one, two,
561 minimum_score);
562 this_src.name_score = basename_same(one, two);
563 this_src.dst = i;
564 this_src.src = j;
565 record_if_better(m, &this_src);
809809bb
JH
566 /*
567 * Once we run estimate_similarity,
568 * We do not need the text anymore.
569 */
8ae92e63 570 diff_free_filespec_blob(one);
809809bb 571 diff_free_filespec_blob(two);
427dcb4b
JH
572 }
573 dst_cnt++;
3ac942d4 574 display_progress(progress, (i+1)*rename_src_nr);
427dcb4b 575 }
3ac942d4 576 stop_progress(&progress);
6d24ad97 577
427dcb4b 578 /* cost matrix sorted by most to least similar pair */
9ed0d8d6 579 QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
6d24ad97 580
0940e5f2
LT
581 rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
582 if (detect_rename == DIFF_DETECT_COPY)
583 rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
427dcb4b 584 free(mx);
427dcb4b 585
15d061b4 586 cleanup:
427dcb4b 587 /* At this point, we have found some renames and copies and they
5098bafb 588 * are recorded in rename_dst. The original list is still in *q.
427dcb4b 589 */
9ca5df90 590 DIFF_QUEUE_CLEAR(&outq);
427dcb4b 591 for (i = 0; i < q->nr; i++) {
25d5ea41 592 struct diff_filepair *p = q->queue[i];
25d5ea41
JH
593 struct diff_filepair *pair_to_free = NULL;
594
d7c9bf22
MZ
595 if (DIFF_PAIR_UNMERGED(p)) {
596 diff_q(&outq, p);
597 }
598 else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
2cd68882
JH
599 /*
600 * Creation
601 *
602 * We would output this create record if it has
603 * not been turned into a rename/copy already.
604 */
f98c2f7e 605 struct diff_rename_dst *dst = locate_rename_dst(p->two);
2cd68882 606 if (dst && dst->pair) {
25d5ea41
JH
607 diff_q(&outq, dst->pair);
608 pair_to_free = p;
609 }
610 else
2cd68882
JH
611 /* no matching rename/copy source, so
612 * record this as a creation.
25d5ea41
JH
613 */
614 diff_q(&outq, p);
427dcb4b 615 }
2cd68882
JH
616 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
617 /*
618 * Deletion
619 *
f345b0a0
JH
620 * We would output this delete record if:
621 *
622 * (1) this is a broken delete and the counterpart
623 * broken create remains in the output; or
5098bafb
JH
624 * (2) this is not a broken delete, and rename_dst
625 * does not have a rename/copy to move p->one->path
626 * out of existence.
f345b0a0
JH
627 *
628 * Otherwise, the counterpart broken create
629 * has been turned into a rename-edit; or
630 * delete did not have a matching create to
631 * begin with.
2cd68882 632 */
f345b0a0
JH
633 if (DIFF_PAIR_BROKEN(p)) {
634 /* broken delete */
f98c2f7e 635 struct diff_rename_dst *dst = locate_rename_dst(p->one);
f345b0a0
JH
636 if (dst && dst->pair)
637 /* counterpart is now rename/copy */
638 pair_to_free = p;
639 }
640 else {
64479711 641 if (p->one->rename_used)
f345b0a0
JH
642 /* this path remains */
643 pair_to_free = p;
644 }
2cd68882
JH
645
646 if (pair_to_free)
647 ;
648 else
649 diff_q(&outq, p);
650 }
25d5ea41 651 else if (!diff_unmodified_pair(p))
15d061b4 652 /* all the usual ones need to be kept */
25d5ea41 653 diff_q(&outq, p);
15d061b4
JH
654 else
655 /* no need to keep unmodified pairs */
656 pair_to_free = p;
657
226406f6
JH
658 if (pair_to_free)
659 diff_free_filepair(pair_to_free);
427dcb4b 660 }
25d5ea41 661 diff_debug_queue("done copying original", &outq);
427dcb4b 662
25d5ea41
JH
663 free(q->queue);
664 *q = outq;
665 diff_debug_queue("done collapsing", q);
427dcb4b 666
9fb88419
LT
667 for (i = 0; i < rename_dst_nr; i++)
668 free_filespec(rename_dst[i].two);
5098bafb 669
6a83d902 670 FREE_AND_NULL(rename_dst);
25d5ea41 671 rename_dst_nr = rename_dst_alloc = 0;
6a83d902 672 FREE_AND_NULL(rename_src);
25d5ea41 673 rename_src_nr = rename_src_alloc = 0;
427dcb4b
JH
674 return;
675}