]>
Commit | Line | Data |
---|---|---|
af3feefa JH |
1 | #include "cache.h" |
2 | #include "commit.h" | |
8e440259 | 3 | #include "blob.h" |
af3feefa JH |
4 | #include "diff.h" |
5 | #include "diffcore.h" | |
6 | #include "quote.h" | |
d9ea73e0 | 7 | #include "xdiff-interface.h" |
91539833 | 8 | #include "log-tree.h" |
7dae8b21 | 9 | #include "refs.h" |
4d5f3471 | 10 | #include "userdiff.h" |
0041f09d | 11 | #include "sha1-array.h" |
af3feefa | 12 | |
ea726d02 | 13 | static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent) |
af3feefa JH |
14 | { |
15 | struct diff_queue_struct *q = &diff_queued_diff; | |
ea726d02 | 16 | struct combine_diff_path *p; |
af3feefa JH |
17 | int i; |
18 | ||
19 | if (!n) { | |
ea726d02 | 20 | struct combine_diff_path *list = NULL, **tail = &list; |
af3feefa JH |
21 | for (i = 0; i < q->nr; i++) { |
22 | int len; | |
23 | const char *path; | |
a976b0a5 | 24 | if (diff_unmodified_pair(q->queue[i])) |
af3feefa JH |
25 | continue; |
26 | path = q->queue[i]->two->path; | |
27 | len = strlen(path); | |
2454c962 | 28 | p = xmalloc(combine_diff_path_size(num_parent, len)); |
4b25d091 | 29 | p->path = (char *) &(p->parent[num_parent]); |
af3feefa JH |
30 | memcpy(p->path, path, len); |
31 | p->path[len] = 0; | |
32 | p->len = len; | |
33 | p->next = NULL; | |
2454c962 JH |
34 | memset(p->parent, 0, |
35 | sizeof(p->parent[0]) * num_parent); | |
36 | ||
e702496e | 37 | hashcpy(p->sha1, q->queue[i]->two->sha1); |
2454c962 | 38 | p->mode = q->queue[i]->two->mode; |
e702496e | 39 | hashcpy(p->parent[n].sha1, q->queue[i]->one->sha1); |
2454c962 | 40 | p->parent[n].mode = q->queue[i]->one->mode; |
d416df88 | 41 | p->parent[n].status = q->queue[i]->status; |
5290a0f8 JH |
42 | *tail = p; |
43 | tail = &p->next; | |
af3feefa JH |
44 | } |
45 | return list; | |
46 | } | |
47 | ||
48 | for (p = curr; p; p = p->next) { | |
49 | int found = 0; | |
50 | if (!p->len) | |
51 | continue; | |
52 | for (i = 0; i < q->nr; i++) { | |
53 | const char *path; | |
54 | int len; | |
55 | ||
a976b0a5 | 56 | if (diff_unmodified_pair(q->queue[i])) |
af3feefa JH |
57 | continue; |
58 | path = q->queue[i]->two->path; | |
59 | len = strlen(path); | |
60 | if (len == p->len && !memcmp(path, p->path, len)) { | |
61 | found = 1; | |
e702496e | 62 | hashcpy(p->parent[n].sha1, q->queue[i]->one->sha1); |
2454c962 | 63 | p->parent[n].mode = q->queue[i]->one->mode; |
d416df88 | 64 | p->parent[n].status = q->queue[i]->status; |
af3feefa JH |
65 | break; |
66 | } | |
67 | } | |
68 | if (!found) | |
69 | p->len = 0; | |
70 | } | |
71 | return curr; | |
72 | } | |
73 | ||
b469d8b6 | 74 | /* Lines lost from parent */ |
af3feefa JH |
75 | struct lline { |
76 | struct lline *next; | |
77 | int len; | |
78 | unsigned long parent_map; | |
79 | char line[FLEX_ARRAY]; | |
80 | }; | |
81 | ||
b469d8b6 | 82 | /* Lines surviving in the merge result */ |
af3feefa JH |
83 | struct sline { |
84 | struct lline *lost_head, **lost_tail; | |
55d5d5ba | 85 | struct lline *next_lost; |
af3feefa JH |
86 | char *bol; |
87 | int len; | |
46dc9412 JH |
88 | /* bit 0 up to (N-1) are on if the parent has this line (i.e. |
89 | * we did not change it). | |
b469d8b6 | 90 | * bit N is used for "interesting" lines, including context. |
c86fbe53 | 91 | * bit (N+1) is used for "do not show deletion before this". |
b469d8b6 | 92 | */ |
af3feefa | 93 | unsigned long flag; |
f16706cc | 94 | unsigned long *p_lno; |
af3feefa JH |
95 | }; |
96 | ||
0508fe53 JK |
97 | static char *grab_blob(const unsigned char *sha1, unsigned int mode, |
98 | unsigned long *size, struct userdiff_driver *textconv, | |
99 | const char *path) | |
af3feefa JH |
100 | { |
101 | char *blob; | |
21666f1a | 102 | enum object_type type; |
7dae8b21 JH |
103 | |
104 | if (S_ISGITLINK(mode)) { | |
105 | blob = xmalloc(100); | |
106 | *size = snprintf(blob, 100, | |
107 | "Subproject commit %s\n", sha1_to_hex(sha1)); | |
108 | } else if (is_null_sha1(sha1)) { | |
af3feefa JH |
109 | /* deleted blob */ |
110 | *size = 0; | |
111 | return xcalloc(1, 1); | |
0508fe53 JK |
112 | } else if (textconv) { |
113 | struct diff_filespec *df = alloc_filespec(path); | |
114 | fill_filespec(df, sha1, mode); | |
115 | *size = fill_textconv(textconv, df, &blob); | |
116 | free_filespec(df); | |
7dae8b21 JH |
117 | } else { |
118 | blob = read_sha1_file(sha1, &type, size); | |
119 | if (type != OBJ_BLOB) | |
120 | die("object '%s' is not a blob!", sha1_to_hex(sha1)); | |
af3feefa | 121 | } |
af3feefa JH |
122 | return blob; |
123 | } | |
124 | ||
f23fc773 | 125 | static void append_lost(struct sline *sline, int n, const char *line, int len) |
af3feefa JH |
126 | { |
127 | struct lline *lline; | |
af3feefa JH |
128 | unsigned long this_mask = (1UL<<n); |
129 | if (line[len-1] == '\n') | |
130 | len--; | |
131 | ||
132 | /* Check to see if we can squash things */ | |
133 | if (sline->lost_head) { | |
55d5d5ba | 134 | lline = sline->next_lost; |
af3feefa JH |
135 | while (lline) { |
136 | if (lline->len == len && | |
137 | !memcmp(lline->line, line, len)) { | |
138 | lline->parent_map |= this_mask; | |
55d5d5ba | 139 | sline->next_lost = lline->next; |
af3feefa JH |
140 | return; |
141 | } | |
142 | lline = lline->next; | |
143 | } | |
144 | } | |
145 | ||
146 | lline = xmalloc(sizeof(*lline) + len + 1); | |
147 | lline->len = len; | |
148 | lline->next = NULL; | |
149 | lline->parent_map = this_mask; | |
150 | memcpy(lline->line, line, len); | |
151 | lline->line[len] = 0; | |
5290a0f8 | 152 | *sline->lost_tail = lline; |
af3feefa | 153 | sline->lost_tail = &lline->next; |
55d5d5ba | 154 | sline->next_lost = NULL; |
af3feefa JH |
155 | } |
156 | ||
f23fc773 | 157 | struct combine_diff_state { |
a0fd3146 JH |
158 | unsigned int lno; |
159 | int ob, on, nb, nn; | |
f23fc773 JH |
160 | unsigned long nmask; |
161 | int num_parent; | |
162 | int n; | |
163 | struct sline *sline; | |
164 | struct sline *lost_bucket; | |
165 | }; | |
166 | ||
d9ea73e0 | 167 | static void consume_line(void *state_, char *line, unsigned long len) |
f23fc773 | 168 | { |
d9ea73e0 | 169 | struct combine_diff_state *state = state_; |
f23fc773 JH |
170 | if (5 < len && !memcmp("@@ -", line, 4)) { |
171 | if (parse_hunk_header(line, len, | |
172 | &state->ob, &state->on, | |
173 | &state->nb, &state->nn)) | |
174 | return; | |
175 | state->lno = state->nb; | |
b810cbbd | 176 | if (state->nn == 0) { |
f23fc773 JH |
177 | /* @@ -X,Y +N,0 @@ removed Y lines |
178 | * that would have come *after* line N | |
179 | * in the result. Our lost buckets hang | |
180 | * to the line after the removed lines, | |
b810cbbd JH |
181 | * |
182 | * Note that this is correct even when N == 0, | |
183 | * in which case the hunk removes the first | |
184 | * line in the file. | |
f23fc773 JH |
185 | */ |
186 | state->lost_bucket = &state->sline[state->nb]; | |
b810cbbd JH |
187 | if (!state->nb) |
188 | state->nb = 1; | |
189 | } else { | |
f23fc773 | 190 | state->lost_bucket = &state->sline[state->nb-1]; |
b810cbbd | 191 | } |
f23fc773 JH |
192 | if (!state->sline[state->nb-1].p_lno) |
193 | state->sline[state->nb-1].p_lno = | |
194 | xcalloc(state->num_parent, | |
195 | sizeof(unsigned long)); | |
196 | state->sline[state->nb-1].p_lno[state->n] = state->ob; | |
55d5d5ba | 197 | state->lost_bucket->next_lost = state->lost_bucket->lost_head; |
f23fc773 JH |
198 | return; |
199 | } | |
200 | if (!state->lost_bucket) | |
201 | return; /* not in any hunk yet */ | |
202 | switch (line[0]) { | |
203 | case '-': | |
204 | append_lost(state->lost_bucket, state->n, line+1, len-1); | |
205 | break; | |
206 | case '+': | |
207 | state->sline[state->lno-1].flag |= state->nmask; | |
208 | state->lno++; | |
209 | break; | |
210 | } | |
211 | } | |
212 | ||
7dae8b21 JH |
213 | static void combine_diff(const unsigned char *parent, unsigned int mode, |
214 | mmfile_t *result_file, | |
2386c297 | 215 | struct sline *sline, unsigned int cnt, int n, |
0508fe53 JK |
216 | int num_parent, int result_deleted, |
217 | struct userdiff_driver *textconv, | |
218 | const char *path) | |
af3feefa | 219 | { |
f23fc773 | 220 | unsigned int p_lno, lno; |
f16706cc | 221 | unsigned long nmask = (1UL << n); |
f23fc773 JH |
222 | xpparam_t xpp; |
223 | xdemitconf_t xecfg; | |
224 | mmfile_t parent_file; | |
f23fc773 JH |
225 | struct combine_diff_state state; |
226 | unsigned long sz; | |
af3feefa | 227 | |
21798708 | 228 | if (result_deleted) |
4462731e JH |
229 | return; /* result deleted */ |
230 | ||
0508fe53 | 231 | parent_file.ptr = grab_blob(parent, mode, &sz, textconv, path); |
f23fc773 | 232 | parent_file.size = sz; |
9ccd0a88 | 233 | memset(&xpp, 0, sizeof(xpp)); |
582aa00b | 234 | xpp.flags = 0; |
30b25010 | 235 | memset(&xecfg, 0, sizeof(xecfg)); |
f23fc773 JH |
236 | memset(&state, 0, sizeof(state)); |
237 | state.nmask = nmask; | |
238 | state.sline = sline; | |
239 | state.lno = 1; | |
240 | state.num_parent = num_parent; | |
241 | state.n = n; | |
242 | ||
8a3f524b | 243 | xdi_diff_outf(&parent_file, result_file, consume_line, &state, |
dfea7900 | 244 | &xpp, &xecfg); |
f23fc773 | 245 | free(parent_file.ptr); |
f16706cc JH |
246 | |
247 | /* Assign line numbers for this parent. | |
248 | * | |
249 | * sline[lno].p_lno[n] records the first line number | |
250 | * (counting from 1) for parent N if the final hunk display | |
251 | * started by showing sline[lno] (possibly showing the lost | |
252 | * lines attached to it first). | |
253 | */ | |
8a470ebf | 254 | for (lno = 0, p_lno = 1; lno <= cnt; lno++) { |
f16706cc JH |
255 | struct lline *ll; |
256 | sline[lno].p_lno[n] = p_lno; | |
257 | ||
258 | /* How many lines would this sline advance the p_lno? */ | |
259 | ll = sline[lno].lost_head; | |
260 | while (ll) { | |
261 | if (ll->parent_map & nmask) | |
262 | p_lno++; /* '-' means parent had it */ | |
263 | ll = ll->next; | |
264 | } | |
8a470ebf | 265 | if (lno < cnt && !(sline[lno].flag & nmask)) |
f16706cc JH |
266 | p_lno++; /* no '+' means parent had it */ |
267 | } | |
268 | sline[lno].p_lno[n] = p_lno; /* trailer */ | |
af3feefa JH |
269 | } |
270 | ||
271 | static unsigned long context = 3; | |
272 | static char combine_marker = '@'; | |
273 | ||
274 | static int interesting(struct sline *sline, unsigned long all_mask) | |
275 | { | |
46dc9412 JH |
276 | /* If some parents lost lines here, or if we have added to |
277 | * some parent, it is interesting. | |
278 | */ | |
279 | return ((sline->flag & all_mask) || sline->lost_head); | |
af3feefa JH |
280 | } |
281 | ||
3ec1909f JH |
282 | static unsigned long adjust_hunk_tail(struct sline *sline, |
283 | unsigned long all_mask, | |
284 | unsigned long hunk_begin, | |
285 | unsigned long i) | |
286 | { | |
46dc9412 JH |
287 | /* i points at the first uninteresting line. If the last line |
288 | * of the hunk was interesting only because it has some | |
289 | * deletion, then it is not all that interesting for the | |
290 | * purpose of giving trailing context lines. This is because | |
291 | * we output '-' line and then unmodified sline[i-1] itself in | |
292 | * that case which gives us one extra context line. | |
3ec1909f | 293 | */ |
46dc9412 | 294 | if ((hunk_begin + 1 <= i) && !(sline[i-1].flag & all_mask)) |
3ec1909f JH |
295 | i--; |
296 | return i; | |
297 | } | |
298 | ||
46dc9412 JH |
299 | static unsigned long find_next(struct sline *sline, |
300 | unsigned long mark, | |
301 | unsigned long i, | |
302 | unsigned long cnt, | |
2386c297 | 303 | int look_for_uninteresting) |
3ec1909f | 304 | { |
46dc9412 JH |
305 | /* We have examined up to i-1 and are about to look at i. |
306 | * Find next interesting or uninteresting line. Here, | |
307 | * "interesting" does not mean interesting(), but marked by | |
308 | * the give_context() function below (i.e. it includes context | |
309 | * lines that are not interesting to interesting() function | |
310 | * that are surrounded by interesting() ones. | |
311 | */ | |
74065951 | 312 | while (i <= cnt) |
2386c297 | 313 | if (look_for_uninteresting |
46dc9412 JH |
314 | ? !(sline[i].flag & mark) |
315 | : (sline[i].flag & mark)) | |
3ec1909f JH |
316 | return i; |
317 | else | |
318 | i++; | |
74065951 | 319 | return i; |
3ec1909f JH |
320 | } |
321 | ||
322 | static int give_context(struct sline *sline, unsigned long cnt, int num_parent) | |
af3feefa JH |
323 | { |
324 | unsigned long all_mask = (1UL<<num_parent) - 1; | |
325 | unsigned long mark = (1UL<<num_parent); | |
c86fbe53 | 326 | unsigned long no_pre_delete = (2UL<<num_parent); |
af3feefa JH |
327 | unsigned long i; |
328 | ||
46dc9412 | 329 | /* Two groups of interesting lines may have a short gap of |
82e5a82f | 330 | * uninteresting lines. Connect such groups to give them a |
46dc9412 JH |
331 | * bit of context. |
332 | * | |
333 | * We first start from what the interesting() function says, | |
334 | * and mark them with "mark", and paint context lines with the | |
335 | * mark. So interesting() would still say false for such context | |
336 | * lines but they are treated as "interesting" in the end. | |
337 | */ | |
338 | i = find_next(sline, mark, 0, cnt, 0); | |
74065951 | 339 | if (cnt < i) |
3ec1909f JH |
340 | return 0; |
341 | ||
74065951 | 342 | while (i <= cnt) { |
3ec1909f JH |
343 | unsigned long j = (context < i) ? (i - context) : 0; |
344 | unsigned long k; | |
46dc9412 JH |
345 | |
346 | /* Paint a few lines before the first interesting line. */ | |
3ec1909f | 347 | while (j < i) |
c86fbe53 | 348 | sline[j++].flag |= mark | no_pre_delete; |
3ec1909f JH |
349 | |
350 | again: | |
46dc9412 JH |
351 | /* we know up to i is to be included. where does the |
352 | * next uninteresting one start? | |
353 | */ | |
354 | j = find_next(sline, mark, i, cnt, 1); | |
74065951 | 355 | if (cnt < j) |
3ec1909f JH |
356 | break; /* the rest are all interesting */ |
357 | ||
358 | /* lookahead context lines */ | |
46dc9412 | 359 | k = find_next(sline, mark, j, cnt, 0); |
3ec1909f JH |
360 | j = adjust_hunk_tail(sline, all_mask, i, j); |
361 | ||
362 | if (k < j + context) { | |
363 | /* k is interesting and [j,k) are not, but | |
364 | * paint them interesting because the gap is small. | |
365 | */ | |
366 | while (j < k) | |
af3feefa | 367 | sline[j++].flag |= mark; |
3ec1909f JH |
368 | i = k; |
369 | goto again; | |
af3feefa | 370 | } |
3ec1909f JH |
371 | |
372 | /* j is the first uninteresting line and there is | |
46dc9412 JH |
373 | * no overlap beyond it within context lines. Paint |
374 | * the trailing edge a bit. | |
3ec1909f JH |
375 | */ |
376 | i = k; | |
74065951 | 377 | k = (j + context < cnt+1) ? j + context : cnt+1; |
3ec1909f JH |
378 | while (j < k) |
379 | sline[j++].flag |= mark; | |
380 | } | |
381 | return 1; | |
382 | } | |
383 | ||
384 | static int make_hunks(struct sline *sline, unsigned long cnt, | |
385 | int num_parent, int dense) | |
386 | { | |
387 | unsigned long all_mask = (1UL<<num_parent) - 1; | |
388 | unsigned long mark = (1UL<<num_parent); | |
389 | unsigned long i; | |
390 | int has_interesting = 0; | |
391 | ||
74065951 | 392 | for (i = 0; i <= cnt; i++) { |
3ec1909f JH |
393 | if (interesting(&sline[i], all_mask)) |
394 | sline[i].flag |= mark; | |
395 | else | |
396 | sline[i].flag &= ~mark; | |
af3feefa | 397 | } |
d8f4790e | 398 | if (!dense) |
3ec1909f | 399 | return give_context(sline, cnt, num_parent); |
d8f4790e | 400 | |
263eee29 JH |
401 | /* Look at each hunk, and if we have changes from only one |
402 | * parent, or the changes are the same from all but one | |
403 | * parent, mark that uninteresting. | |
d8f4790e JH |
404 | */ |
405 | i = 0; | |
74065951 | 406 | while (i <= cnt) { |
3ec1909f | 407 | unsigned long j, hunk_begin, hunk_end; |
bf1c32bd | 408 | unsigned long same_diff; |
74065951 | 409 | while (i <= cnt && !(sline[i].flag & mark)) |
d8f4790e | 410 | i++; |
74065951 | 411 | if (cnt < i) |
d8f4790e | 412 | break; /* No more interesting hunks */ |
3ec1909f | 413 | hunk_begin = i; |
74065951 | 414 | for (j = i + 1; j <= cnt; j++) { |
3ec1909f JH |
415 | if (!(sline[j].flag & mark)) { |
416 | /* Look beyond the end to see if there | |
417 | * is an interesting line after this | |
418 | * hunk within context span. | |
419 | */ | |
420 | unsigned long la; /* lookahead */ | |
421 | int contin = 0; | |
422 | la = adjust_hunk_tail(sline, all_mask, | |
423 | hunk_begin, j); | |
74065951 JH |
424 | la = (la + context < cnt + 1) ? |
425 | (la + context) : cnt + 1; | |
3ec1909f JH |
426 | while (j <= --la) { |
427 | if (sline[la].flag & mark) { | |
428 | contin = 1; | |
429 | break; | |
430 | } | |
431 | } | |
432 | if (!contin) | |
433 | break; | |
434 | j = la; | |
435 | } | |
436 | } | |
437 | hunk_end = j; | |
438 | ||
bf1c32bd | 439 | /* [i..hunk_end) are interesting. Now is it really |
fd4b1d21 JH |
440 | * interesting? We check if there are only two versions |
441 | * and the result matches one of them. That is, we look | |
442 | * at: | |
443 | * (+) line, which records lines added to which parents; | |
444 | * this line appears in the result. | |
445 | * (-) line, which records from what parents the line | |
446 | * was removed; this line does not appear in the result. | |
447 | * then check the set of parents the result has difference | |
448 | * from, from all lines. If there are lines that has | |
449 | * different set of parents that the result has differences | |
450 | * from, that means we have more than two versions. | |
451 | * | |
452 | * Even when we have only two versions, if the result does | |
453 | * not match any of the parents, the it should be considered | |
454 | * interesting. In such a case, we would have all '+' line. | |
455 | * After passing the above "two versions" test, that would | |
456 | * appear as "the same set of parents" to be "all parents". | |
d8f4790e | 457 | */ |
bf1c32bd JH |
458 | same_diff = 0; |
459 | has_interesting = 0; | |
460 | for (j = i; j < hunk_end && !has_interesting; j++) { | |
46dc9412 | 461 | unsigned long this_diff = sline[j].flag & all_mask; |
bf1c32bd JH |
462 | struct lline *ll = sline[j].lost_head; |
463 | if (this_diff) { | |
464 | /* This has some changes. Is it the | |
465 | * same as others? | |
466 | */ | |
467 | if (!same_diff) | |
468 | same_diff = this_diff; | |
469 | else if (same_diff != this_diff) { | |
470 | has_interesting = 1; | |
471 | break; | |
472 | } | |
473 | } | |
474 | while (ll && !has_interesting) { | |
475 | /* Lost this line from these parents; | |
476 | * who are they? Are they the same? | |
477 | */ | |
478 | this_diff = ll->parent_map; | |
479 | if (!same_diff) | |
480 | same_diff = this_diff; | |
481 | else if (same_diff != this_diff) { | |
482 | has_interesting = 1; | |
483 | } | |
484 | ll = ll->next; | |
485 | } | |
d8f4790e | 486 | } |
bf1c32bd | 487 | |
fd4b1d21 | 488 | if (!has_interesting && same_diff != all_mask) { |
d8f4790e | 489 | /* This hunk is not that interesting after all */ |
3ec1909f | 490 | for (j = hunk_begin; j < hunk_end; j++) |
d8f4790e JH |
491 | sline[j].flag &= ~mark; |
492 | } | |
493 | i = hunk_end; | |
494 | } | |
3ec1909f JH |
495 | |
496 | has_interesting = give_context(sline, cnt, num_parent); | |
8828cdcb | 497 | return has_interesting; |
af3feefa JH |
498 | } |
499 | ||
3b0f5e88 | 500 | static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long l1, int n, unsigned long null_context) |
f16706cc JH |
501 | { |
502 | l0 = sline[l0].p_lno[n]; | |
503 | l1 = sline[l1].p_lno[n]; | |
3b0f5e88 | 504 | printf(" -%lu,%lu", l0, l1-l0-null_context); |
f16706cc JH |
505 | } |
506 | ||
d5f6a01a JH |
507 | static int hunk_comment_line(const char *bol) |
508 | { | |
7a8ac59f JH |
509 | int ch; |
510 | ||
511 | if (!bol) | |
512 | return 0; | |
513 | ch = *bol & 0xff; | |
d5f6a01a JH |
514 | return (isalpha(ch) || ch == '_' || ch == '$'); |
515 | } | |
516 | ||
39280970 JH |
517 | static void show_line_to_eol(const char *line, int len, const char *reset) |
518 | { | |
519 | int saw_cr_at_eol = 0; | |
520 | if (len < 0) | |
521 | len = strlen(line); | |
522 | saw_cr_at_eol = (len && line[len-1] == '\r'); | |
523 | ||
524 | printf("%.*s%s%s\n", len - saw_cr_at_eol, line, | |
525 | reset, | |
526 | saw_cr_at_eol ? "\r" : ""); | |
527 | } | |
528 | ||
567a03d1 | 529 | static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent, |
21798708 | 530 | int use_color, int result_deleted) |
af3feefa JH |
531 | { |
532 | unsigned long mark = (1UL<<num_parent); | |
c86fbe53 | 533 | unsigned long no_pre_delete = (2UL<<num_parent); |
af3feefa | 534 | int i; |
f16706cc | 535 | unsigned long lno = 0; |
567a03d1 | 536 | const char *c_frag = diff_get_color(use_color, DIFF_FRAGINFO); |
89cb73a1 | 537 | const char *c_func = diff_get_color(use_color, DIFF_FUNCINFO); |
567a03d1 JH |
538 | const char *c_new = diff_get_color(use_color, DIFF_FILE_NEW); |
539 | const char *c_old = diff_get_color(use_color, DIFF_FILE_OLD); | |
540 | const char *c_plain = diff_get_color(use_color, DIFF_PLAIN); | |
541 | const char *c_reset = diff_get_color(use_color, DIFF_RESET); | |
af3feefa | 542 | |
21798708 | 543 | if (result_deleted) |
4462731e JH |
544 | return; /* result deleted */ |
545 | ||
af3feefa | 546 | while (1) { |
8bc7574b JH |
547 | unsigned long hunk_end; |
548 | unsigned long rlines; | |
d5f6a01a | 549 | const char *hunk_comment = NULL; |
3b0f5e88 | 550 | unsigned long null_context = 0; |
d5f6a01a JH |
551 | |
552 | while (lno <= cnt && !(sline[lno].flag & mark)) { | |
553 | if (hunk_comment_line(sline[lno].bol)) | |
554 | hunk_comment = sline[lno].bol; | |
af3feefa | 555 | lno++; |
d5f6a01a | 556 | } |
8a470ebf | 557 | if (cnt < lno) |
af3feefa | 558 | break; |
8a470ebf | 559 | else { |
74065951 | 560 | for (hunk_end = lno + 1; hunk_end <= cnt; hunk_end++) |
8a470ebf JH |
561 | if (!(sline[hunk_end].flag & mark)) |
562 | break; | |
563 | } | |
74065951 JH |
564 | rlines = hunk_end - lno; |
565 | if (cnt < hunk_end) | |
566 | rlines--; /* pointing at the last delete hunk */ | |
3b0f5e88 JH |
567 | |
568 | if (!context) { | |
569 | /* | |
570 | * Even when running with --unified=0, all | |
571 | * lines in the hunk needs to be processed in | |
572 | * the loop below in order to show the | |
573 | * deletion recorded in lost_head. However, | |
574 | * we do not want to show the resulting line | |
575 | * with all blank context markers in such a | |
576 | * case. Compensate. | |
577 | */ | |
578 | unsigned long j; | |
579 | for (j = lno; j < hunk_end; j++) | |
580 | if (!(sline[j].flag & (mark-1))) | |
581 | null_context++; | |
582 | rlines -= null_context; | |
583 | } | |
584 | ||
567a03d1 | 585 | fputs(c_frag, stdout); |
af3feefa | 586 | for (i = 0; i <= num_parent; i++) putchar(combine_marker); |
f16706cc | 587 | for (i = 0; i < num_parent; i++) |
3b0f5e88 | 588 | show_parent_lno(sline, lno, hunk_end, i, null_context); |
74065951 | 589 | printf(" +%lu,%lu ", lno+1, rlines); |
af3feefa | 590 | for (i = 0; i <= num_parent; i++) putchar(combine_marker); |
d5f6a01a JH |
591 | |
592 | if (hunk_comment) { | |
593 | int comment_end = 0; | |
594 | for (i = 0; i < 40; i++) { | |
595 | int ch = hunk_comment[i] & 0xff; | |
596 | if (!ch || ch == '\n') | |
597 | break; | |
598 | if (!isspace(ch)) | |
599 | comment_end = i; | |
600 | } | |
601 | if (comment_end) | |
89cb73a1 BW |
602 | printf("%s%s %s%s", c_reset, |
603 | c_plain, c_reset, | |
604 | c_func); | |
d5f6a01a JH |
605 | for (i = 0; i < comment_end; i++) |
606 | putchar(hunk_comment[i]); | |
607 | } | |
608 | ||
567a03d1 | 609 | printf("%s\n", c_reset); |
af3feefa JH |
610 | while (lno < hunk_end) { |
611 | struct lline *ll; | |
612 | int j; | |
46dc9412 | 613 | unsigned long p_mask; |
fd13b21f | 614 | struct sline *sl = &sline[lno++]; |
c86fbe53 | 615 | ll = (sl->flag & no_pre_delete) ? NULL : sl->lost_head; |
af3feefa | 616 | while (ll) { |
567a03d1 | 617 | fputs(c_old, stdout); |
af3feefa JH |
618 | for (j = 0; j < num_parent; j++) { |
619 | if (ll->parent_map & (1UL<<j)) | |
620 | putchar('-'); | |
621 | else | |
622 | putchar(' '); | |
623 | } | |
39280970 | 624 | show_line_to_eol(ll->line, -1, c_reset); |
af3feefa JH |
625 | ll = ll->next; |
626 | } | |
74065951 | 627 | if (cnt < lno) |
8a470ebf | 628 | break; |
46dc9412 | 629 | p_mask = 1; |
3b0f5e88 JH |
630 | if (!(sl->flag & (mark-1))) { |
631 | /* | |
632 | * This sline was here to hang the | |
633 | * lost lines in front of it. | |
634 | */ | |
635 | if (!context) | |
636 | continue; | |
567a03d1 | 637 | fputs(c_plain, stdout); |
3b0f5e88 | 638 | } |
567a03d1 JH |
639 | else |
640 | fputs(c_new, stdout); | |
af3feefa | 641 | for (j = 0; j < num_parent; j++) { |
46dc9412 | 642 | if (p_mask & sl->flag) |
af3feefa | 643 | putchar('+'); |
46dc9412 JH |
644 | else |
645 | putchar(' '); | |
646 | p_mask <<= 1; | |
af3feefa | 647 | } |
39280970 | 648 | show_line_to_eol(sl->bol, sl->len, c_reset); |
af3feefa JH |
649 | } |
650 | } | |
651 | } | |
652 | ||
3c39e9bd JH |
653 | static void reuse_combine_diff(struct sline *sline, unsigned long cnt, |
654 | int i, int j) | |
655 | { | |
656 | /* We have already examined parent j and we know parent i | |
657 | * and parent j are the same, so reuse the combined result | |
658 | * of parent j for parent i. | |
659 | */ | |
660 | unsigned long lno, imask, jmask; | |
661 | imask = (1UL<<i); | |
662 | jmask = (1UL<<j); | |
663 | ||
8a470ebf | 664 | for (lno = 0; lno <= cnt; lno++) { |
3c39e9bd | 665 | struct lline *ll = sline->lost_head; |
f16706cc | 666 | sline->p_lno[i] = sline->p_lno[j]; |
3c39e9bd JH |
667 | while (ll) { |
668 | if (ll->parent_map & jmask) | |
669 | ll->parent_map |= imask; | |
670 | ll = ll->next; | |
671 | } | |
46dc9412 JH |
672 | if (sline->flag & jmask) |
673 | sline->flag |= imask; | |
3c39e9bd JH |
674 | sline++; |
675 | } | |
4462731e JH |
676 | /* the overall size of the file (sline[cnt]) */ |
677 | sline->p_lno[i] = sline->p_lno[j]; | |
3c39e9bd JH |
678 | } |
679 | ||
462a15bc JH |
680 | static void dump_quoted_path(const char *head, |
681 | const char *prefix, | |
682 | const char *path, | |
567a03d1 | 683 | const char *c_meta, const char *c_reset) |
eab144ac | 684 | { |
462a15bc JH |
685 | static struct strbuf buf = STRBUF_INIT; |
686 | ||
687 | strbuf_reset(&buf); | |
688 | strbuf_addstr(&buf, c_meta); | |
689 | strbuf_addstr(&buf, head); | |
d5625091 | 690 | quote_two_c_style(&buf, prefix, path, 0); |
462a15bc JH |
691 | strbuf_addstr(&buf, c_reset); |
692 | puts(buf.buf); | |
eab144ac LT |
693 | } |
694 | ||
7c978a06 JK |
695 | static void show_combined_header(struct combine_diff_path *elem, |
696 | int num_parent, | |
697 | int dense, | |
698 | struct rev_info *rev, | |
4d5f3471 JK |
699 | int mode_differs, |
700 | int show_file_header) | |
7c978a06 JK |
701 | { |
702 | struct diff_options *opt = &rev->diffopt; | |
703 | int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV; | |
704 | const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/"; | |
705 | const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/"; | |
f1c96261 JK |
706 | const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO); |
707 | const char *c_reset = diff_get_color_opt(opt, DIFF_RESET); | |
7c978a06 JK |
708 | const char *abb; |
709 | int added = 0; | |
710 | int deleted = 0; | |
711 | int i; | |
712 | ||
713 | if (rev->loginfo && !rev->no_commit_id) | |
714 | show_log(rev); | |
715 | ||
716 | dump_quoted_path(dense ? "diff --cc " : "diff --combined ", | |
717 | "", elem->path, c_meta, c_reset); | |
718 | printf("%sindex ", c_meta); | |
719 | for (i = 0; i < num_parent; i++) { | |
720 | abb = find_unique_abbrev(elem->parent[i].sha1, | |
721 | abbrev); | |
722 | printf("%s%s", i ? "," : "", abb); | |
723 | } | |
724 | abb = find_unique_abbrev(elem->sha1, abbrev); | |
725 | printf("..%s%s\n", abb, c_reset); | |
726 | ||
727 | if (mode_differs) { | |
728 | deleted = !elem->mode; | |
729 | ||
730 | /* We say it was added if nobody had it */ | |
731 | added = !deleted; | |
732 | for (i = 0; added && i < num_parent; i++) | |
733 | if (elem->parent[i].status != | |
734 | DIFF_STATUS_ADDED) | |
735 | added = 0; | |
736 | if (added) | |
737 | printf("%snew file mode %06o", | |
738 | c_meta, elem->mode); | |
739 | else { | |
740 | if (deleted) | |
741 | printf("%sdeleted file ", c_meta); | |
742 | printf("mode "); | |
743 | for (i = 0; i < num_parent; i++) { | |
744 | printf("%s%06o", i ? "," : "", | |
745 | elem->parent[i].mode); | |
746 | } | |
747 | if (elem->mode) | |
748 | printf("..%06o", elem->mode); | |
749 | } | |
750 | printf("%s\n", c_reset); | |
751 | } | |
752 | ||
4d5f3471 JK |
753 | if (!show_file_header) |
754 | return; | |
755 | ||
7c978a06 JK |
756 | if (added) |
757 | dump_quoted_path("--- ", "", "/dev/null", | |
758 | c_meta, c_reset); | |
759 | else | |
760 | dump_quoted_path("--- ", a_prefix, elem->path, | |
761 | c_meta, c_reset); | |
762 | if (deleted) | |
763 | dump_quoted_path("+++ ", "", "/dev/null", | |
764 | c_meta, c_reset); | |
765 | else | |
766 | dump_quoted_path("+++ ", b_prefix, elem->path, | |
767 | c_meta, c_reset); | |
768 | } | |
769 | ||
89b0c4b5 | 770 | static void show_patch_diff(struct combine_diff_path *elem, int num_parent, |
99694544 JH |
771 | int dense, int working_tree_file, |
772 | struct rev_info *rev) | |
af3feefa | 773 | { |
91539833 | 774 | struct diff_options *opt = &rev->diffopt; |
f23fc773 | 775 | unsigned long result_size, cnt, lno; |
21798708 | 776 | int result_deleted = 0; |
310f8b5b | 777 | char *result, *cp; |
af3feefa | 778 | struct sline *sline; /* survived lines */ |
2454c962 | 779 | int mode_differs = 0; |
89b0c4b5 | 780 | int i, show_hunks; |
f23fc773 | 781 | mmfile_t result_file; |
4d5f3471 | 782 | struct userdiff_driver *userdiff; |
0508fe53 | 783 | struct userdiff_driver *textconv = NULL; |
4d5f3471 | 784 | int is_binary; |
af3feefa | 785 | |
ee1e5412 | 786 | context = opt->context; |
4d5f3471 JK |
787 | userdiff = userdiff_find_by_path(elem->path); |
788 | if (!userdiff) | |
789 | userdiff = userdiff_find_by_name("default"); | |
0508fe53 JK |
790 | if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV)) |
791 | textconv = userdiff_get_textconv(userdiff); | |
a5a818ee | 792 | |
af3feefa | 793 | /* Read the result of merge first */ |
f23fc773 | 794 | if (!working_tree_file) |
0508fe53 JK |
795 | result = grab_blob(elem->sha1, elem->mode, &result_size, |
796 | textconv, elem->path); | |
ea726d02 | 797 | else { |
9843a1f6 | 798 | /* Used by diff-tree to read from the working tree */ |
ea726d02 | 799 | struct stat st; |
4fc970c4 JH |
800 | int fd = -1; |
801 | ||
802 | if (lstat(elem->path, &st) < 0) | |
803 | goto deleted_file; | |
804 | ||
805 | if (S_ISLNK(st.st_mode)) { | |
912342d9 JH |
806 | struct strbuf buf = STRBUF_INIT; |
807 | ||
808 | if (strbuf_readlink(&buf, elem->path, st.st_size) < 0) { | |
4fc970c4 JH |
809 | error("readlink(%s): %s", elem->path, |
810 | strerror(errno)); | |
811 | return; | |
812 | } | |
912342d9 JH |
813 | result_size = buf.len; |
814 | result = strbuf_detach(&buf, NULL); | |
4fc970c4 | 815 | elem->mode = canon_mode(st.st_mode); |
7dae8b21 JH |
816 | } else if (S_ISDIR(st.st_mode)) { |
817 | unsigned char sha1[20]; | |
818 | if (resolve_gitlink_ref(elem->path, "HEAD", sha1) < 0) | |
0508fe53 JK |
819 | result = grab_blob(elem->sha1, elem->mode, |
820 | &result_size, NULL, NULL); | |
7dae8b21 | 821 | else |
0508fe53 JK |
822 | result = grab_blob(sha1, elem->mode, |
823 | &result_size, NULL, NULL); | |
824 | } else if (textconv) { | |
825 | struct diff_filespec *df = alloc_filespec(elem->path); | |
826 | fill_filespec(df, null_sha1, st.st_mode); | |
827 | result_size = fill_textconv(textconv, df, &result); | |
828 | free_filespec(df); | |
91fcbcbd | 829 | } else if (0 <= (fd = open(elem->path, O_RDONLY))) { |
dc49cd76 | 830 | size_t len = xsize_t(st.st_size); |
c697ad14 | 831 | ssize_t done; |
a249a9b5 | 832 | int is_file, i; |
ea726d02 | 833 | |
1b0c7174 | 834 | elem->mode = canon_mode(st.st_mode); |
a249a9b5 JS |
835 | /* if symlinks don't work, assume symlink if all parents |
836 | * are symlinks | |
837 | */ | |
838 | is_file = has_symlinks; | |
839 | for (i = 0; !is_file && i < num_parent; i++) | |
840 | is_file = !S_ISLNK(elem->parent[i].mode); | |
841 | if (!is_file) | |
842 | elem->mode = canon_mode(S_IFLNK); | |
843 | ||
f23fc773 | 844 | result_size = len; |
ea726d02 | 845 | result = xmalloc(len + 1); |
c697ad14 HO |
846 | |
847 | done = read_in_full(fd, result, len); | |
848 | if (done < 0) | |
0721c314 | 849 | die_errno("read error '%s'", elem->path); |
c697ad14 HO |
850 | else if (done < len) |
851 | die("early EOF '%s'", elem->path); | |
852 | ||
ea726d02 | 853 | result[len] = 0; |
5e568f9e AG |
854 | |
855 | /* If not a fake symlink, apply filters, e.g. autocrlf */ | |
856 | if (is_file) { | |
f285a2d7 | 857 | struct strbuf buf = STRBUF_INIT; |
5e568f9e | 858 | |
5e568f9e AG |
859 | if (convert_to_git(elem->path, result, len, &buf, safe_crlf)) { |
860 | free(result); | |
861 | result = strbuf_detach(&buf, &len); | |
862 | result_size = len; | |
863 | } | |
864 | } | |
ea726d02 JH |
865 | } |
866 | else { | |
4fc970c4 | 867 | deleted_file: |
21798708 | 868 | result_deleted = 1; |
f23fc773 | 869 | result_size = 0; |
713a11fc | 870 | elem->mode = 0; |
28f75818 | 871 | result = xcalloc(1, 1); |
ea726d02 | 872 | } |
4fc970c4 | 873 | |
ea726d02 JH |
874 | if (0 <= fd) |
875 | close(fd); | |
876 | } | |
af3feefa | 877 | |
c95b99bb JK |
878 | for (i = 0; i < num_parent; i++) { |
879 | if (elem->parent[i].mode != elem->mode) { | |
880 | mode_differs = 1; | |
881 | break; | |
882 | } | |
883 | } | |
884 | ||
0508fe53 JK |
885 | if (textconv) |
886 | is_binary = 0; | |
887 | else if (userdiff->binary != -1) | |
4d5f3471 JK |
888 | is_binary = userdiff->binary; |
889 | else { | |
890 | is_binary = buffer_is_binary(result, result_size); | |
891 | for (i = 0; !is_binary && i < num_parent; i++) { | |
892 | char *buf; | |
893 | unsigned long size; | |
894 | buf = grab_blob(elem->parent[i].sha1, | |
895 | elem->parent[i].mode, | |
0508fe53 | 896 | &size, NULL, NULL); |
4d5f3471 JK |
897 | if (buffer_is_binary(buf, size)) |
898 | is_binary = 1; | |
899 | free(buf); | |
900 | } | |
901 | } | |
902 | if (is_binary) { | |
903 | show_combined_header(elem, num_parent, dense, rev, | |
904 | mode_differs, 0); | |
905 | printf("Binary files differ\n"); | |
906 | free(result); | |
907 | return; | |
908 | } | |
909 | ||
2386c297 | 910 | for (cnt = 0, cp = result; cp < result + result_size; cp++) { |
af3feefa JH |
911 | if (*cp == '\n') |
912 | cnt++; | |
913 | } | |
f23fc773 | 914 | if (result_size && result[result_size-1] != '\n') |
af3feefa JH |
915 | cnt++; /* incomplete line */ |
916 | ||
8a470ebf | 917 | sline = xcalloc(cnt+2, sizeof(*sline)); |
af3feefa | 918 | sline[0].bol = result; |
8a470ebf | 919 | for (lno = 0; lno <= cnt + 1; lno++) { |
4462731e JH |
920 | sline[lno].lost_tail = &sline[lno].lost_head; |
921 | sline[lno].flag = 0; | |
922 | } | |
2386c297 | 923 | for (lno = 0, cp = result; cp < result + result_size; cp++) { |
af3feefa JH |
924 | if (*cp == '\n') { |
925 | sline[lno].len = cp - sline[lno].bol; | |
af3feefa JH |
926 | lno++; |
927 | if (lno < cnt) | |
928 | sline[lno].bol = cp + 1; | |
929 | } | |
930 | } | |
f23fc773 JH |
931 | if (result_size && result[result_size-1] != '\n') |
932 | sline[cnt-1].len = result_size - (sline[cnt-1].bol - result); | |
933 | ||
934 | result_file.ptr = result; | |
935 | result_file.size = result_size; | |
af3feefa | 936 | |
8a470ebf JH |
937 | /* Even p_lno[cnt+1] is valid -- that is for the end line number |
938 | * for deletion hunk at the end. | |
939 | */ | |
940 | sline[0].p_lno = xcalloc((cnt+2) * num_parent, sizeof(unsigned long)); | |
941 | for (lno = 0; lno <= cnt; lno++) | |
f16706cc JH |
942 | sline[lno+1].p_lno = sline[lno].p_lno + num_parent; |
943 | ||
3c39e9bd JH |
944 | for (i = 0; i < num_parent; i++) { |
945 | int j; | |
946 | for (j = 0; j < i; j++) { | |
a89fccd2 DR |
947 | if (!hashcmp(elem->parent[i].sha1, |
948 | elem->parent[j].sha1)) { | |
3c39e9bd JH |
949 | reuse_combine_diff(sline, cnt, i, j); |
950 | break; | |
951 | } | |
952 | } | |
953 | if (i <= j) | |
7dae8b21 JH |
954 | combine_diff(elem->parent[i].sha1, |
955 | elem->parent[i].mode, | |
956 | &result_file, sline, | |
0508fe53 JK |
957 | cnt, i, num_parent, result_deleted, |
958 | textconv, elem->path); | |
3c39e9bd | 959 | } |
af3feefa | 960 | |
8828cdcb | 961 | show_hunks = make_hunks(sline, cnt, num_parent, dense); |
af3feefa | 962 | |
713a11fc | 963 | if (show_hunks || mode_differs || working_tree_file) { |
7c978a06 | 964 | show_combined_header(elem, num_parent, dense, rev, |
4d5f3471 | 965 | mode_differs, 1); |
462a15bc | 966 | dump_sline(sline, cnt, num_parent, |
f1c96261 | 967 | opt->use_color, result_deleted); |
8828cdcb | 968 | } |
af3feefa JH |
969 | free(result); |
970 | ||
2386c297 JH |
971 | for (lno = 0; lno < cnt; lno++) { |
972 | if (sline[lno].lost_head) { | |
973 | struct lline *ll = sline[lno].lost_head; | |
af3feefa JH |
974 | while (ll) { |
975 | struct lline *tmp = ll; | |
976 | ll = ll->next; | |
977 | free(tmp); | |
978 | } | |
979 | } | |
980 | } | |
46dc9412 | 981 | free(sline[0].p_lno); |
af3feefa JH |
982 | free(sline); |
983 | } | |
984 | ||
ee638024 LT |
985 | #define COLONS "::::::::::::::::::::::::::::::::" |
986 | ||
91539833 | 987 | static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct rev_info *rev) |
ee638024 | 988 | { |
91539833 | 989 | struct diff_options *opt = &rev->diffopt; |
310f8b5b | 990 | int i, offset; |
ee638024 LT |
991 | const char *prefix; |
992 | int line_termination, inter_name_termination; | |
993 | ||
994 | line_termination = opt->line_termination; | |
995 | inter_name_termination = '\t'; | |
996 | if (!line_termination) | |
997 | inter_name_termination = 0; | |
998 | ||
44152787 | 999 | if (rev->loginfo && !rev->no_commit_id) |
02865655 | 1000 | show_log(rev); |
ee638024 | 1001 | |
c6744349 | 1002 | if (opt->output_format & DIFF_FORMAT_RAW) { |
0a798076 JH |
1003 | offset = strlen(COLONS) - num_parent; |
1004 | if (offset < 0) | |
1005 | offset = 0; | |
1006 | prefix = COLONS + offset; | |
1007 | ||
1008 | /* Show the modes */ | |
1009 | for (i = 0; i < num_parent; i++) { | |
1010 | printf("%s%06o", prefix, p->parent[i].mode); | |
1011 | prefix = " "; | |
1012 | } | |
1013 | printf("%s%06o", prefix, p->mode); | |
1014 | ||
1015 | /* Show sha1's */ | |
1016 | for (i = 0; i < num_parent; i++) | |
1017 | printf(" %s", diff_unique_abbrev(p->parent[i].sha1, | |
1018 | opt->abbrev)); | |
1019 | printf(" %s ", diff_unique_abbrev(p->sha1, opt->abbrev)); | |
1020 | } | |
1021 | ||
c6744349 | 1022 | if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) { |
d416df88 JH |
1023 | for (i = 0; i < num_parent; i++) |
1024 | putchar(p->parent[i].status); | |
1025 | putchar(inter_name_termination); | |
1026 | } | |
0a798076 | 1027 | |
663af342 | 1028 | write_name_quoted(p->path, stdout, line_termination); |
0a798076 JH |
1029 | } |
1030 | ||
99694544 JH |
1031 | /* |
1032 | * The result (p->elem) is from the working tree and their | |
1033 | * parents are typically from multiple stages during a merge | |
1034 | * (i.e. diff-files) or the state in HEAD and in the index | |
1035 | * (i.e. diff-index). | |
1036 | */ | |
91539833 | 1037 | void show_combined_diff(struct combine_diff_path *p, |
0a798076 JH |
1038 | int num_parent, |
1039 | int dense, | |
91539833 | 1040 | struct rev_info *rev) |
0a798076 | 1041 | { |
91539833 | 1042 | struct diff_options *opt = &rev->diffopt; |
0a798076 | 1043 | if (!p->len) |
91539833 | 1044 | return; |
c6744349 TH |
1045 | if (opt->output_format & (DIFF_FORMAT_RAW | |
1046 | DIFF_FORMAT_NAME | | |
89b0c4b5 | 1047 | DIFF_FORMAT_NAME_STATUS)) |
91539833 | 1048 | show_raw_diff(p, num_parent, rev); |
89b0c4b5 | 1049 | else if (opt->output_format & DIFF_FORMAT_PATCH) |
99694544 | 1050 | show_patch_diff(p, num_parent, dense, 1, rev); |
ee638024 LT |
1051 | } |
1052 | ||
25e5e2bf JH |
1053 | static void free_combined_pair(struct diff_filepair *pair) |
1054 | { | |
1055 | free(pair->two); | |
1056 | free(pair); | |
1057 | } | |
1058 | ||
1059 | /* | |
1060 | * A combine_diff_path expresses N parents on the LHS against 1 merge | |
1061 | * result. Synthesize a diff_filepair that has N entries on the "one" | |
1062 | * side and 1 entry on the "two" side. | |
1063 | * | |
1064 | * In the future, we might want to add more data to combine_diff_path | |
1065 | * so that we can fill fields we are ignoring (most notably, size) here, | |
1066 | * but currently nobody uses it, so this should suffice for now. | |
1067 | */ | |
1068 | static struct diff_filepair *combined_pair(struct combine_diff_path *p, | |
1069 | int num_parent) | |
1070 | { | |
1071 | int i; | |
1072 | struct diff_filepair *pair; | |
1073 | struct diff_filespec *pool; | |
1074 | ||
1075 | pair = xmalloc(sizeof(*pair)); | |
1076 | pool = xcalloc(num_parent + 1, sizeof(struct diff_filespec)); | |
1077 | pair->one = pool + 1; | |
1078 | pair->two = pool; | |
1079 | ||
1080 | for (i = 0; i < num_parent; i++) { | |
1081 | pair->one[i].path = p->path; | |
1082 | pair->one[i].mode = p->parent[i].mode; | |
1083 | hashcpy(pair->one[i].sha1, p->parent[i].sha1); | |
1084 | pair->one[i].sha1_valid = !is_null_sha1(p->parent[i].sha1); | |
1085 | pair->one[i].has_more_entries = 1; | |
1086 | } | |
1087 | pair->one[num_parent - 1].has_more_entries = 0; | |
1088 | ||
1089 | pair->two->path = p->path; | |
1090 | pair->two->mode = p->mode; | |
1091 | hashcpy(pair->two->sha1, p->sha1); | |
1092 | pair->two->sha1_valid = !is_null_sha1(p->sha1); | |
1093 | return pair; | |
1094 | } | |
1095 | ||
1096 | static void handle_combined_callback(struct diff_options *opt, | |
1097 | struct combine_diff_path *paths, | |
1098 | int num_parent, | |
1099 | int num_paths) | |
1100 | { | |
1101 | struct combine_diff_path *p; | |
1102 | struct diff_queue_struct q; | |
1103 | int i; | |
1104 | ||
1105 | q.queue = xcalloc(num_paths, sizeof(struct diff_filepair *)); | |
1106 | q.alloc = num_paths; | |
1107 | q.nr = num_paths; | |
1108 | for (i = 0, p = paths; p; p = p->next) { | |
1109 | if (!p->len) | |
1110 | continue; | |
1111 | q.queue[i++] = combined_pair(p, num_parent); | |
1112 | } | |
1113 | opt->format_callback(&q, opt, opt->format_callback_data); | |
1114 | for (i = 0; i < num_paths; i++) | |
1115 | free_combined_pair(q.queue[i]); | |
1116 | free(q.queue); | |
1117 | } | |
1118 | ||
0fe7c1de | 1119 | void diff_tree_combined(const unsigned char *sha1, |
0041f09d | 1120 | const struct sha1_array *parents, |
0fe7c1de JH |
1121 | int dense, |
1122 | struct rev_info *rev) | |
af3feefa | 1123 | { |
91539833 | 1124 | struct diff_options *opt = &rev->diffopt; |
af3feefa | 1125 | struct diff_options diffopts; |
ea726d02 | 1126 | struct combine_diff_path *p, *paths = NULL; |
0041f09d | 1127 | int i, num_paths, needsep, show_log_first, num_parent = parents->nr; |
af3feefa | 1128 | |
5b236832 | 1129 | diffopts = *opt; |
3969cf7d | 1130 | diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; |
8f67f8ae PH |
1131 | DIFF_OPT_SET(&diffopts, RECURSIVE); |
1132 | DIFF_OPT_CLR(&diffopts, ALLOW_EXTERNAL); | |
af3feefa | 1133 | |
44152787 | 1134 | show_log_first = !!rev->loginfo && !rev->no_commit_id; |
3969cf7d | 1135 | needsep = 0; |
af3feefa | 1136 | /* find set of paths that everybody touches */ |
0fe7c1de | 1137 | for (i = 0; i < num_parent; i++) { |
965f803c JH |
1138 | /* show stat against the first parent even |
1139 | * when doing combined diff. | |
1140 | */ | |
74e2abe5 JH |
1141 | int stat_opt = (opt->output_format & |
1142 | (DIFF_FORMAT_NUMSTAT|DIFF_FORMAT_DIFFSTAT)); | |
1143 | if (i == 0 && stat_opt) | |
1144 | diffopts.output_format = stat_opt; | |
965f803c JH |
1145 | else |
1146 | diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
0041f09d | 1147 | diff_tree_sha1(parents->sha1[i], sha1, "", &diffopts); |
5b236832 | 1148 | diffcore_std(&diffopts); |
af3feefa | 1149 | paths = intersect_paths(paths, i, num_parent); |
eab144ac | 1150 | |
3969cf7d | 1151 | if (show_log_first && i == 0) { |
02865655 | 1152 | show_log(rev); |
3969cf7d JH |
1153 | if (rev->verbose_header && opt->output_format) |
1154 | putchar(opt->line_termination); | |
1155 | } | |
af3feefa JH |
1156 | diff_flush(&diffopts); |
1157 | } | |
1158 | ||
1159 | /* find out surviving paths */ | |
1160 | for (num_paths = 0, p = paths; p; p = p->next) { | |
1161 | if (p->len) | |
1162 | num_paths++; | |
1163 | } | |
e3c3a550 | 1164 | if (num_paths) { |
c6744349 TH |
1165 | if (opt->output_format & (DIFF_FORMAT_RAW | |
1166 | DIFF_FORMAT_NAME | | |
1167 | DIFF_FORMAT_NAME_STATUS)) { | |
86ff1d20 | 1168 | for (p = paths; p; p = p->next) { |
c6744349 TH |
1169 | if (p->len) |
1170 | show_raw_diff(p, num_parent, rev); | |
86ff1d20 | 1171 | } |
3969cf7d | 1172 | needsep = 1; |
86ff1d20 | 1173 | } |
74e2abe5 JH |
1174 | else if (opt->output_format & |
1175 | (DIFF_FORMAT_NUMSTAT|DIFF_FORMAT_DIFFSTAT)) | |
3969cf7d | 1176 | needsep = 1; |
25e5e2bf JH |
1177 | else if (opt->output_format & DIFF_FORMAT_CALLBACK) |
1178 | handle_combined_callback(opt, paths, num_parent, num_paths); | |
1179 | ||
c6744349 | 1180 | if (opt->output_format & DIFF_FORMAT_PATCH) { |
3969cf7d JH |
1181 | if (needsep) |
1182 | putchar(opt->line_termination); | |
c6744349 TH |
1183 | for (p = paths; p; p = p->next) { |
1184 | if (p->len) | |
1185 | show_patch_diff(p, num_parent, dense, | |
99694544 | 1186 | 0, rev); |
c6744349 | 1187 | } |
af3feefa JH |
1188 | } |
1189 | } | |
1190 | ||
1191 | /* Clean things up */ | |
1192 | while (paths) { | |
ea726d02 | 1193 | struct combine_diff_path *tmp = paths; |
af3feefa JH |
1194 | paths = paths->next; |
1195 | free(tmp); | |
1196 | } | |
af3feefa | 1197 | } |
0fe7c1de | 1198 | |
82889295 RS |
1199 | void diff_tree_combined_merge(const struct commit *commit, int dense, |
1200 | struct rev_info *rev) | |
0fe7c1de | 1201 | { |
0041f09d RS |
1202 | struct commit_list *parent = commit->parents; |
1203 | struct sha1_array parents = SHA1_ARRAY_INIT; | |
1204 | ||
1205 | while (parent) { | |
1206 | sha1_array_append(&parents, parent->item->object.sha1); | |
1207 | parent = parent->next; | |
1208 | } | |
82889295 | 1209 | diff_tree_combined(commit->object.sha1, &parents, dense, rev); |
0041f09d | 1210 | sha1_array_clear(&parents); |
0fe7c1de | 1211 | } |