]> git.ipfire.org Git - thirdparty/git.git/blame - combine-diff.c
combine-diff: a few more finishing touches.
[thirdparty/git.git] / combine-diff.c
CommitLineData
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"
af3feefa 9
ea726d02 10static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
af3feefa
JH
11{
12 struct diff_queue_struct *q = &diff_queued_diff;
ea726d02 13 struct combine_diff_path *p;
af3feefa
JH
14 int i;
15
16 if (!n) {
ea726d02 17 struct combine_diff_path *list = NULL, **tail = &list;
af3feefa
JH
18 for (i = 0; i < q->nr; i++) {
19 int len;
20 const char *path;
a976b0a5 21 if (diff_unmodified_pair(q->queue[i]))
af3feefa
JH
22 continue;
23 path = q->queue[i]->two->path;
24 len = strlen(path);
2454c962
JH
25 p = xmalloc(combine_diff_path_size(num_parent, len));
26 p->path = (char*) &(p->parent[num_parent]);
af3feefa
JH
27 memcpy(p->path, path, len);
28 p->path[len] = 0;
29 p->len = len;
30 p->next = NULL;
2454c962
JH
31 memset(p->parent, 0,
32 sizeof(p->parent[0]) * num_parent);
33
e702496e 34 hashcpy(p->sha1, q->queue[i]->two->sha1);
2454c962 35 p->mode = q->queue[i]->two->mode;
e702496e 36 hashcpy(p->parent[n].sha1, q->queue[i]->one->sha1);
2454c962 37 p->parent[n].mode = q->queue[i]->one->mode;
d416df88 38 p->parent[n].status = q->queue[i]->status;
5290a0f8
JH
39 *tail = p;
40 tail = &p->next;
af3feefa
JH
41 }
42 return list;
43 }
44
45 for (p = curr; p; p = p->next) {
46 int found = 0;
47 if (!p->len)
48 continue;
49 for (i = 0; i < q->nr; i++) {
50 const char *path;
51 int len;
52
a976b0a5 53 if (diff_unmodified_pair(q->queue[i]))
af3feefa
JH
54 continue;
55 path = q->queue[i]->two->path;
56 len = strlen(path);
57 if (len == p->len && !memcmp(path, p->path, len)) {
58 found = 1;
e702496e 59 hashcpy(p->parent[n].sha1, q->queue[i]->one->sha1);
2454c962 60 p->parent[n].mode = q->queue[i]->one->mode;
d416df88 61 p->parent[n].status = q->queue[i]->status;
af3feefa
JH
62 break;
63 }
64 }
65 if (!found)
66 p->len = 0;
67 }
68 return curr;
69}
70
b469d8b6 71/* Lines lost from parent */
af3feefa
JH
72struct lline {
73 struct lline *next;
74 int len;
75 unsigned long parent_map;
76 char line[FLEX_ARRAY];
77};
78
b469d8b6 79/* Lines surviving in the merge result */
af3feefa
JH
80struct sline {
81 struct lline *lost_head, **lost_tail;
82 char *bol;
83 int len;
46dc9412
JH
84 /* bit 0 up to (N-1) are on if the parent has this line (i.e.
85 * we did not change it).
b469d8b6
JH
86 * bit N is used for "interesting" lines, including context.
87 */
af3feefa 88 unsigned long flag;
f16706cc 89 unsigned long *p_lno;
af3feefa
JH
90};
91
92static char *grab_blob(const unsigned char *sha1, unsigned long *size)
93{
94 char *blob;
95 char type[20];
0bef57ee 96 if (is_null_sha1(sha1)) {
af3feefa
JH
97 /* deleted blob */
98 *size = 0;
99 return xcalloc(1, 1);
100 }
101 blob = read_sha1_file(sha1, type, size);
8e440259 102 if (strcmp(type, blob_type))
af3feefa
JH
103 die("object '%s' is not a blob!", sha1_to_hex(sha1));
104 return blob;
105}
106
f23fc773 107static void append_lost(struct sline *sline, int n, const char *line, int len)
af3feefa
JH
108{
109 struct lline *lline;
af3feefa
JH
110 unsigned long this_mask = (1UL<<n);
111 if (line[len-1] == '\n')
112 len--;
113
114 /* Check to see if we can squash things */
115 if (sline->lost_head) {
116 struct lline *last_one = NULL;
117 /* We cannot squash it with earlier one */
118 for (lline = sline->lost_head;
119 lline;
120 lline = lline->next)
121 if (lline->parent_map & this_mask)
122 last_one = lline;
123 lline = last_one ? last_one->next : sline->lost_head;
124 while (lline) {
125 if (lline->len == len &&
126 !memcmp(lline->line, line, len)) {
127 lline->parent_map |= this_mask;
128 return;
129 }
130 lline = lline->next;
131 }
132 }
133
134 lline = xmalloc(sizeof(*lline) + len + 1);
135 lline->len = len;
136 lline->next = NULL;
137 lline->parent_map = this_mask;
138 memcpy(lline->line, line, len);
139 lline->line[len] = 0;
5290a0f8 140 *sline->lost_tail = lline;
af3feefa
JH
141 sline->lost_tail = &lline->next;
142}
143
f23fc773 144struct combine_diff_state {
d9ea73e0
JH
145 struct xdiff_emit_state xm;
146
a0fd3146
JH
147 unsigned int lno;
148 int ob, on, nb, nn;
f23fc773
JH
149 unsigned long nmask;
150 int num_parent;
151 int n;
152 struct sline *sline;
153 struct sline *lost_bucket;
154};
155
d9ea73e0 156static void consume_line(void *state_, char *line, unsigned long len)
f23fc773 157{
d9ea73e0 158 struct combine_diff_state *state = state_;
f23fc773
JH
159 if (5 < len && !memcmp("@@ -", line, 4)) {
160 if (parse_hunk_header(line, len,
161 &state->ob, &state->on,
162 &state->nb, &state->nn))
163 return;
164 state->lno = state->nb;
165 if (!state->nb)
166 /* @@ -1,2 +0,0 @@ to remove the
167 * first two lines...
168 */
169 state->nb = 1;
170 if (state->nn == 0)
171 /* @@ -X,Y +N,0 @@ removed Y lines
172 * that would have come *after* line N
173 * in the result. Our lost buckets hang
174 * to the line after the removed lines,
175 */
176 state->lost_bucket = &state->sline[state->nb];
177 else
178 state->lost_bucket = &state->sline[state->nb-1];
179 if (!state->sline[state->nb-1].p_lno)
180 state->sline[state->nb-1].p_lno =
181 xcalloc(state->num_parent,
182 sizeof(unsigned long));
183 state->sline[state->nb-1].p_lno[state->n] = state->ob;
184 return;
185 }
186 if (!state->lost_bucket)
187 return; /* not in any hunk yet */
188 switch (line[0]) {
189 case '-':
190 append_lost(state->lost_bucket, state->n, line+1, len-1);
191 break;
192 case '+':
193 state->sline[state->lno-1].flag |= state->nmask;
194 state->lno++;
195 break;
196 }
197}
198
f23fc773 199static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
2386c297
JH
200 struct sline *sline, unsigned int cnt, int n,
201 int num_parent)
af3feefa 202{
f23fc773 203 unsigned int p_lno, lno;
f16706cc 204 unsigned long nmask = (1UL << n);
f23fc773
JH
205 xpparam_t xpp;
206 xdemitconf_t xecfg;
207 mmfile_t parent_file;
208 xdemitcb_t ecb;
209 struct combine_diff_state state;
210 unsigned long sz;
af3feefa 211
4462731e
JH
212 if (!cnt)
213 return; /* result deleted */
214
f23fc773
JH
215 parent_file.ptr = grab_blob(parent, &sz);
216 parent_file.size = sz;
217 xpp.flags = XDF_NEED_MINIMAL;
218 xecfg.ctxlen = 0;
219 xecfg.flags = 0;
d9ea73e0 220 ecb.outf = xdiff_outf;
f23fc773
JH
221 ecb.priv = &state;
222 memset(&state, 0, sizeof(state));
d9ea73e0 223 state.xm.consume = consume_line;
f23fc773
JH
224 state.nmask = nmask;
225 state.sline = sline;
226 state.lno = 1;
227 state.num_parent = num_parent;
228 state.n = n;
229
230 xdl_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
f23fc773 231 free(parent_file.ptr);
f16706cc
JH
232
233 /* Assign line numbers for this parent.
234 *
235 * sline[lno].p_lno[n] records the first line number
236 * (counting from 1) for parent N if the final hunk display
237 * started by showing sline[lno] (possibly showing the lost
238 * lines attached to it first).
239 */
8a470ebf 240 for (lno = 0, p_lno = 1; lno <= cnt; lno++) {
f16706cc
JH
241 struct lline *ll;
242 sline[lno].p_lno[n] = p_lno;
243
244 /* How many lines would this sline advance the p_lno? */
245 ll = sline[lno].lost_head;
246 while (ll) {
247 if (ll->parent_map & nmask)
248 p_lno++; /* '-' means parent had it */
249 ll = ll->next;
250 }
8a470ebf 251 if (lno < cnt && !(sline[lno].flag & nmask))
f16706cc
JH
252 p_lno++; /* no '+' means parent had it */
253 }
254 sline[lno].p_lno[n] = p_lno; /* trailer */
af3feefa
JH
255}
256
257static unsigned long context = 3;
258static char combine_marker = '@';
259
260static int interesting(struct sline *sline, unsigned long all_mask)
261{
46dc9412
JH
262 /* If some parents lost lines here, or if we have added to
263 * some parent, it is interesting.
264 */
265 return ((sline->flag & all_mask) || sline->lost_head);
af3feefa
JH
266}
267
3ec1909f
JH
268static unsigned long adjust_hunk_tail(struct sline *sline,
269 unsigned long all_mask,
270 unsigned long hunk_begin,
271 unsigned long i)
272{
46dc9412
JH
273 /* i points at the first uninteresting line. If the last line
274 * of the hunk was interesting only because it has some
275 * deletion, then it is not all that interesting for the
276 * purpose of giving trailing context lines. This is because
277 * we output '-' line and then unmodified sline[i-1] itself in
278 * that case which gives us one extra context line.
3ec1909f 279 */
46dc9412 280 if ((hunk_begin + 1 <= i) && !(sline[i-1].flag & all_mask))
3ec1909f
JH
281 i--;
282 return i;
283}
284
46dc9412
JH
285static unsigned long find_next(struct sline *sline,
286 unsigned long mark,
287 unsigned long i,
288 unsigned long cnt,
2386c297 289 int look_for_uninteresting)
3ec1909f 290{
46dc9412
JH
291 /* We have examined up to i-1 and are about to look at i.
292 * Find next interesting or uninteresting line. Here,
293 * "interesting" does not mean interesting(), but marked by
294 * the give_context() function below (i.e. it includes context
295 * lines that are not interesting to interesting() function
296 * that are surrounded by interesting() ones.
297 */
74065951 298 while (i <= cnt)
2386c297 299 if (look_for_uninteresting
46dc9412
JH
300 ? !(sline[i].flag & mark)
301 : (sline[i].flag & mark))
3ec1909f
JH
302 return i;
303 else
304 i++;
74065951 305 return i;
3ec1909f
JH
306}
307
308static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
af3feefa
JH
309{
310 unsigned long all_mask = (1UL<<num_parent) - 1;
311 unsigned long mark = (1UL<<num_parent);
312 unsigned long i;
313
46dc9412 314 /* Two groups of interesting lines may have a short gap of
82e5a82f 315 * uninteresting lines. Connect such groups to give them a
46dc9412
JH
316 * bit of context.
317 *
318 * We first start from what the interesting() function says,
319 * and mark them with "mark", and paint context lines with the
320 * mark. So interesting() would still say false for such context
321 * lines but they are treated as "interesting" in the end.
322 */
323 i = find_next(sline, mark, 0, cnt, 0);
74065951 324 if (cnt < i)
3ec1909f
JH
325 return 0;
326
74065951 327 while (i <= cnt) {
3ec1909f
JH
328 unsigned long j = (context < i) ? (i - context) : 0;
329 unsigned long k;
46dc9412
JH
330
331 /* Paint a few lines before the first interesting line. */
3ec1909f
JH
332 while (j < i)
333 sline[j++].flag |= mark;
334
335 again:
46dc9412
JH
336 /* we know up to i is to be included. where does the
337 * next uninteresting one start?
338 */
339 j = find_next(sline, mark, i, cnt, 1);
74065951 340 if (cnt < j)
3ec1909f
JH
341 break; /* the rest are all interesting */
342
343 /* lookahead context lines */
46dc9412 344 k = find_next(sline, mark, j, cnt, 0);
3ec1909f
JH
345 j = adjust_hunk_tail(sline, all_mask, i, j);
346
347 if (k < j + context) {
348 /* k is interesting and [j,k) are not, but
349 * paint them interesting because the gap is small.
350 */
351 while (j < k)
af3feefa 352 sline[j++].flag |= mark;
3ec1909f
JH
353 i = k;
354 goto again;
af3feefa 355 }
3ec1909f
JH
356
357 /* j is the first uninteresting line and there is
46dc9412
JH
358 * no overlap beyond it within context lines. Paint
359 * the trailing edge a bit.
3ec1909f
JH
360 */
361 i = k;
74065951 362 k = (j + context < cnt+1) ? j + context : cnt+1;
3ec1909f
JH
363 while (j < k)
364 sline[j++].flag |= mark;
365 }
366 return 1;
367}
368
369static int make_hunks(struct sline *sline, unsigned long cnt,
370 int num_parent, int dense)
371{
372 unsigned long all_mask = (1UL<<num_parent) - 1;
373 unsigned long mark = (1UL<<num_parent);
374 unsigned long i;
375 int has_interesting = 0;
376
74065951 377 for (i = 0; i <= cnt; i++) {
3ec1909f
JH
378 if (interesting(&sline[i], all_mask))
379 sline[i].flag |= mark;
380 else
381 sline[i].flag &= ~mark;
af3feefa 382 }
d8f4790e 383 if (!dense)
3ec1909f 384 return give_context(sline, cnt, num_parent);
d8f4790e 385
263eee29
JH
386 /* Look at each hunk, and if we have changes from only one
387 * parent, or the changes are the same from all but one
388 * parent, mark that uninteresting.
d8f4790e
JH
389 */
390 i = 0;
74065951 391 while (i <= cnt) {
3ec1909f 392 unsigned long j, hunk_begin, hunk_end;
bf1c32bd 393 unsigned long same_diff;
74065951 394 while (i <= cnt && !(sline[i].flag & mark))
d8f4790e 395 i++;
74065951 396 if (cnt < i)
d8f4790e 397 break; /* No more interesting hunks */
3ec1909f 398 hunk_begin = i;
74065951 399 for (j = i + 1; j <= cnt; j++) {
3ec1909f
JH
400 if (!(sline[j].flag & mark)) {
401 /* Look beyond the end to see if there
402 * is an interesting line after this
403 * hunk within context span.
404 */
405 unsigned long la; /* lookahead */
406 int contin = 0;
407 la = adjust_hunk_tail(sline, all_mask,
408 hunk_begin, j);
74065951
JH
409 la = (la + context < cnt + 1) ?
410 (la + context) : cnt + 1;
3ec1909f
JH
411 while (j <= --la) {
412 if (sline[la].flag & mark) {
413 contin = 1;
414 break;
415 }
416 }
417 if (!contin)
418 break;
419 j = la;
420 }
421 }
422 hunk_end = j;
423
bf1c32bd 424 /* [i..hunk_end) are interesting. Now is it really
fd4b1d21
JH
425 * interesting? We check if there are only two versions
426 * and the result matches one of them. That is, we look
427 * at:
428 * (+) line, which records lines added to which parents;
429 * this line appears in the result.
430 * (-) line, which records from what parents the line
431 * was removed; this line does not appear in the result.
432 * then check the set of parents the result has difference
433 * from, from all lines. If there are lines that has
434 * different set of parents that the result has differences
435 * from, that means we have more than two versions.
436 *
437 * Even when we have only two versions, if the result does
438 * not match any of the parents, the it should be considered
439 * interesting. In such a case, we would have all '+' line.
440 * After passing the above "two versions" test, that would
441 * appear as "the same set of parents" to be "all parents".
d8f4790e 442 */
bf1c32bd
JH
443 same_diff = 0;
444 has_interesting = 0;
445 for (j = i; j < hunk_end && !has_interesting; j++) {
46dc9412 446 unsigned long this_diff = sline[j].flag & all_mask;
bf1c32bd
JH
447 struct lline *ll = sline[j].lost_head;
448 if (this_diff) {
449 /* This has some changes. Is it the
450 * same as others?
451 */
452 if (!same_diff)
453 same_diff = this_diff;
454 else if (same_diff != this_diff) {
455 has_interesting = 1;
456 break;
457 }
458 }
459 while (ll && !has_interesting) {
460 /* Lost this line from these parents;
461 * who are they? Are they the same?
462 */
463 this_diff = ll->parent_map;
464 if (!same_diff)
465 same_diff = this_diff;
466 else if (same_diff != this_diff) {
467 has_interesting = 1;
468 }
469 ll = ll->next;
470 }
d8f4790e 471 }
bf1c32bd 472
fd4b1d21 473 if (!has_interesting && same_diff != all_mask) {
d8f4790e 474 /* This hunk is not that interesting after all */
3ec1909f 475 for (j = hunk_begin; j < hunk_end; j++)
d8f4790e
JH
476 sline[j].flag &= ~mark;
477 }
478 i = hunk_end;
479 }
3ec1909f
JH
480
481 has_interesting = give_context(sline, cnt, num_parent);
8828cdcb 482 return has_interesting;
af3feefa
JH
483}
484
2386c297 485static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long l1, int n)
f16706cc
JH
486{
487 l0 = sline[l0].p_lno[n];
488 l1 = sline[l1].p_lno[n];
f7a3d33f 489 printf(" -%lu,%lu", l0, l1-l0);
f16706cc
JH
490}
491
d5f6a01a
JH
492static int hunk_comment_line(const char *bol)
493{
494 int ch = *bol & 0xff;
495 return (isalpha(ch) || ch == '_' || ch == '$');
496}
497
567a03d1
JH
498static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
499 int use_color)
af3feefa
JH
500{
501 unsigned long mark = (1UL<<num_parent);
502 int i;
f16706cc 503 unsigned long lno = 0;
567a03d1
JH
504 const char *c_frag = diff_get_color(use_color, DIFF_FRAGINFO);
505 const char *c_new = diff_get_color(use_color, DIFF_FILE_NEW);
506 const char *c_old = diff_get_color(use_color, DIFF_FILE_OLD);
507 const char *c_plain = diff_get_color(use_color, DIFF_PLAIN);
508 const char *c_reset = diff_get_color(use_color, DIFF_RESET);
af3feefa 509
4462731e
JH
510 if (!cnt)
511 return; /* result deleted */
512
af3feefa
JH
513 while (1) {
514 struct sline *sl = &sline[lno];
8bc7574b
JH
515 unsigned long hunk_end;
516 unsigned long rlines;
d5f6a01a
JH
517 const char *hunk_comment = NULL;
518
519 while (lno <= cnt && !(sline[lno].flag & mark)) {
520 if (hunk_comment_line(sline[lno].bol))
521 hunk_comment = sline[lno].bol;
af3feefa 522 lno++;
d5f6a01a 523 }
8a470ebf 524 if (cnt < lno)
af3feefa 525 break;
8a470ebf 526 else {
74065951 527 for (hunk_end = lno + 1; hunk_end <= cnt; hunk_end++)
8a470ebf
JH
528 if (!(sline[hunk_end].flag & mark))
529 break;
530 }
74065951
JH
531 rlines = hunk_end - lno;
532 if (cnt < hunk_end)
533 rlines--; /* pointing at the last delete hunk */
567a03d1 534 fputs(c_frag, stdout);
af3feefa 535 for (i = 0; i <= num_parent; i++) putchar(combine_marker);
f16706cc 536 for (i = 0; i < num_parent; i++)
2386c297 537 show_parent_lno(sline, lno, hunk_end, i);
74065951 538 printf(" +%lu,%lu ", lno+1, rlines);
af3feefa 539 for (i = 0; i <= num_parent; i++) putchar(combine_marker);
d5f6a01a
JH
540
541 if (hunk_comment) {
542 int comment_end = 0;
543 for (i = 0; i < 40; i++) {
544 int ch = hunk_comment[i] & 0xff;
545 if (!ch || ch == '\n')
546 break;
547 if (!isspace(ch))
548 comment_end = i;
549 }
550 if (comment_end)
551 putchar(' ');
552 for (i = 0; i < comment_end; i++)
553 putchar(hunk_comment[i]);
554 }
555
567a03d1 556 printf("%s\n", c_reset);
af3feefa
JH
557 while (lno < hunk_end) {
558 struct lline *ll;
559 int j;
46dc9412 560 unsigned long p_mask;
af3feefa
JH
561 sl = &sline[lno++];
562 ll = sl->lost_head;
563 while (ll) {
567a03d1 564 fputs(c_old, stdout);
af3feefa
JH
565 for (j = 0; j < num_parent; j++) {
566 if (ll->parent_map & (1UL<<j))
567 putchar('-');
568 else
569 putchar(' ');
570 }
567a03d1 571 printf("%s%s\n", ll->line, c_reset);
af3feefa
JH
572 ll = ll->next;
573 }
74065951 574 if (cnt < lno)
8a470ebf 575 break;
46dc9412 576 p_mask = 1;
567a03d1
JH
577 if (!(sl->flag & (mark-1)))
578 fputs(c_plain, stdout);
579 else
580 fputs(c_new, stdout);
af3feefa 581 for (j = 0; j < num_parent; j++) {
46dc9412 582 if (p_mask & sl->flag)
af3feefa 583 putchar('+');
46dc9412
JH
584 else
585 putchar(' ');
586 p_mask <<= 1;
af3feefa 587 }
567a03d1 588 printf("%.*s%s\n", sl->len, sl->bol, c_reset);
af3feefa
JH
589 }
590 }
591}
592
3c39e9bd
JH
593static void reuse_combine_diff(struct sline *sline, unsigned long cnt,
594 int i, int j)
595{
596 /* We have already examined parent j and we know parent i
597 * and parent j are the same, so reuse the combined result
598 * of parent j for parent i.
599 */
600 unsigned long lno, imask, jmask;
601 imask = (1UL<<i);
602 jmask = (1UL<<j);
603
8a470ebf 604 for (lno = 0; lno <= cnt; lno++) {
3c39e9bd 605 struct lline *ll = sline->lost_head;
f16706cc 606 sline->p_lno[i] = sline->p_lno[j];
3c39e9bd
JH
607 while (ll) {
608 if (ll->parent_map & jmask)
609 ll->parent_map |= imask;
610 ll = ll->next;
611 }
46dc9412
JH
612 if (sline->flag & jmask)
613 sline->flag |= imask;
3c39e9bd
JH
614 sline++;
615 }
4462731e
JH
616 /* the overall size of the file (sline[cnt]) */
617 sline->p_lno[i] = sline->p_lno[j];
3c39e9bd
JH
618}
619
567a03d1
JH
620static void dump_quoted_path(const char *prefix, const char *path,
621 const char *c_meta, const char *c_reset)
eab144ac 622{
567a03d1 623 printf("%s%s", c_meta, prefix);
eab144ac
LT
624 if (quote_c_style(path, NULL, NULL, 0))
625 quote_c_style(path, NULL, stdout, 0);
626 else
627 printf("%s", path);
567a03d1 628 printf("%s\n", c_reset);
eab144ac
LT
629}
630
89b0c4b5
JH
631static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
632 int dense, struct rev_info *rev)
af3feefa 633{
91539833 634 struct diff_options *opt = &rev->diffopt;
f23fc773 635 unsigned long result_size, cnt, lno;
310f8b5b 636 char *result, *cp;
af3feefa 637 struct sline *sline; /* survived lines */
2454c962 638 int mode_differs = 0;
89b0c4b5 639 int i, show_hunks;
0bef57ee 640 int working_tree_file = is_null_sha1(elem->sha1);
e70c6b35 641 int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV;
f23fc773 642 mmfile_t result_file;
af3feefa 643
ee1e5412 644 context = opt->context;
af3feefa 645 /* Read the result of merge first */
f23fc773
JH
646 if (!working_tree_file)
647 result = grab_blob(elem->sha1, &result_size);
ea726d02 648 else {
9843a1f6 649 /* Used by diff-tree to read from the working tree */
ea726d02
JH
650 struct stat st;
651 int fd;
f23fc773 652 if (0 <= (fd = open(elem->path, O_RDONLY)) &&
ea726d02
JH
653 !fstat(fd, &st)) {
654 int len = st.st_size;
2386c297 655 int sz = 0;
ea726d02 656
1b0c7174 657 elem->mode = canon_mode(st.st_mode);
f23fc773 658 result_size = len;
ea726d02 659 result = xmalloc(len + 1);
2386c297
JH
660 while (sz < len) {
661 int done = xread(fd, result+sz, len-sz);
ea726d02
JH
662 if (done == 0)
663 break;
664 if (done < 0)
f23fc773 665 die("read error '%s'", elem->path);
2386c297 666 sz += done;
ea726d02
JH
667 }
668 result[len] = 0;
669 }
670 else {
671 /* deleted file */
f23fc773 672 result_size = 0;
713a11fc 673 elem->mode = 0;
28f75818 674 result = xcalloc(1, 1);
ea726d02
JH
675 }
676 if (0 <= fd)
677 close(fd);
678 }
af3feefa 679
2386c297 680 for (cnt = 0, cp = result; cp < result + result_size; cp++) {
af3feefa
JH
681 if (*cp == '\n')
682 cnt++;
683 }
f23fc773 684 if (result_size && result[result_size-1] != '\n')
af3feefa
JH
685 cnt++; /* incomplete line */
686
8a470ebf 687 sline = xcalloc(cnt+2, sizeof(*sline));
af3feefa 688 sline[0].bol = result;
8a470ebf 689 for (lno = 0; lno <= cnt + 1; lno++) {
4462731e
JH
690 sline[lno].lost_tail = &sline[lno].lost_head;
691 sline[lno].flag = 0;
692 }
2386c297 693 for (lno = 0, cp = result; cp < result + result_size; cp++) {
af3feefa
JH
694 if (*cp == '\n') {
695 sline[lno].len = cp - sline[lno].bol;
af3feefa
JH
696 lno++;
697 if (lno < cnt)
698 sline[lno].bol = cp + 1;
699 }
700 }
f23fc773
JH
701 if (result_size && result[result_size-1] != '\n')
702 sline[cnt-1].len = result_size - (sline[cnt-1].bol - result);
703
704 result_file.ptr = result;
705 result_file.size = result_size;
af3feefa 706
8a470ebf
JH
707 /* Even p_lno[cnt+1] is valid -- that is for the end line number
708 * for deletion hunk at the end.
709 */
710 sline[0].p_lno = xcalloc((cnt+2) * num_parent, sizeof(unsigned long));
711 for (lno = 0; lno <= cnt; lno++)
f16706cc
JH
712 sline[lno+1].p_lno = sline[lno].p_lno + num_parent;
713
3c39e9bd
JH
714 for (i = 0; i < num_parent; i++) {
715 int j;
716 for (j = 0; j < i; j++) {
a89fccd2
DR
717 if (!hashcmp(elem->parent[i].sha1,
718 elem->parent[j].sha1)) {
3c39e9bd
JH
719 reuse_combine_diff(sline, cnt, i, j);
720 break;
721 }
722 }
723 if (i <= j)
f23fc773 724 combine_diff(elem->parent[i].sha1, &result_file, sline,
f16706cc 725 cnt, i, num_parent);
2454c962
JH
726 if (elem->parent[i].mode != elem->mode)
727 mode_differs = 1;
3c39e9bd 728 }
af3feefa 729
8828cdcb 730 show_hunks = make_hunks(sline, cnt, num_parent, dense);
af3feefa 731
713a11fc 732 if (show_hunks || mode_differs || working_tree_file) {
9843a1f6 733 const char *abb;
567a03d1
JH
734 int use_color = opt->color_diff;
735 const char *c_meta = diff_get_color(use_color, DIFF_METAINFO);
736 const char *c_reset = diff_get_color(use_color, DIFF_RESET);
d5f6a01a
JH
737 int added = 0;
738 int deleted = 0;
9843a1f6 739
91539833 740 if (rev->loginfo)
39bc9a6c 741 show_log(rev, opt->msg_sep);
567a03d1
JH
742 dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
743 elem->path, c_meta, c_reset);
744 printf("%sindex ", c_meta);
823bcd6e 745 for (i = 0; i < num_parent; i++) {
297a1aad 746 abb = find_unique_abbrev(elem->parent[i].sha1,
e70c6b35 747 abbrev);
9843a1f6 748 printf("%s%s", i ? "," : "", abb);
823bcd6e 749 }
e70c6b35 750 abb = find_unique_abbrev(elem->sha1, abbrev);
567a03d1 751 printf("..%s%s\n", abb, c_reset);
2454c962
JH
752
753 if (mode_differs) {
d5f6a01a
JH
754 deleted = !elem->mode;
755
756 /* We say it was added if nobody had it */
757 added = !deleted;
d416df88
JH
758 for (i = 0; added && i < num_parent; i++)
759 if (elem->parent[i].status !=
760 DIFF_STATUS_ADDED)
761 added = 0;
762 if (added)
567a03d1
JH
763 printf("%snew file mode %06o",
764 c_meta, elem->mode);
d416df88 765 else {
d5f6a01a 766 if (deleted)
567a03d1 767 printf("%sdeleted file ", c_meta);
d416df88
JH
768 printf("mode ");
769 for (i = 0; i < num_parent; i++) {
770 printf("%s%06o", i ? "," : "",
771 elem->parent[i].mode);
772 }
773 if (elem->mode)
774 printf("..%06o", elem->mode);
2454c962 775 }
567a03d1 776 printf("%s\n", c_reset);
2454c962 777 }
d5f6a01a
JH
778 if (added)
779 dump_quoted_path("--- /dev/", "null", c_meta, c_reset);
780 else
781 dump_quoted_path("--- a/", elem->path, c_meta, c_reset);
782 if (deleted)
783 dump_quoted_path("+++ /dev/", "null", c_meta, c_reset);
784 else
785 dump_quoted_path("+++ b/", elem->path, c_meta, c_reset);
567a03d1 786 dump_sline(sline, cnt, num_parent, opt->color_diff);
8828cdcb 787 }
af3feefa
JH
788 free(result);
789
2386c297
JH
790 for (lno = 0; lno < cnt; lno++) {
791 if (sline[lno].lost_head) {
792 struct lline *ll = sline[lno].lost_head;
af3feefa
JH
793 while (ll) {
794 struct lline *tmp = ll;
795 ll = ll->next;
796 free(tmp);
797 }
798 }
799 }
46dc9412 800 free(sline[0].p_lno);
af3feefa
JH
801 free(sline);
802}
803
ee638024
LT
804#define COLONS "::::::::::::::::::::::::::::::::"
805
91539833 806static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct rev_info *rev)
ee638024 807{
91539833 808 struct diff_options *opt = &rev->diffopt;
310f8b5b 809 int i, offset;
ee638024
LT
810 const char *prefix;
811 int line_termination, inter_name_termination;
812
813 line_termination = opt->line_termination;
814 inter_name_termination = '\t';
815 if (!line_termination)
816 inter_name_termination = 0;
817
91539833 818 if (rev->loginfo)
39bc9a6c 819 show_log(rev, opt->msg_sep);
ee638024 820
c6744349 821 if (opt->output_format & DIFF_FORMAT_RAW) {
0a798076
JH
822 offset = strlen(COLONS) - num_parent;
823 if (offset < 0)
824 offset = 0;
825 prefix = COLONS + offset;
826
827 /* Show the modes */
828 for (i = 0; i < num_parent; i++) {
829 printf("%s%06o", prefix, p->parent[i].mode);
830 prefix = " ";
831 }
832 printf("%s%06o", prefix, p->mode);
833
834 /* Show sha1's */
835 for (i = 0; i < num_parent; i++)
836 printf(" %s", diff_unique_abbrev(p->parent[i].sha1,
837 opt->abbrev));
838 printf(" %s ", diff_unique_abbrev(p->sha1, opt->abbrev));
839 }
840
c6744349 841 if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) {
d416df88
JH
842 for (i = 0; i < num_parent; i++)
843 putchar(p->parent[i].status);
844 putchar(inter_name_termination);
845 }
0a798076
JH
846
847 if (line_termination) {
848 if (quote_c_style(p->path, NULL, NULL, 0))
849 quote_c_style(p->path, NULL, stdout, 0);
850 else
851 printf("%s", p->path);
852 putchar(line_termination);
853 }
854 else {
855 printf("%s%c", p->path, line_termination);
ee638024 856 }
0a798076
JH
857}
858
91539833 859void show_combined_diff(struct combine_diff_path *p,
0a798076
JH
860 int num_parent,
861 int dense,
91539833 862 struct rev_info *rev)
0a798076 863{
91539833 864 struct diff_options *opt = &rev->diffopt;
0a798076 865 if (!p->len)
91539833 866 return;
c6744349
TH
867 if (opt->output_format & (DIFF_FORMAT_RAW |
868 DIFF_FORMAT_NAME |
89b0c4b5 869 DIFF_FORMAT_NAME_STATUS))
91539833 870 show_raw_diff(p, num_parent, rev);
89b0c4b5 871 else if (opt->output_format & DIFF_FORMAT_PATCH)
91539833 872 show_patch_diff(p, num_parent, dense, rev);
ee638024
LT
873}
874
0fe7c1de
JH
875void diff_tree_combined(const unsigned char *sha1,
876 const unsigned char parent[][20],
877 int num_parent,
878 int dense,
879 struct rev_info *rev)
af3feefa 880{
91539833 881 struct diff_options *opt = &rev->diffopt;
af3feefa 882 struct diff_options diffopts;
ea726d02 883 struct combine_diff_path *p, *paths = NULL;
3969cf7d 884 int i, num_paths, needsep, show_log_first;
af3feefa 885
5b236832 886 diffopts = *opt;
3969cf7d 887 diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
af3feefa
JH
888 diffopts.recursive = 1;
889
2c0b4dfd 890 show_log_first = !!rev->loginfo;
3969cf7d 891 needsep = 0;
af3feefa 892 /* find set of paths that everybody touches */
0fe7c1de 893 for (i = 0; i < num_parent; i++) {
965f803c
JH
894 /* show stat against the first parent even
895 * when doing combined diff.
896 */
c6744349 897 if (i == 0 && opt->output_format & DIFF_FORMAT_DIFFSTAT)
965f803c
JH
898 diffopts.output_format = DIFF_FORMAT_DIFFSTAT;
899 else
900 diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
0fe7c1de 901 diff_tree_sha1(parent[i], sha1, "", &diffopts);
5b236832 902 diffcore_std(&diffopts);
af3feefa 903 paths = intersect_paths(paths, i, num_parent);
eab144ac 904
3969cf7d 905 if (show_log_first && i == 0) {
39bc9a6c 906 show_log(rev, opt->msg_sep);
3969cf7d
JH
907 if (rev->verbose_header && opt->output_format)
908 putchar(opt->line_termination);
909 }
af3feefa
JH
910 diff_flush(&diffopts);
911 }
912
913 /* find out surviving paths */
914 for (num_paths = 0, p = paths; p; p = p->next) {
915 if (p->len)
916 num_paths++;
917 }
e3c3a550 918 if (num_paths) {
c6744349
TH
919 if (opt->output_format & (DIFF_FORMAT_RAW |
920 DIFF_FORMAT_NAME |
921 DIFF_FORMAT_NAME_STATUS)) {
86ff1d20 922 for (p = paths; p; p = p->next) {
c6744349
TH
923 if (p->len)
924 show_raw_diff(p, num_parent, rev);
86ff1d20 925 }
3969cf7d 926 needsep = 1;
86ff1d20 927 }
3969cf7d
JH
928 else if (opt->output_format & DIFF_FORMAT_DIFFSTAT)
929 needsep = 1;
c6744349 930 if (opt->output_format & DIFF_FORMAT_PATCH) {
3969cf7d
JH
931 if (needsep)
932 putchar(opt->line_termination);
c6744349
TH
933 for (p = paths; p; p = p->next) {
934 if (p->len)
935 show_patch_diff(p, num_parent, dense,
936 rev);
937 }
af3feefa
JH
938 }
939 }
940
941 /* Clean things up */
942 while (paths) {
ea726d02 943 struct combine_diff_path *tmp = paths;
af3feefa
JH
944 paths = paths->next;
945 free(tmp);
946 }
af3feefa 947}
0fe7c1de
JH
948
949void diff_tree_combined_merge(const unsigned char *sha1,
950 int dense, struct rev_info *rev)
951{
952 int num_parent;
953 const unsigned char (*parent)[20];
954 struct commit *commit = lookup_commit(sha1);
955 struct commit_list *parents;
956
957 /* count parents */
958 for (parents = commit->parents, num_parent = 0;
959 parents;
960 parents = parents->next, num_parent++)
961 ; /* nothing */
962
963 parent = xmalloc(num_parent * sizeof(*parent));
964 for (parents = commit->parents, num_parent = 0;
965 parents;
966 parents = parents->next, num_parent++)
e702496e
SP
967 hashcpy((unsigned char*)(parent + num_parent),
968 parents->item->object.sha1);
0fe7c1de
JH
969 diff_tree_combined(sha1, parent, num_parent, dense, rev);
970}