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