blob: 6bde4396f212833cc1d411e723d5215c086e7c2d [file] [log] [blame]
Junio C Hamano427dcb42005-05-21 02:39:09 -07001/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#include "cache.h"
5#include "diff.h"
6#include "diffcore.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -07007
Junio C Hamano25d5ea42005-05-24 01:10:48 -07008/* Table of rename/copy destinations */
Junio C Hamano427dcb42005-05-21 02:39:09 -07009
Junio C Hamano25d5ea42005-05-24 01:10:48 -070010static struct diff_rename_dst {
11 struct diff_filespec *two;
12 struct diff_filepair *pair;
13} *rename_dst;
14static int rename_dst_nr, rename_dst_alloc;
15
16static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two,
17 int insert_ok)
Junio C Hamano427dcb42005-05-21 02:39:09 -070018{
Junio C Hamano25d5ea42005-05-24 01:10:48 -070019 int first, last;
20
21 first = 0;
22 last = rename_dst_nr;
23 while (last > first) {
24 int next = (last + first) >> 1;
25 struct diff_rename_dst *dst = &(rename_dst[next]);
26 int cmp = strcmp(two->path, dst->two->path);
27 if (!cmp)
28 return dst;
29 if (cmp < 0) {
30 last = next;
31 continue;
32 }
33 first = next+1;
34 }
35 /* not found */
36 if (!insert_ok)
37 return NULL;
38 /* insert to make it at "first" */
39 if (rename_dst_alloc <= rename_dst_nr) {
40 rename_dst_alloc = alloc_nr(rename_dst_alloc);
41 rename_dst = xrealloc(rename_dst,
42 rename_dst_alloc * sizeof(*rename_dst));
43 }
44 rename_dst_nr++;
45 if (first < rename_dst_nr)
46 memmove(rename_dst + first + 1, rename_dst + first,
47 (rename_dst_nr - first - 1) * sizeof(*rename_dst));
Junio C Hamano5098baf2005-09-15 16:13:43 -070048 rename_dst[first].two = alloc_filespec(two->path);
49 fill_filespec(rename_dst[first].two, two->sha1, two->mode);
Junio C Hamano25d5ea42005-05-24 01:10:48 -070050 rename_dst[first].pair = NULL;
51 return &(rename_dst[first]);
Junio C Hamano427dcb42005-05-21 02:39:09 -070052}
53
Junio C Hamano15d061b2005-05-27 15:55:55 -070054/* Table of rename/copy src files */
Junio C Hamano25d5ea42005-05-24 01:10:48 -070055static struct diff_rename_src {
56 struct diff_filespec *one;
Junio C Hamanofc580712006-04-08 20:17:46 -070057 unsigned short score; /* to remember the break score */
Junio C Hamano6bac10d2005-09-10 12:42:32 -070058 unsigned src_path_left : 1;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070059} *rename_src;
60static int rename_src_nr, rename_src_alloc;
Junio C Hamano427dcb42005-05-21 02:39:09 -070061
Junio C Hamano15d061b2005-05-27 15:55:55 -070062static struct diff_rename_src *register_rename_src(struct diff_filespec *one,
Junio C Hamanofc580712006-04-08 20:17:46 -070063 int src_path_left,
64 unsigned short score)
Junio C Hamano25d5ea42005-05-24 01:10:48 -070065{
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;
Junio C Hamano427dcb42005-05-21 02:39:09 -070081 }
Junio C Hamano15d061b2005-05-27 15:55:55 -070082
Junio C Hamano25d5ea42005-05-24 01:10:48 -070083 /* 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));
88 }
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;
Junio C Hamanofc580712006-04-08 20:17:46 -070094 rename_src[first].score = score;
Junio C Hamano6bac10d2005-09-10 12:42:32 -070095 rename_src[first].src_path_left = src_path_left;
Junio C Hamano25d5ea42005-05-24 01:10:48 -070096 return &(rename_src[first]);
Junio C Hamano427dcb42005-05-21 02:39:09 -070097}
98
Junio C Hamano17e60192006-07-06 00:35:47 -070099static int is_exact_match(struct diff_filespec *src,
100 struct diff_filespec *dst,
101 int contents_too)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700102{
103 if (src->sha1_valid && dst->sha1_valid &&
David Rientjesa89fccd2006-08-17 11:54:57 -0700104 !hashcmp(src->sha1, dst->sha1))
Junio C Hamano427dcb42005-05-21 02:39:09 -0700105 return 1;
Junio C Hamano17e60192006-07-06 00:35:47 -0700106 if (!contents_too)
107 return 0;
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700108 if (diff_populate_filespec(src, 1) || diff_populate_filespec(dst, 1))
109 return 0;
110 if (src->size != dst->size)
111 return 0;
Shawn O. Pearce7da41f42006-12-14 05:07:46 -0500112 if (src->sha1_valid && dst->sha1_valid)
113 return !hashcmp(src->sha1, dst->sha1);
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700114 if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
Junio C Hamano427dcb42005-05-21 02:39:09 -0700115 return 0;
116 if (src->size == dst->size &&
117 !memcmp(src->data, dst->data, src->size))
118 return 1;
119 return 0;
120}
121
Johannes Schindelin0ce39642007-06-21 12:52:11 +0100122static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
123{
124 int src_len = strlen(src->path), dst_len = strlen(dst->path);
125 while (src_len && dst_len) {
126 char c1 = src->path[--src_len];
127 char c2 = dst->path[--dst_len];
128 if (c1 != c2)
129 return 0;
130 if (c1 == '/')
131 return 1;
132 }
133 return (!src_len || src->path[src_len - 1] == '/') &&
134 (!dst_len || dst->path[dst_len - 1] == '/');
135}
136
Junio C Hamano427dcb42005-05-21 02:39:09 -0700137struct diff_score {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700138 int src; /* index in rename_src */
139 int dst; /* index in rename_dst */
Junio C Hamano427dcb42005-05-21 02:39:09 -0700140 int score;
René Scharfecfc0aef2007-06-25 00:23:28 +0200141 int name_score;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700142};
143
144static int estimate_similarity(struct diff_filespec *src,
145 struct diff_filespec *dst,
146 int minimum_score)
147{
148 /* src points at a file that existed in the original tree (or
149 * optionally a file in the destination tree) and dst points
150 * at a newly created file. They may be quite similar, in which
151 * case we want to say src is renamed to dst or src is copied into
152 * dst, and then some edit has been applied to dst.
153 *
154 * Compare them and return how similar they are, representing
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700155 * the score as an integer between 0 and MAX_SCORE.
156 *
157 * When there is an exact match, it is considered a better
158 * match than anything else; the destination does not even
159 * call into this function in that case.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700160 */
Linus Torvalds90bd9322006-03-12 22:26:34 -0800161 unsigned long max_size, delta_size, base_size, src_copied, literal_added;
Junio C Hamano75c660a2005-06-28 16:58:27 -0700162 unsigned long delta_limit;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700163 int score;
164
Junio C Hamano60896c72005-05-22 21:24:49 -0700165 /* We deal only with regular files. Symlink renames are handled
166 * only when they are exact matches --- in other words, no edits
167 * after renaming.
168 */
169 if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
170 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 */
Junio C Hamanocd1870e2005-05-22 01:31:28 -0700184 if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700185 return 0;
186
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700187 if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
188 return 0; /* error but caught downstream */
189
Junio C Hamano65416752006-02-28 16:01:36 -0800190
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500191 delta_limit = (unsigned long)
192 (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
Junio C Hamanod8c3d032007-06-28 22:54:37 -0700193 if (diffcore_count_changes(src, dst,
Junio C Hamanoc06c7962006-03-12 03:22:10 -0800194 &src->cnt_data, &dst->cnt_data,
Junio C Hamano65416752006-02-28 16:01:36 -0800195 delta_limit,
196 &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{
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700211 struct diff_filespec *one, *two, *src, *dst;
212 struct diff_filepair *dp;
Junio C Hamanof7c15122005-05-22 21:26:09 -0700213
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700214 if (rename_dst[dst_index].pair)
215 die("internal error: dst already matched.");
216
217 src = rename_src[src_index].one;
218 one = alloc_filespec(src->path);
219 fill_filespec(one, src->sha1, src->mode);
220
221 dst = rename_dst[dst_index].two;
222 two = alloc_filespec(dst->path);
223 fill_filespec(two, dst->sha1, dst->mode);
224
Junio C Hamano5098baf2005-09-15 16:13:43 -0700225 dp = diff_queue(NULL, one, two);
Junio C Hamanoef677682006-08-03 12:01:01 -0700226 dp->renamed_pair = 1;
Junio C Hamanofc580712006-04-08 20:17:46 -0700227 if (!strcmp(src->path, dst->path))
228 dp->score = rename_src[src_index].score;
229 else
230 dp->score = score;
Junio C Hamano6bac10d2005-09-10 12:42:32 -0700231 dp->source_stays = rename_src[src_index].src_path_left;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700232 rename_dst[dst_index].pair = dp;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700233}
234
235/*
236 * We sort the rename similarity matrix with the score, in descending
Junio C Hamano15d061b2005-05-27 15:55:55 -0700237 * order (the most similar first).
Junio C Hamano427dcb42005-05-21 02:39:09 -0700238 */
239static int score_compare(const void *a_, const void *b_)
240{
241 const struct diff_score *a = a_, *b = b_;
René Scharfecfc0aef2007-06-25 00:23:28 +0200242
243 if (a->score == b->score)
244 return b->name_score - a->name_score;
245
Junio C Hamano427dcb42005-05-21 02:39:09 -0700246 return b->score - a->score;
247}
248
Junio C Hamano6bac10d2005-09-10 12:42:32 -0700249static int compute_stays(struct diff_queue_struct *q,
250 struct diff_filespec *one)
251{
252 int i;
253 for (i = 0; i < q->nr; i++) {
254 struct diff_filepair *p = q->queue[i];
255 if (strcmp(one->path, p->two->path))
256 continue;
257 if (DIFF_PAIR_RENAME(p)) {
258 return 0; /* something else is renamed into this */
259 }
260 }
261 return 1;
262}
263
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700264void diffcore_rename(struct diff_options *options)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700265{
Junio C Hamano8082d8d2005-09-21 00:18:27 -0700266 int detect_rename = options->detect_rename;
267 int minimum_score = options->rename_score;
268 int rename_limit = options->rename_limit;
Junio C Hamano38c6f782005-05-21 19:40:36 -0700269 struct diff_queue_struct *q = &diff_queued_diff;
Junio C Hamano5098baf2005-09-15 16:13:43 -0700270 struct diff_queue_struct outq;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700271 struct diff_score *mx;
Junio C Hamano17e60192006-07-06 00:35:47 -0700272 int i, j, rename_count, contents_too;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700273 int num_create, num_src, dst_cnt;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700274
Junio C Hamano26dee0a2005-05-21 23:33:32 -0700275 if (!minimum_score)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700276 minimum_score = DEFAULT_RENAME_SCORE;
Junio C Hamano5098baf2005-09-15 16:13:43 -0700277 rename_count = 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700278
Junio C Hamano427dcb42005-05-21 02:39:09 -0700279 for (i = 0; i < q->nr; i++) {
Junio C Hamano52e95782005-05-21 02:40:01 -0700280 struct diff_filepair *p = q->queue[i];
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800281 if (!DIFF_FILE_VALID(p->one)) {
Junio C Hamano81e50ea2005-05-21 19:42:18 -0700282 if (!DIFF_FILE_VALID(p->two))
Junio C Hamano60896c72005-05-22 21:24:49 -0700283 continue; /* unmerged */
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800284 else if (options->single_follow &&
285 strcmp(options->single_follow, p->two->path))
286 continue; /* not interested */
Junio C Hamano427dcb42005-05-21 02:39:09 -0700287 else
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700288 locate_rename_dst(p->two, 1);
Junio C Hamano2f3f8b22006-11-02 00:02:11 -0800289 }
Junio C Hamano22101002005-06-11 20:55:20 -0700290 else if (!DIFF_FILE_VALID(p->two)) {
291 /* If the source is a broken "delete", and
292 * they did not really want to get broken,
293 * that means the source actually stays.
294 */
295 int stays = (p->broken_pair && !p->score);
Junio C Hamanofc580712006-04-08 20:17:46 -0700296 register_rename_src(p->one, stays, p->score);
Junio C Hamano22101002005-06-11 20:55:20 -0700297 }
Junio C Hamano15d061b2005-05-27 15:55:55 -0700298 else if (detect_rename == DIFF_DETECT_COPY)
Junio C Hamanofc580712006-04-08 20:17:46 -0700299 register_rename_src(p->one, 1, p->score);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700300 }
Eric Wong7d6fb372005-12-24 04:12:43 -0800301 if (rename_dst_nr == 0 || rename_src_nr == 0 ||
Junio C Hamano3299c6f2005-11-15 12:48:08 -0800302 (0 < rename_limit && rename_limit < rename_dst_nr))
Junio C Hamano427dcb42005-05-21 02:39:09 -0700303 goto cleanup; /* nothing to do */
304
305 /* We really want to cull the candidates list early
306 * with cheap tests in order to avoid doing deltas.
Junio C Hamano17e60192006-07-06 00:35:47 -0700307 * The first round matches up the up-to-date entries,
308 * and then during the second round we try to match
309 * cache-dirty entries as well.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700310 */
Junio C Hamano17e60192006-07-06 00:35:47 -0700311 for (contents_too = 0; contents_too < 2; contents_too++) {
312 for (i = 0; i < rename_dst_nr; i++) {
313 struct diff_filespec *two = rename_dst[i].two;
314 if (rename_dst[i].pair)
315 continue; /* dealt with an earlier round */
316 for (j = 0; j < rename_src_nr; j++) {
Johannes Schindelin0ce39642007-06-21 12:52:11 +0100317 int k;
Junio C Hamano17e60192006-07-06 00:35:47 -0700318 struct diff_filespec *one = rename_src[j].one;
319 if (!is_exact_match(one, two, contents_too))
320 continue;
Johannes Schindelin0ce39642007-06-21 12:52:11 +0100321
322 /* see if there is a basename match, too */
323 for (k = j; k < rename_src_nr; k++) {
324 one = rename_src[k].one;
325 if (basename_same(one, two) &&
326 is_exact_match(one, two,
327 contents_too)) {
328 j = k;
329 break;
330 }
331 }
332
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500333 record_rename_pair(i, j, (int)MAX_SCORE);
Junio C Hamano17e60192006-07-06 00:35:47 -0700334 rename_count++;
335 break; /* we are done with this entry */
336 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700337 }
338 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700339
340 /* Have we run out the created file pool? If so we can avoid
341 * doing the delta matrix altogether.
342 */
Junio C Hamano5098baf2005-09-15 16:13:43 -0700343 if (rename_count == rename_dst_nr)
Junio C Hamano15d061b2005-05-27 15:55:55 -0700344 goto cleanup;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700345
Junio C Hamano9f70b802005-11-21 12:18:23 -0800346 if (minimum_score == MAX_SCORE)
347 goto cleanup;
348
Junio C Hamano5098baf2005-09-15 16:13:43 -0700349 num_create = (rename_dst_nr - rename_count);
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700350 num_src = rename_src_nr;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700351 mx = xmalloc(sizeof(*mx) * num_create * num_src);
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700352 for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
Junio C Hamano427dcb42005-05-21 02:39:09 -0700353 int base = dst_cnt * num_src;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700354 struct diff_filespec *two = rename_dst[i].two;
355 if (rename_dst[i].pair)
Junio C Hamano427dcb42005-05-21 02:39:09 -0700356 continue; /* dealt with exact match already. */
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700357 for (j = 0; j < rename_src_nr; j++) {
358 struct diff_filespec *one = rename_src[j].one;
359 struct diff_score *m = &mx[base+j];
360 m->src = j;
361 m->dst = i;
362 m->score = estimate_similarity(one, two,
363 minimum_score);
René Scharfecfc0aef2007-06-25 00:23:28 +0200364 m->name_score = basename_same(one, two);
Junio C Hamano50b2b532007-05-03 13:04:53 -0700365 diff_free_filespec_data(one);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700366 }
Junio C Hamano28211042006-03-12 16:39:51 -0800367 /* We do not need the text anymore */
368 diff_free_filespec_data(two);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700369 dst_cnt++;
370 }
371 /* cost matrix sorted by most to least similar pair */
372 qsort(mx, num_create * num_src, sizeof(*mx), score_compare);
373 for (i = 0; i < num_create * num_src; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700374 struct diff_rename_dst *dst = &rename_dst[mx[i].dst];
375 if (dst->pair)
376 continue; /* already done, either exact or fuzzy. */
Junio C Hamano427dcb42005-05-21 02:39:09 -0700377 if (mx[i].score < minimum_score)
Junio C Hamano15d061b2005-05-27 15:55:55 -0700378 break; /* there is no more usable pair. */
Junio C Hamano5098baf2005-09-15 16:13:43 -0700379 record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
380 rename_count++;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700381 }
382 free(mx);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700383
Junio C Hamano15d061b2005-05-27 15:55:55 -0700384 cleanup:
Junio C Hamano427dcb42005-05-21 02:39:09 -0700385 /* At this point, we have found some renames and copies and they
Junio C Hamano5098baf2005-09-15 16:13:43 -0700386 * are recorded in rename_dst. The original list is still in *q.
Junio C Hamano427dcb42005-05-21 02:39:09 -0700387 */
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700388 outq.queue = NULL;
389 outq.nr = outq.alloc = 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700390 for (i = 0; i < q->nr; i++) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700391 struct diff_filepair *p = q->queue[i];
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700392 struct diff_filepair *pair_to_free = NULL;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700393
Junio C Hamano2cd68882005-05-30 00:08:07 -0700394 if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
395 /*
396 * Creation
397 *
398 * We would output this create record if it has
399 * not been turned into a rename/copy already.
400 */
401 struct diff_rename_dst *dst =
402 locate_rename_dst(p->two, 0);
403 if (dst && dst->pair) {
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700404 diff_q(&outq, dst->pair);
405 pair_to_free = p;
406 }
Junio C Hamano427dcb42005-05-21 02:39:09 -0700407 else
Junio C Hamano2cd68882005-05-30 00:08:07 -0700408 /* no matching rename/copy source, so
409 * record this as a creation.
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700410 */
411 diff_q(&outq, p);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700412 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700413 else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
414 /*
415 * Deletion
416 *
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700417 * We would output this delete record if:
418 *
419 * (1) this is a broken delete and the counterpart
420 * broken create remains in the output; or
Junio C Hamano5098baf2005-09-15 16:13:43 -0700421 * (2) this is not a broken delete, and rename_dst
422 * does not have a rename/copy to move p->one->path
423 * out of existence.
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700424 *
425 * Otherwise, the counterpart broken create
426 * has been turned into a rename-edit; or
427 * delete did not have a matching create to
428 * begin with.
Junio C Hamano2cd68882005-05-30 00:08:07 -0700429 */
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700430 if (DIFF_PAIR_BROKEN(p)) {
431 /* broken delete */
432 struct diff_rename_dst *dst =
433 locate_rename_dst(p->one, 0);
434 if (dst && dst->pair)
435 /* counterpart is now rename/copy */
436 pair_to_free = p;
437 }
438 else {
Junio C Hamano5098baf2005-09-15 16:13:43 -0700439 for (j = 0; j < rename_dst_nr; j++) {
440 if (!rename_dst[j].pair)
441 continue;
442 if (strcmp(rename_dst[j].pair->
443 one->path,
444 p->one->path))
445 continue;
446 break;
447 }
448 if (j < rename_dst_nr)
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700449 /* this path remains */
450 pair_to_free = p;
451 }
Junio C Hamano2cd68882005-05-30 00:08:07 -0700452
453 if (pair_to_free)
454 ;
455 else
456 diff_q(&outq, p);
457 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700458 else if (!diff_unmodified_pair(p))
Junio C Hamano15d061b2005-05-27 15:55:55 -0700459 /* all the usual ones need to be kept */
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700460 diff_q(&outq, p);
Junio C Hamano15d061b2005-05-27 15:55:55 -0700461 else
462 /* no need to keep unmodified pairs */
463 pair_to_free = p;
464
Junio C Hamano226406f2005-05-27 15:50:30 -0700465 if (pair_to_free)
466 diff_free_filepair(pair_to_free);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700467 }
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700468 diff_debug_queue("done copying original", &outq);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700469
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700470 free(q->queue);
471 *q = outq;
472 diff_debug_queue("done collapsing", q);
Junio C Hamano427dcb42005-05-21 02:39:09 -0700473
Junio C Hamano6bac10d2005-09-10 12:42:32 -0700474 /* We need to see which rename source really stays here;
475 * earlier we only checked if the path is left in the result,
476 * but even if a path remains in the result, if that is coming
477 * from copying something else on top of it, then the original
478 * source is lost and does not stay.
479 */
480 for (i = 0; i < q->nr; i++) {
481 struct diff_filepair *p = q->queue[i];
482 if (DIFF_PAIR_RENAME(p) && p->source_stays) {
483 /* If one appears as the target of a rename-copy,
484 * then mark p->source_stays = 0; otherwise
485 * leave it as is.
486 */
487 p->source_stays = compute_stays(q, p->one);
488 }
489 }
490
Junio C Hamano5098baf2005-09-15 16:13:43 -0700491 for (i = 0; i < rename_dst_nr; i++) {
492 diff_free_filespec_data(rename_dst[i].two);
493 free(rename_dst[i].two);
494 }
495
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700496 free(rename_dst);
497 rename_dst = NULL;
498 rename_dst_nr = rename_dst_alloc = 0;
499 free(rename_src);
500 rename_src = NULL;
501 rename_src_nr = rename_src_alloc = 0;
Junio C Hamano427dcb42005-05-21 02:39:09 -0700502 return;
503}