Merge branch 'jc/git-gui-has-maintainer'
[git/git.git] / combine-diff.c
CommitLineData
af3feefa 1#include "cache.h"
cbd53a21 2#include "object-store.h"
af3feefa 3#include "commit.h"
8e440259 4#include "blob.h"
af3feefa
JH
5#include "diff.h"
6#include "diffcore.h"
7#include "quote.h"
d9ea73e0 8#include "xdiff-interface.h"
fa04ae0b 9#include "xdiff/xmacros.h"
91539833 10#include "log-tree.h"
7dae8b21 11#include "refs.h"
4d5f3471 12#include "userdiff.h"
0041f09d 13#include "sha1-array.h"
53d00b39 14#include "revision.h"
af3feefa 15
e09867f0
JK
16static int compare_paths(const struct combine_diff_path *one,
17 const struct diff_filespec *two)
18{
19 if (!S_ISDIR(one->mode) && !S_ISDIR(two->mode))
20 return strcmp(one->path, two->path);
21
22 return base_name_compare(one->path, strlen(one->path), one->mode,
23 two->path, strlen(two->path), two->mode);
24}
25
d76ce4f7
EN
26static int filename_changed(char status)
27{
28 return status == 'R' || status == 'C';
29}
30
31static struct combine_diff_path *intersect_paths(
32 struct combine_diff_path *curr,
33 int n,
34 int num_parent,
35 int combined_all_paths)
af3feefa
JH
36{
37 struct diff_queue_struct *q = &diff_queued_diff;
7b1004b0 38 struct combine_diff_path *p, **tail = &curr;
d76ce4f7 39 int i, j, cmp;
af3feefa
JH
40
41 if (!n) {
af3feefa
JH
42 for (i = 0; i < q->nr; i++) {
43 int len;
44 const char *path;
a976b0a5 45 if (diff_unmodified_pair(q->queue[i]))
af3feefa
JH
46 continue;
47 path = q->queue[i]->two->path;
48 len = strlen(path);
2454c962 49 p = xmalloc(combine_diff_path_size(num_parent, len));
4b25d091 50 p->path = (char *) &(p->parent[num_parent]);
af3feefa
JH
51 memcpy(p->path, path, len);
52 p->path[len] = 0;
af3feefa 53 p->next = NULL;
2454c962
JH
54 memset(p->parent, 0,
55 sizeof(p->parent[0]) * num_parent);
56
a0d12c44 57 oidcpy(&p->oid, &q->queue[i]->two->oid);
2454c962 58 p->mode = q->queue[i]->two->mode;
a0d12c44 59 oidcpy(&p->parent[n].oid, &q->queue[i]->one->oid);
2454c962 60 p->parent[n].mode = q->queue[i]->one->mode;
d416df88 61 p->parent[n].status = q->queue[i]->status;
d76ce4f7
EN
62
63 if (combined_all_paths &&
64 filename_changed(p->parent[n].status)) {
65 strbuf_init(&p->parent[n].path, 0);
66 strbuf_addstr(&p->parent[n].path,
67 q->queue[i]->one->path);
68 }
5290a0f8
JH
69 *tail = p;
70 tail = &p->next;
af3feefa 71 }
7b1004b0 72 return curr;
af3feefa
JH
73 }
74
8518ff8f 75 /*
7b1004b0
JH
76 * paths in curr (linked list) and q->queue[] (array) are
77 * both sorted in the tree order.
8518ff8f 78 */
8518ff8f 79 i = 0;
7b1004b0
JH
80 while ((p = *tail) != NULL) {
81 cmp = ((i >= q->nr)
e09867f0 82 ? -1 : compare_paths(p, q->queue[i]->two));
8518ff8f 83
8518ff8f 84 if (cmp < 0) {
7b1004b0
JH
85 /* p->path not in q->queue[]; drop it */
86 *tail = p->next;
d76ce4f7
EN
87 for (j = 0; j < num_parent; j++)
88 if (combined_all_paths &&
89 filename_changed(p->parent[j].status))
90 strbuf_release(&p->parent[j].path);
7b1004b0 91 free(p);
af3feefa 92 continue;
8518ff8f 93 }
af3feefa 94
8518ff8f 95 if (cmp > 0) {
7b1004b0 96 /* q->queue[i] not in p->path; skip it */
8518ff8f
KS
97 i++;
98 continue;
af3feefa 99 }
8518ff8f 100
a0d12c44 101 oidcpy(&p->parent[n].oid, &q->queue[i]->one->oid);
8518ff8f
KS
102 p->parent[n].mode = q->queue[i]->one->mode;
103 p->parent[n].status = q->queue[i]->status;
d76ce4f7
EN
104 if (combined_all_paths &&
105 filename_changed(p->parent[n].status))
106 strbuf_addstr(&p->parent[n].path,
107 q->queue[i]->one->path);
8518ff8f 108
7b1004b0 109 tail = &p->next;
8518ff8f 110 i++;
af3feefa
JH
111 }
112 return curr;
113}
114
b469d8b6 115/* Lines lost from parent */
af3feefa 116struct lline {
99d32060 117 struct lline *next, *prev;
af3feefa
JH
118 int len;
119 unsigned long parent_map;
120 char line[FLEX_ARRAY];
121};
122
99d32060
AP
123/* Lines lost from current parent (before coalescing) */
124struct plost {
125 struct lline *lost_head, *lost_tail;
126 int len;
127};
128
b469d8b6 129/* Lines surviving in the merge result */
af3feefa 130struct sline {
99d32060
AP
131 /* Accumulated and coalesced lost lines */
132 struct lline *lost;
133 int lenlost;
134 struct plost plost;
af3feefa
JH
135 char *bol;
136 int len;
46dc9412
JH
137 /* bit 0 up to (N-1) are on if the parent has this line (i.e.
138 * we did not change it).
b469d8b6 139 * bit N is used for "interesting" lines, including context.
c86fbe53 140 * bit (N+1) is used for "do not show deletion before this".
b469d8b6 141 */
af3feefa 142 unsigned long flag;
f16706cc 143 unsigned long *p_lno;
af3feefa
JH
144};
145
fa04ae0b
AP
146static int match_string_spaces(const char *line1, int len1,
147 const char *line2, int len2,
148 long flags)
149{
150 if (flags & XDF_WHITESPACE_FLAGS) {
151 for (; len1 > 0 && XDL_ISSPACE(line1[len1 - 1]); len1--);
152 for (; len2 > 0 && XDL_ISSPACE(line2[len2 - 1]); len2--);
153 }
154
155 if (!(flags & (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE)))
156 return (len1 == len2 && !memcmp(line1, line2, len1));
157
158 while (len1 > 0 && len2 > 0) {
159 len1--;
160 len2--;
161 if (XDL_ISSPACE(line1[len1]) || XDL_ISSPACE(line2[len2])) {
162 if ((flags & XDF_IGNORE_WHITESPACE_CHANGE) &&
163 (!XDL_ISSPACE(line1[len1]) || !XDL_ISSPACE(line2[len2])))
164 return 0;
165
166 for (; len1 > 0 && XDL_ISSPACE(line1[len1]); len1--);
167 for (; len2 > 0 && XDL_ISSPACE(line2[len2]); len2--);
168 }
169 if (line1[len1] != line2[len2])
170 return 0;
171 }
172
173 if (flags & XDF_IGNORE_WHITESPACE) {
174 /* Consume remaining spaces */
175 for (; len1 > 0 && XDL_ISSPACE(line1[len1 - 1]); len1--);
176 for (; len2 > 0 && XDL_ISSPACE(line2[len2 - 1]); len2--);
177 }
178
179 /* We matched full line1 and line2 */
180 if (!len1 && !len2)
181 return 1;
182
183 return 0;
184}
185
99d32060
AP
186enum coalesce_direction { MATCH, BASE, NEW };
187
188/* Coalesce new lines into base by finding LCS */
189static struct lline *coalesce_lines(struct lline *base, int *lenbase,
06fffa00 190 struct lline *newline, int lennew,
99d32060 191 unsigned long parent, long flags)
af3feefa 192{
99d32060
AP
193 int **lcs;
194 enum coalesce_direction **directions;
195 struct lline *baseend, *newend = NULL;
196 int i, j, origbaselen = *lenbase;
af3feefa 197
06fffa00 198 if (newline == NULL)
99d32060
AP
199 return base;
200
201 if (base == NULL) {
202 *lenbase = lennew;
06fffa00 203 return newline;
99d32060
AP
204 }
205
206 /*
207 * Coalesce new lines into base by finding the LCS
98e023de 208 * - Create the table to run dynamic programming
99d32060
AP
209 * - Compute the LCS
210 * - Then reverse read the direction structure:
211 * - If we have MATCH, assign parent to base flag, and consume
212 * both baseend and newend
213 * - Else if we have BASE, consume baseend
214 * - Else if we have NEW, insert newend lline into base and
215 * consume newend
216 */
50a6c8ef
JK
217 lcs = xcalloc(st_add(origbaselen, 1), sizeof(int*));
218 directions = xcalloc(st_add(origbaselen, 1), sizeof(enum coalesce_direction*));
99d32060 219 for (i = 0; i < origbaselen + 1; i++) {
50a6c8ef
JK
220 lcs[i] = xcalloc(st_add(lennew, 1), sizeof(int));
221 directions[i] = xcalloc(st_add(lennew, 1), sizeof(enum coalesce_direction));
99d32060
AP
222 directions[i][0] = BASE;
223 }
224 for (j = 1; j < lennew + 1; j++)
225 directions[0][j] = NEW;
226
227 for (i = 1, baseend = base; i < origbaselen + 1; i++) {
06fffa00 228 for (j = 1, newend = newline; j < lennew + 1; j++) {
99d32060
AP
229 if (match_string_spaces(baseend->line, baseend->len,
230 newend->line, newend->len, flags)) {
231 lcs[i][j] = lcs[i - 1][j - 1] + 1;
232 directions[i][j] = MATCH;
233 } else if (lcs[i][j - 1] >= lcs[i - 1][j]) {
234 lcs[i][j] = lcs[i][j - 1];
235 directions[i][j] = NEW;
236 } else {
237 lcs[i][j] = lcs[i - 1][j];
238 directions[i][j] = BASE;
239 }
240 if (newend->next)
241 newend = newend->next;
242 }
243 if (baseend->next)
244 baseend = baseend->next;
245 }
246
247 for (i = 0; i < origbaselen + 1; i++)
248 free(lcs[i]);
249 free(lcs);
250
251 /* At this point, baseend and newend point to the end of each lists */
252 i--;
253 j--;
254 while (i != 0 || j != 0) {
255 if (directions[i][j] == MATCH) {
256 baseend->parent_map |= 1<<parent;
257 baseend = baseend->prev;
258 newend = newend->prev;
259 i--;
260 j--;
261 } else if (directions[i][j] == NEW) {
262 struct lline *lline;
263
264 lline = newend;
265 /* Remove lline from new list and update newend */
266 if (lline->prev)
267 lline->prev->next = lline->next;
268 else
06fffa00 269 newline = lline->next;
99d32060
AP
270 if (lline->next)
271 lline->next->prev = lline->prev;
272
273 newend = lline->prev;
274 j--;
275
276 /* Add lline to base list */
277 if (baseend) {
278 lline->next = baseend->next;
279 lline->prev = baseend;
280 if (lline->prev)
281 lline->prev->next = lline;
af3feefa 282 }
99d32060
AP
283 else {
284 lline->next = base;
285 base = lline;
286 }
287 (*lenbase)++;
288
289 if (lline->next)
290 lline->next->prev = lline;
291
292 } else {
293 baseend = baseend->prev;
294 i--;
af3feefa
JH
295 }
296 }
297
06fffa00 298 newend = newline;
99d32060
AP
299 while (newend) {
300 struct lline *lline = newend;
301 newend = newend->next;
302 free(lline);
303 }
304
305 for (i = 0; i < origbaselen + 1; i++)
306 free(directions[i]);
307 free(directions);
308
309 return base;
310}
311
6afaf807
NTND
312static char *grab_blob(struct repository *r,
313 const struct object_id *oid, unsigned int mode,
99d32060
AP
314 unsigned long *size, struct userdiff_driver *textconv,
315 const char *path)
316{
317 char *blob;
318 enum object_type type;
319
320 if (S_ISGITLINK(mode)) {
0dc3b035
JK
321 struct strbuf buf = STRBUF_INIT;
322 strbuf_addf(&buf, "Subproject commit %s\n", oid_to_hex(oid));
323 *size = buf.len;
324 blob = strbuf_detach(&buf, NULL);
1ff57c13 325 } else if (is_null_oid(oid)) {
99d32060
AP
326 /* deleted blob */
327 *size = 0;
328 return xcalloc(1, 1);
329 } else if (textconv) {
330 struct diff_filespec *df = alloc_filespec(path);
f9704c2d 331 fill_filespec(df, oid, 1, mode);
6afaf807 332 *size = fill_textconv(r, textconv, df, &blob);
99d32060
AP
333 free_filespec(df);
334 } else {
b4f5aca4 335 blob = read_object_file(oid, &type, size);
99d32060 336 if (type != OBJ_BLOB)
1ff57c13 337 die("object '%s' is not a blob!", oid_to_hex(oid));
99d32060
AP
338 }
339 return blob;
340}
341
342static void append_lost(struct sline *sline, int n, const char *line, int len)
343{
344 struct lline *lline;
345 unsigned long this_mask = (1UL<<n);
346 if (line[len-1] == '\n')
347 len--;
348
96ffc06f 349 FLEX_ALLOC_MEM(lline, line, line, len);
af3feefa
JH
350 lline->len = len;
351 lline->next = NULL;
99d32060
AP
352 lline->prev = sline->plost.lost_tail;
353 if (lline->prev)
354 lline->prev->next = lline;
355 else
356 sline->plost.lost_head = lline;
357 sline->plost.lost_tail = lline;
358 sline->plost.len++;
af3feefa 359 lline->parent_map = this_mask;
af3feefa
JH
360}
361
f23fc773 362struct combine_diff_state {
a0fd3146
JH
363 unsigned int lno;
364 int ob, on, nb, nn;
f23fc773
JH
365 unsigned long nmask;
366 int num_parent;
367 int n;
368 struct sline *sline;
369 struct sline *lost_bucket;
370};
371
0074c911
JK
372static void consume_hunk(void *state_,
373 long ob, long on,
374 long nb, long nn,
375 const char *funcline, long funclen)
f23fc773 376{
d9ea73e0 377 struct combine_diff_state *state = state_;
0074c911
JK
378
379 state->ob = ob;
380 state->on = on;
381 state->nb = nb;
382 state->nn = nn;
383 state->lno = state->nb;
384 if (state->nn == 0) {
385 /* @@ -X,Y +N,0 @@ removed Y lines
386 * that would have come *after* line N
387 * in the result. Our lost buckets hang
388 * to the line after the removed lines,
389 *
390 * Note that this is correct even when N == 0,
391 * in which case the hunk removes the first
392 * line in the file.
393 */
394 state->lost_bucket = &state->sline[state->nb];
395 if (!state->nb)
396 state->nb = 1;
397 } else {
398 state->lost_bucket = &state->sline[state->nb-1];
f23fc773 399 }
0074c911
JK
400 if (!state->sline[state->nb-1].p_lno)
401 state->sline[state->nb-1].p_lno =
402 xcalloc(state->num_parent, sizeof(unsigned long));
403 state->sline[state->nb-1].p_lno[state->n] = state->ob;
404}
405
406static void consume_line(void *state_, char *line, unsigned long len)
407{
408 struct combine_diff_state *state = state_;
f23fc773
JH
409 if (!state->lost_bucket)
410 return; /* not in any hunk yet */
411 switch (line[0]) {
412 case '-':
99d32060 413 append_lost(state->lost_bucket, state->n, line+1, len-1);
f23fc773
JH
414 break;
415 case '+':
416 state->sline[state->lno-1].flag |= state->nmask;
417 state->lno++;
418 break;
419 }
420}
421
6afaf807
NTND
422static void combine_diff(struct repository *r,
423 const struct object_id *parent, unsigned int mode,
7dae8b21 424 mmfile_t *result_file,
2386c297 425 struct sline *sline, unsigned int cnt, int n,
0508fe53
JK
426 int num_parent, int result_deleted,
427 struct userdiff_driver *textconv,
fa04ae0b 428 const char *path, long flags)
af3feefa 429{
f23fc773 430 unsigned int p_lno, lno;
f16706cc 431 unsigned long nmask = (1UL << n);
f23fc773
JH
432 xpparam_t xpp;
433 xdemitconf_t xecfg;
434 mmfile_t parent_file;
f23fc773
JH
435 struct combine_diff_state state;
436 unsigned long sz;
af3feefa 437
21798708 438 if (result_deleted)
4462731e
JH
439 return; /* result deleted */
440
6afaf807 441 parent_file.ptr = grab_blob(r, parent, mode, &sz, textconv, path);
f23fc773 442 parent_file.size = sz;
9ccd0a88 443 memset(&xpp, 0, sizeof(xpp));
fa04ae0b 444 xpp.flags = flags;
30b25010 445 memset(&xecfg, 0, sizeof(xecfg));
f23fc773
JH
446 memset(&state, 0, sizeof(state));
447 state.nmask = nmask;
448 state.sline = sline;
449 state.lno = 1;
450 state.num_parent = num_parent;
451 state.n = n;
452
0074c911
JK
453 if (xdi_diff_outf(&parent_file, result_file, consume_hunk,
454 consume_line, &state, &xpp, &xecfg))
3efb9880 455 die("unable to generate combined diff for %s",
11a458be 456 oid_to_hex(parent));
f23fc773 457 free(parent_file.ptr);
f16706cc
JH
458
459 /* Assign line numbers for this parent.
460 *
461 * sline[lno].p_lno[n] records the first line number
462 * (counting from 1) for parent N if the final hunk display
463 * started by showing sline[lno] (possibly showing the lost
464 * lines attached to it first).
465 */
8a470ebf 466 for (lno = 0, p_lno = 1; lno <= cnt; lno++) {
f16706cc
JH
467 struct lline *ll;
468 sline[lno].p_lno[n] = p_lno;
469
99d32060
AP
470 /* Coalesce new lines */
471 if (sline[lno].plost.lost_head) {
472 struct sline *sl = &sline[lno];
473 sl->lost = coalesce_lines(sl->lost, &sl->lenlost,
474 sl->plost.lost_head,
475 sl->plost.len, n, flags);
476 sl->plost.lost_head = sl->plost.lost_tail = NULL;
477 sl->plost.len = 0;
478 }
479
f16706cc 480 /* How many lines would this sline advance the p_lno? */
99d32060 481 ll = sline[lno].lost;
f16706cc
JH
482 while (ll) {
483 if (ll->parent_map & nmask)
484 p_lno++; /* '-' means parent had it */
485 ll = ll->next;
486 }
8a470ebf 487 if (lno < cnt && !(sline[lno].flag & nmask))
f16706cc
JH
488 p_lno++; /* no '+' means parent had it */
489 }
490 sline[lno].p_lno[n] = p_lno; /* trailer */
af3feefa
JH
491}
492
493static unsigned long context = 3;
494static char combine_marker = '@';
495
496static int interesting(struct sline *sline, unsigned long all_mask)
497{
46dc9412
JH
498 /* If some parents lost lines here, or if we have added to
499 * some parent, it is interesting.
500 */
99d32060 501 return ((sline->flag & all_mask) || sline->lost);
af3feefa
JH
502}
503
3ec1909f
JH
504static unsigned long adjust_hunk_tail(struct sline *sline,
505 unsigned long all_mask,
506 unsigned long hunk_begin,
507 unsigned long i)
508{
46dc9412
JH
509 /* i points at the first uninteresting line. If the last line
510 * of the hunk was interesting only because it has some
511 * deletion, then it is not all that interesting for the
512 * purpose of giving trailing context lines. This is because
513 * we output '-' line and then unmodified sline[i-1] itself in
514 * that case which gives us one extra context line.
3ec1909f 515 */
46dc9412 516 if ((hunk_begin + 1 <= i) && !(sline[i-1].flag & all_mask))
3ec1909f
JH
517 i--;
518 return i;
519}
520
46dc9412
JH
521static unsigned long find_next(struct sline *sline,
522 unsigned long mark,
523 unsigned long i,
524 unsigned long cnt,
2386c297 525 int look_for_uninteresting)
3ec1909f 526{
46dc9412
JH
527 /* We have examined up to i-1 and are about to look at i.
528 * Find next interesting or uninteresting line. Here,
529 * "interesting" does not mean interesting(), but marked by
530 * the give_context() function below (i.e. it includes context
531 * lines that are not interesting to interesting() function
532 * that are surrounded by interesting() ones.
533 */
74065951 534 while (i <= cnt)
2386c297 535 if (look_for_uninteresting
46dc9412
JH
536 ? !(sline[i].flag & mark)
537 : (sline[i].flag & mark))
3ec1909f
JH
538 return i;
539 else
540 i++;
74065951 541 return i;
3ec1909f
JH
542}
543
544static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
af3feefa
JH
545{
546 unsigned long all_mask = (1UL<<num_parent) - 1;
547 unsigned long mark = (1UL<<num_parent);
c86fbe53 548 unsigned long no_pre_delete = (2UL<<num_parent);
af3feefa
JH
549 unsigned long i;
550
46dc9412 551 /* Two groups of interesting lines may have a short gap of
82e5a82f 552 * uninteresting lines. Connect such groups to give them a
46dc9412
JH
553 * bit of context.
554 *
555 * We first start from what the interesting() function says,
556 * and mark them with "mark", and paint context lines with the
557 * mark. So interesting() would still say false for such context
558 * lines but they are treated as "interesting" in the end.
559 */
560 i = find_next(sline, mark, 0, cnt, 0);
74065951 561 if (cnt < i)
3ec1909f
JH
562 return 0;
563
74065951 564 while (i <= cnt) {
3ec1909f
JH
565 unsigned long j = (context < i) ? (i - context) : 0;
566 unsigned long k;
46dc9412
JH
567
568 /* Paint a few lines before the first interesting line. */
aac38571
MK
569 while (j < i) {
570 if (!(sline[j].flag & mark))
571 sline[j].flag |= no_pre_delete;
572 sline[j++].flag |= mark;
573 }
3ec1909f
JH
574
575 again:
46dc9412
JH
576 /* we know up to i is to be included. where does the
577 * next uninteresting one start?
578 */
579 j = find_next(sline, mark, i, cnt, 1);
74065951 580 if (cnt < j)
3ec1909f
JH
581 break; /* the rest are all interesting */
582
583 /* lookahead context lines */
46dc9412 584 k = find_next(sline, mark, j, cnt, 0);
3ec1909f
JH
585 j = adjust_hunk_tail(sline, all_mask, i, j);
586
587 if (k < j + context) {
588 /* k is interesting and [j,k) are not, but
589 * paint them interesting because the gap is small.
590 */
591 while (j < k)
af3feefa 592 sline[j++].flag |= mark;
3ec1909f
JH
593 i = k;
594 goto again;
af3feefa 595 }
3ec1909f
JH
596
597 /* j is the first uninteresting line and there is
46dc9412
JH
598 * no overlap beyond it within context lines. Paint
599 * the trailing edge a bit.
3ec1909f
JH
600 */
601 i = k;
74065951 602 k = (j + context < cnt+1) ? j + context : cnt+1;
3ec1909f
JH
603 while (j < k)
604 sline[j++].flag |= mark;
605 }
606 return 1;
607}
608
609static int make_hunks(struct sline *sline, unsigned long cnt,
610 int num_parent, int dense)
611{
612 unsigned long all_mask = (1UL<<num_parent) - 1;
613 unsigned long mark = (1UL<<num_parent);
614 unsigned long i;
615 int has_interesting = 0;
616
74065951 617 for (i = 0; i <= cnt; i++) {
3ec1909f
JH
618 if (interesting(&sline[i], all_mask))
619 sline[i].flag |= mark;
620 else
621 sline[i].flag &= ~mark;
af3feefa 622 }
d8f4790e 623 if (!dense)
3ec1909f 624 return give_context(sline, cnt, num_parent);
d8f4790e 625
263eee29
JH
626 /* Look at each hunk, and if we have changes from only one
627 * parent, or the changes are the same from all but one
628 * parent, mark that uninteresting.
d8f4790e
JH
629 */
630 i = 0;
74065951 631 while (i <= cnt) {
3ec1909f 632 unsigned long j, hunk_begin, hunk_end;
bf1c32bd 633 unsigned long same_diff;
74065951 634 while (i <= cnt && !(sline[i].flag & mark))
d8f4790e 635 i++;
74065951 636 if (cnt < i)
d8f4790e 637 break; /* No more interesting hunks */
3ec1909f 638 hunk_begin = i;
74065951 639 for (j = i + 1; j <= cnt; j++) {
3ec1909f
JH
640 if (!(sline[j].flag & mark)) {
641 /* Look beyond the end to see if there
642 * is an interesting line after this
643 * hunk within context span.
644 */
645 unsigned long la; /* lookahead */
646 int contin = 0;
647 la = adjust_hunk_tail(sline, all_mask,
648 hunk_begin, j);
74065951
JH
649 la = (la + context < cnt + 1) ?
650 (la + context) : cnt + 1;
e5e9b565 651 while (la && j <= --la) {
3ec1909f
JH
652 if (sline[la].flag & mark) {
653 contin = 1;
654 break;
655 }
656 }
657 if (!contin)
658 break;
659 j = la;
660 }
661 }
662 hunk_end = j;
663
bf1c32bd 664 /* [i..hunk_end) are interesting. Now is it really
fd4b1d21
JH
665 * interesting? We check if there are only two versions
666 * and the result matches one of them. That is, we look
667 * at:
668 * (+) line, which records lines added to which parents;
669 * this line appears in the result.
670 * (-) line, which records from what parents the line
671 * was removed; this line does not appear in the result.
672 * then check the set of parents the result has difference
673 * from, from all lines. If there are lines that has
674 * different set of parents that the result has differences
675 * from, that means we have more than two versions.
676 *
677 * Even when we have only two versions, if the result does
678 * not match any of the parents, the it should be considered
679 * interesting. In such a case, we would have all '+' line.
680 * After passing the above "two versions" test, that would
681 * appear as "the same set of parents" to be "all parents".
d8f4790e 682 */
bf1c32bd
JH
683 same_diff = 0;
684 has_interesting = 0;
685 for (j = i; j < hunk_end && !has_interesting; j++) {
46dc9412 686 unsigned long this_diff = sline[j].flag & all_mask;
99d32060 687 struct lline *ll = sline[j].lost;
bf1c32bd
JH
688 if (this_diff) {
689 /* This has some changes. Is it the
690 * same as others?
691 */
692 if (!same_diff)
693 same_diff = this_diff;
694 else if (same_diff != this_diff) {
695 has_interesting = 1;
696 break;
697 }
698 }
699 while (ll && !has_interesting) {
700 /* Lost this line from these parents;
701 * who are they? Are they the same?
702 */
703 this_diff = ll->parent_map;
704 if (!same_diff)
705 same_diff = this_diff;
706 else if (same_diff != this_diff) {
707 has_interesting = 1;
708 }
709 ll = ll->next;
710 }
d8f4790e 711 }
bf1c32bd 712
fd4b1d21 713 if (!has_interesting && same_diff != all_mask) {
d8f4790e 714 /* This hunk is not that interesting after all */
3ec1909f 715 for (j = hunk_begin; j < hunk_end; j++)
d8f4790e
JH
716 sline[j].flag &= ~mark;
717 }
718 i = hunk_end;
719 }
3ec1909f
JH
720
721 has_interesting = give_context(sline, cnt, num_parent);
8828cdcb 722 return has_interesting;
af3feefa
JH
723}
724
3b0f5e88 725static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long l1, int n, unsigned long null_context)
f16706cc
JH
726{
727 l0 = sline[l0].p_lno[n];
728 l1 = sline[l1].p_lno[n];
3b0f5e88 729 printf(" -%lu,%lu", l0, l1-l0-null_context);
f16706cc
JH
730}
731
d5f6a01a
JH
732static int hunk_comment_line(const char *bol)
733{
7a8ac59f
JH
734 int ch;
735
736 if (!bol)
737 return 0;
738 ch = *bol & 0xff;
d5f6a01a
JH
739 return (isalpha(ch) || ch == '_' || ch == '$');
740}
741
39280970
JH
742static void show_line_to_eol(const char *line, int len, const char *reset)
743{
744 int saw_cr_at_eol = 0;
745 if (len < 0)
746 len = strlen(line);
747 saw_cr_at_eol = (len && line[len-1] == '\r');
748
749 printf("%.*s%s%s\n", len - saw_cr_at_eol, line,
750 reset,
751 saw_cr_at_eol ? "\r" : "");
752}
753
41ee2ad6
JK
754static void dump_sline(struct sline *sline, const char *line_prefix,
755 unsigned long cnt, int num_parent,
21798708 756 int use_color, int result_deleted)
af3feefa
JH
757{
758 unsigned long mark = (1UL<<num_parent);
c86fbe53 759 unsigned long no_pre_delete = (2UL<<num_parent);
af3feefa 760 int i;
f16706cc 761 unsigned long lno = 0;
567a03d1 762 const char *c_frag = diff_get_color(use_color, DIFF_FRAGINFO);
89cb73a1 763 const char *c_func = diff_get_color(use_color, DIFF_FUNCINFO);
567a03d1
JH
764 const char *c_new = diff_get_color(use_color, DIFF_FILE_NEW);
765 const char *c_old = diff_get_color(use_color, DIFF_FILE_OLD);
8dbf3eb6 766 const char *c_context = diff_get_color(use_color, DIFF_CONTEXT);
567a03d1 767 const char *c_reset = diff_get_color(use_color, DIFF_RESET);
af3feefa 768
21798708 769 if (result_deleted)
4462731e
JH
770 return; /* result deleted */
771
af3feefa 772 while (1) {
8bc7574b
JH
773 unsigned long hunk_end;
774 unsigned long rlines;
d5f6a01a 775 const char *hunk_comment = NULL;
3b0f5e88 776 unsigned long null_context = 0;
d5f6a01a
JH
777
778 while (lno <= cnt && !(sline[lno].flag & mark)) {
779 if (hunk_comment_line(sline[lno].bol))
780 hunk_comment = sline[lno].bol;
af3feefa 781 lno++;
d5f6a01a 782 }
8a470ebf 783 if (cnt < lno)
af3feefa 784 break;
8a470ebf 785 else {
74065951 786 for (hunk_end = lno + 1; hunk_end <= cnt; hunk_end++)
8a470ebf
JH
787 if (!(sline[hunk_end].flag & mark))
788 break;
789 }
74065951
JH
790 rlines = hunk_end - lno;
791 if (cnt < hunk_end)
792 rlines--; /* pointing at the last delete hunk */
3b0f5e88
JH
793
794 if (!context) {
795 /*
796 * Even when running with --unified=0, all
797 * lines in the hunk needs to be processed in
798 * the loop below in order to show the
799 * deletion recorded in lost_head. However,
800 * we do not want to show the resulting line
801 * with all blank context markers in such a
802 * case. Compensate.
803 */
804 unsigned long j;
805 for (j = lno; j < hunk_end; j++)
806 if (!(sline[j].flag & (mark-1)))
807 null_context++;
808 rlines -= null_context;
809 }
810
41ee2ad6 811 printf("%s%s", line_prefix, c_frag);
af3feefa 812 for (i = 0; i <= num_parent; i++) putchar(combine_marker);
f16706cc 813 for (i = 0; i < num_parent; i++)
3b0f5e88 814 show_parent_lno(sline, lno, hunk_end, i, null_context);
74065951 815 printf(" +%lu,%lu ", lno+1, rlines);
af3feefa 816 for (i = 0; i <= num_parent; i++) putchar(combine_marker);
d5f6a01a
JH
817
818 if (hunk_comment) {
819 int comment_end = 0;
820 for (i = 0; i < 40; i++) {
821 int ch = hunk_comment[i] & 0xff;
822 if (!ch || ch == '\n')
823 break;
824 if (!isspace(ch))
825 comment_end = i;
826 }
827 if (comment_end)
89cb73a1 828 printf("%s%s %s%s", c_reset,
8dbf3eb6 829 c_context, c_reset,
89cb73a1 830 c_func);
d5f6a01a
JH
831 for (i = 0; i < comment_end; i++)
832 putchar(hunk_comment[i]);
833 }
834
567a03d1 835 printf("%s\n", c_reset);
af3feefa
JH
836 while (lno < hunk_end) {
837 struct lline *ll;
838 int j;
46dc9412 839 unsigned long p_mask;
fd13b21f 840 struct sline *sl = &sline[lno++];
99d32060 841 ll = (sl->flag & no_pre_delete) ? NULL : sl->lost;
af3feefa 842 while (ll) {
41ee2ad6 843 printf("%s%s", line_prefix, c_old);
af3feefa
JH
844 for (j = 0; j < num_parent; j++) {
845 if (ll->parent_map & (1UL<<j))
846 putchar('-');
847 else
848 putchar(' ');
849 }
39280970 850 show_line_to_eol(ll->line, -1, c_reset);
af3feefa
JH
851 ll = ll->next;
852 }
74065951 853 if (cnt < lno)
8a470ebf 854 break;
46dc9412 855 p_mask = 1;
41ee2ad6 856 fputs(line_prefix, stdout);
3b0f5e88
JH
857 if (!(sl->flag & (mark-1))) {
858 /*
859 * This sline was here to hang the
860 * lost lines in front of it.
861 */
862 if (!context)
863 continue;
8dbf3eb6 864 fputs(c_context, stdout);
3b0f5e88 865 }
567a03d1
JH
866 else
867 fputs(c_new, stdout);
af3feefa 868 for (j = 0; j < num_parent; j++) {
46dc9412 869 if (p_mask & sl->flag)
af3feefa 870 putchar('+');
46dc9412
JH
871 else
872 putchar(' ');
873 p_mask <<= 1;
af3feefa 874 }
39280970 875 show_line_to_eol(sl->bol, sl->len, c_reset);
af3feefa
JH
876 }
877 }
878}
879
3c39e9bd
JH
880static void reuse_combine_diff(struct sline *sline, unsigned long cnt,
881 int i, int j)
882{
883 /* We have already examined parent j and we know parent i
884 * and parent j are the same, so reuse the combined result
885 * of parent j for parent i.
886 */
887 unsigned long lno, imask, jmask;
888 imask = (1UL<<i);
889 jmask = (1UL<<j);
890
8a470ebf 891 for (lno = 0; lno <= cnt; lno++) {
99d32060 892 struct lline *ll = sline->lost;
f16706cc 893 sline->p_lno[i] = sline->p_lno[j];
3c39e9bd
JH
894 while (ll) {
895 if (ll->parent_map & jmask)
896 ll->parent_map |= imask;
897 ll = ll->next;
898 }
46dc9412
JH
899 if (sline->flag & jmask)
900 sline->flag |= imask;
3c39e9bd
JH
901 sline++;
902 }
4462731e
JH
903 /* the overall size of the file (sline[cnt]) */
904 sline->p_lno[i] = sline->p_lno[j];
3c39e9bd
JH
905}
906
462a15bc
JH
907static void dump_quoted_path(const char *head,
908 const char *prefix,
909 const char *path,
41ee2ad6 910 const char *line_prefix,
567a03d1 911 const char *c_meta, const char *c_reset)
eab144ac 912{
462a15bc
JH
913 static struct strbuf buf = STRBUF_INIT;
914
915 strbuf_reset(&buf);
41ee2ad6 916 strbuf_addstr(&buf, line_prefix);
462a15bc
JH
917 strbuf_addstr(&buf, c_meta);
918 strbuf_addstr(&buf, head);
d5625091 919 quote_two_c_style(&buf, prefix, path, 0);
462a15bc
JH
920 strbuf_addstr(&buf, c_reset);
921 puts(buf.buf);
eab144ac
LT
922}
923
7c978a06
JK
924static void show_combined_header(struct combine_diff_path *elem,
925 int num_parent,
926 int dense,
927 struct rev_info *rev,
41ee2ad6 928 const char *line_prefix,
4d5f3471
JK
929 int mode_differs,
930 int show_file_header)
7c978a06
JK
931{
932 struct diff_options *opt = &rev->diffopt;
0d1e0e78 933 int abbrev = opt->flags.full_index ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV;
7c978a06
JK
934 const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";
935 const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";
f1c96261
JK
936 const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO);
937 const char *c_reset = diff_get_color_opt(opt, DIFF_RESET);
7c978a06
JK
938 const char *abb;
939 int added = 0;
940 int deleted = 0;
941 int i;
942
943 if (rev->loginfo && !rev->no_commit_id)
944 show_log(rev);
945
946 dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
41ee2ad6
JK
947 "", elem->path, line_prefix, c_meta, c_reset);
948 printf("%s%sindex ", line_prefix, c_meta);
7c978a06 949 for (i = 0; i < num_parent; i++) {
aab9583f 950 abb = find_unique_abbrev(&elem->parent[i].oid,
7c978a06
JK
951 abbrev);
952 printf("%s%s", i ? "," : "", abb);
953 }
aab9583f 954 abb = find_unique_abbrev(&elem->oid, abbrev);
7c978a06
JK
955 printf("..%s%s\n", abb, c_reset);
956
957 if (mode_differs) {
958 deleted = !elem->mode;
959
960 /* We say it was added if nobody had it */
961 added = !deleted;
962 for (i = 0; added && i < num_parent; i++)
963 if (elem->parent[i].status !=
964 DIFF_STATUS_ADDED)
965 added = 0;
966 if (added)
41ee2ad6
JK
967 printf("%s%snew file mode %06o",
968 line_prefix, c_meta, elem->mode);
7c978a06
JK
969 else {
970 if (deleted)
41ee2ad6
JK
971 printf("%s%sdeleted file ",
972 line_prefix, c_meta);
7c978a06
JK
973 printf("mode ");
974 for (i = 0; i < num_parent; i++) {
975 printf("%s%06o", i ? "," : "",
976 elem->parent[i].mode);
977 }
978 if (elem->mode)
979 printf("..%06o", elem->mode);
980 }
981 printf("%s\n", c_reset);
982 }
983
4d5f3471
JK
984 if (!show_file_header)
985 return;
986
d76ce4f7
EN
987 if (rev->combined_all_paths) {
988 for (i = 0; i < num_parent; i++) {
989 char *path = filename_changed(elem->parent[i].status)
990 ? elem->parent[i].path.buf : elem->path;
991 if (elem->parent[i].status == DIFF_STATUS_ADDED)
992 dump_quoted_path("--- ", "", "/dev/null",
993 line_prefix, c_meta, c_reset);
994 else
995 dump_quoted_path("--- ", a_prefix, path,
996 line_prefix, c_meta, c_reset);
997 }
998 } else {
999 if (added)
1000 dump_quoted_path("--- ", "", "/dev/null",
1001 line_prefix, c_meta, c_reset);
1002 else
1003 dump_quoted_path("--- ", a_prefix, elem->path,
1004 line_prefix, c_meta, c_reset);
1005 }
7c978a06
JK
1006 if (deleted)
1007 dump_quoted_path("+++ ", "", "/dev/null",
41ee2ad6 1008 line_prefix, c_meta, c_reset);
7c978a06
JK
1009 else
1010 dump_quoted_path("+++ ", b_prefix, elem->path,
41ee2ad6 1011 line_prefix, c_meta, c_reset);
7c978a06
JK
1012}
1013
89b0c4b5 1014static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
99694544
JH
1015 int dense, int working_tree_file,
1016 struct rev_info *rev)
af3feefa 1017{
91539833 1018 struct diff_options *opt = &rev->diffopt;
f23fc773 1019 unsigned long result_size, cnt, lno;
21798708 1020 int result_deleted = 0;
310f8b5b 1021 char *result, *cp;
af3feefa 1022 struct sline *sline; /* survived lines */
2454c962 1023 int mode_differs = 0;
89b0c4b5 1024 int i, show_hunks;
f23fc773 1025 mmfile_t result_file;
4d5f3471 1026 struct userdiff_driver *userdiff;
0508fe53 1027 struct userdiff_driver *textconv = NULL;
4d5f3471 1028 int is_binary;
41ee2ad6 1029 const char *line_prefix = diff_line_prefix(opt);
af3feefa 1030
ee1e5412 1031 context = opt->context;
acd00ea0 1032 userdiff = userdiff_find_by_path(opt->repo->index, elem->path);
4d5f3471
JK
1033 if (!userdiff)
1034 userdiff = userdiff_find_by_name("default");
0d1e0e78 1035 if (opt->flags.allow_textconv)
bd7ad45b 1036 textconv = userdiff_get_textconv(opt->repo, userdiff);
a5a818ee 1037
af3feefa 1038 /* Read the result of merge first */
f23fc773 1039 if (!working_tree_file)
6afaf807 1040 result = grab_blob(opt->repo, &elem->oid, elem->mode, &result_size,
0508fe53 1041 textconv, elem->path);
ea726d02 1042 else {
9843a1f6 1043 /* Used by diff-tree to read from the working tree */
ea726d02 1044 struct stat st;
4fc970c4
JH
1045 int fd = -1;
1046
1047 if (lstat(elem->path, &st) < 0)
1048 goto deleted_file;
1049
1050 if (S_ISLNK(st.st_mode)) {
912342d9
JH
1051 struct strbuf buf = STRBUF_INIT;
1052
1053 if (strbuf_readlink(&buf, elem->path, st.st_size) < 0) {
4b94ec9b 1054 error_errno("readlink(%s)", elem->path);
4fc970c4
JH
1055 return;
1056 }
912342d9
JH
1057 result_size = buf.len;
1058 result = strbuf_detach(&buf, NULL);
4fc970c4 1059 elem->mode = canon_mode(st.st_mode);
7dae8b21 1060 } else if (S_ISDIR(st.st_mode)) {
1ff57c13 1061 struct object_id oid;
a98e6101 1062 if (resolve_gitlink_ref(elem->path, "HEAD", &oid) < 0)
6afaf807
NTND
1063 result = grab_blob(opt->repo, &elem->oid,
1064 elem->mode, &result_size,
1065 NULL, NULL);
7dae8b21 1066 else
6afaf807 1067 result = grab_blob(opt->repo, &oid, elem->mode,
0508fe53
JK
1068 &result_size, NULL, NULL);
1069 } else if (textconv) {
1070 struct diff_filespec *df = alloc_filespec(elem->path);
f9704c2d 1071 fill_filespec(df, &null_oid, 0, st.st_mode);
6afaf807 1072 result_size = fill_textconv(opt->repo, textconv, df, &result);
0508fe53 1073 free_filespec(df);
91fcbcbd 1074 } else if (0 <= (fd = open(elem->path, O_RDONLY))) {
dc49cd76 1075 size_t len = xsize_t(st.st_size);
c697ad14 1076 ssize_t done;
a249a9b5 1077 int is_file, i;
ea726d02 1078
1b0c7174 1079 elem->mode = canon_mode(st.st_mode);
a249a9b5
JS
1080 /* if symlinks don't work, assume symlink if all parents
1081 * are symlinks
1082 */
1083 is_file = has_symlinks;
1084 for (i = 0; !is_file && i < num_parent; i++)
1085 is_file = !S_ISLNK(elem->parent[i].mode);
1086 if (!is_file)
1087 elem->mode = canon_mode(S_IFLNK);
1088
f23fc773 1089 result_size = len;
3733e694 1090 result = xmallocz(len);
c697ad14
HO
1091
1092 done = read_in_full(fd, result, len);
1093 if (done < 0)
0721c314 1094 die_errno("read error '%s'", elem->path);
c697ad14
HO
1095 else if (done < len)
1096 die("early EOF '%s'", elem->path);
1097
5e568f9e
AG
1098 /* If not a fake symlink, apply filters, e.g. autocrlf */
1099 if (is_file) {
f285a2d7 1100 struct strbuf buf = STRBUF_INIT;
5e568f9e 1101
0734f209
NTND
1102 if (convert_to_git(rev->diffopt.repo->index,
1103 elem->path, result, len, &buf, global_conv_flags_eol)) {
5e568f9e
AG
1104 free(result);
1105 result = strbuf_detach(&buf, &len);
1106 result_size = len;
1107 }
1108 }
ea726d02
JH
1109 }
1110 else {
4fc970c4 1111 deleted_file:
21798708 1112 result_deleted = 1;
f23fc773 1113 result_size = 0;
713a11fc 1114 elem->mode = 0;
28f75818 1115 result = xcalloc(1, 1);
ea726d02 1116 }
4fc970c4 1117
ea726d02
JH
1118 if (0 <= fd)
1119 close(fd);
1120 }
af3feefa 1121
c95b99bb
JK
1122 for (i = 0; i < num_parent; i++) {
1123 if (elem->parent[i].mode != elem->mode) {
1124 mode_differs = 1;
1125 break;
1126 }
1127 }
1128
0508fe53
JK
1129 if (textconv)
1130 is_binary = 0;
1131 else if (userdiff->binary != -1)
4d5f3471
JK
1132 is_binary = userdiff->binary;
1133 else {
1134 is_binary = buffer_is_binary(result, result_size);
1135 for (i = 0; !is_binary && i < num_parent; i++) {
1136 char *buf;
1137 unsigned long size;
6afaf807
NTND
1138 buf = grab_blob(opt->repo,
1139 &elem->parent[i].oid,
4d5f3471 1140 elem->parent[i].mode,
0508fe53 1141 &size, NULL, NULL);
4d5f3471
JK
1142 if (buffer_is_binary(buf, size))
1143 is_binary = 1;
1144 free(buf);
1145 }
1146 }
1147 if (is_binary) {
1148 show_combined_header(elem, num_parent, dense, rev,
41ee2ad6 1149 line_prefix, mode_differs, 0);
4d5f3471
JK
1150 printf("Binary files differ\n");
1151 free(result);
1152 return;
1153 }
1154
2386c297 1155 for (cnt = 0, cp = result; cp < result + result_size; cp++) {
af3feefa
JH
1156 if (*cp == '\n')
1157 cnt++;
1158 }
f23fc773 1159 if (result_size && result[result_size-1] != '\n')
af3feefa
JH
1160 cnt++; /* incomplete line */
1161
50a6c8ef 1162 sline = xcalloc(st_add(cnt, 2), sizeof(*sline));
af3feefa 1163 sline[0].bol = result;
2386c297 1164 for (lno = 0, cp = result; cp < result + result_size; cp++) {
af3feefa
JH
1165 if (*cp == '\n') {
1166 sline[lno].len = cp - sline[lno].bol;
af3feefa
JH
1167 lno++;
1168 if (lno < cnt)
1169 sline[lno].bol = cp + 1;
1170 }
1171 }
f23fc773
JH
1172 if (result_size && result[result_size-1] != '\n')
1173 sline[cnt-1].len = result_size - (sline[cnt-1].bol - result);
1174
1175 result_file.ptr = result;
1176 result_file.size = result_size;
af3feefa 1177
8a470ebf
JH
1178 /* Even p_lno[cnt+1] is valid -- that is for the end line number
1179 * for deletion hunk at the end.
1180 */
50a6c8ef 1181 sline[0].p_lno = xcalloc(st_mult(st_add(cnt, 2), num_parent), sizeof(unsigned long));
8a470ebf 1182 for (lno = 0; lno <= cnt; lno++)
f16706cc
JH
1183 sline[lno+1].p_lno = sline[lno].p_lno + num_parent;
1184
3c39e9bd
JH
1185 for (i = 0; i < num_parent; i++) {
1186 int j;
1187 for (j = 0; j < i; j++) {
4a7e27e9
JK
1188 if (oideq(&elem->parent[i].oid,
1189 &elem->parent[j].oid)) {
3c39e9bd
JH
1190 reuse_combine_diff(sline, cnt, i, j);
1191 break;
1192 }
1193 }
1194 if (i <= j)
6afaf807
NTND
1195 combine_diff(opt->repo,
1196 &elem->parent[i].oid,
7dae8b21
JH
1197 elem->parent[i].mode,
1198 &result_file, sline,
0508fe53 1199 cnt, i, num_parent, result_deleted,
fa04ae0b 1200 textconv, elem->path, opt->xdl_opts);
3c39e9bd 1201 }
af3feefa 1202
8828cdcb 1203 show_hunks = make_hunks(sline, cnt, num_parent, dense);
af3feefa 1204
713a11fc 1205 if (show_hunks || mode_differs || working_tree_file) {
7c978a06 1206 show_combined_header(elem, num_parent, dense, rev,
41ee2ad6
JK
1207 line_prefix, mode_differs, 1);
1208 dump_sline(sline, line_prefix, cnt, num_parent,
f1c96261 1209 opt->use_color, result_deleted);
8828cdcb 1210 }
af3feefa
JH
1211 free(result);
1212
2386c297 1213 for (lno = 0; lno < cnt; lno++) {
99d32060
AP
1214 if (sline[lno].lost) {
1215 struct lline *ll = sline[lno].lost;
af3feefa
JH
1216 while (ll) {
1217 struct lline *tmp = ll;
1218 ll = ll->next;
1219 free(tmp);
1220 }
1221 }
1222 }
46dc9412 1223 free(sline[0].p_lno);
af3feefa
JH
1224 free(sline);
1225}
1226
91539833 1227static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct rev_info *rev)
ee638024 1228{
91539833 1229 struct diff_options *opt = &rev->diffopt;
77667051 1230 int line_termination, inter_name_termination, i;
41ee2ad6 1231 const char *line_prefix = diff_line_prefix(opt);
ee638024
LT
1232
1233 line_termination = opt->line_termination;
1234 inter_name_termination = '\t';
1235 if (!line_termination)
1236 inter_name_termination = 0;
1237
44152787 1238 if (rev->loginfo && !rev->no_commit_id)
02865655 1239 show_log(rev);
ee638024 1240
a1d68bea 1241
c6744349 1242 if (opt->output_format & DIFF_FORMAT_RAW) {
41ee2ad6 1243 printf("%s", line_prefix);
a1d68bea 1244
77667051
JH
1245 /* As many colons as there are parents */
1246 for (i = 0; i < num_parent; i++)
1247 putchar(':');
0a798076
JH
1248
1249 /* Show the modes */
77667051
JH
1250 for (i = 0; i < num_parent; i++)
1251 printf("%06o ", p->parent[i].mode);
1252 printf("%06o", p->mode);
0a798076
JH
1253
1254 /* Show sha1's */
1255 for (i = 0; i < num_parent; i++)
d6cece51 1256 printf(" %s", diff_aligned_abbrev(&p->parent[i].oid,
d5e3b01e 1257 opt->abbrev));
d6cece51 1258 printf(" %s ", diff_aligned_abbrev(&p->oid, opt->abbrev));
0a798076
JH
1259 }
1260
c6744349 1261 if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) {
d416df88
JH
1262 for (i = 0; i < num_parent; i++)
1263 putchar(p->parent[i].status);
1264 putchar(inter_name_termination);
1265 }
0a798076 1266
d76ce4f7
EN
1267 for (i = 0; i < num_parent; i++)
1268 if (rev->combined_all_paths) {
1269 if (filename_changed(p->parent[i].status))
1270 write_name_quoted(p->parent[i].path.buf, stdout,
1271 inter_name_termination);
1272 else
1273 write_name_quoted(p->path, stdout,
1274 inter_name_termination);
1275 }
663af342 1276 write_name_quoted(p->path, stdout, line_termination);
0a798076
JH
1277}
1278
99694544
JH
1279/*
1280 * The result (p->elem) is from the working tree and their
1281 * parents are typically from multiple stages during a merge
1282 * (i.e. diff-files) or the state in HEAD and in the index
1283 * (i.e. diff-index).
1284 */
91539833 1285void show_combined_diff(struct combine_diff_path *p,
0a798076
JH
1286 int num_parent,
1287 int dense,
91539833 1288 struct rev_info *rev)
0a798076 1289{
91539833 1290 struct diff_options *opt = &rev->diffopt;
41ee2ad6 1291
c6744349
TH
1292 if (opt->output_format & (DIFF_FORMAT_RAW |
1293 DIFF_FORMAT_NAME |
89b0c4b5 1294 DIFF_FORMAT_NAME_STATUS))
91539833 1295 show_raw_diff(p, num_parent, rev);
89b0c4b5 1296 else if (opt->output_format & DIFF_FORMAT_PATCH)
99694544 1297 show_patch_diff(p, num_parent, dense, 1, rev);
ee638024
LT
1298}
1299
25e5e2bf
JH
1300static void free_combined_pair(struct diff_filepair *pair)
1301{
1302 free(pair->two);
1303 free(pair);
1304}
1305
1306/*
1307 * A combine_diff_path expresses N parents on the LHS against 1 merge
1308 * result. Synthesize a diff_filepair that has N entries on the "one"
1309 * side and 1 entry on the "two" side.
1310 *
1311 * In the future, we might want to add more data to combine_diff_path
1312 * so that we can fill fields we are ignoring (most notably, size) here,
1313 * but currently nobody uses it, so this should suffice for now.
1314 */
1315static struct diff_filepair *combined_pair(struct combine_diff_path *p,
1316 int num_parent)
1317{
1318 int i;
1319 struct diff_filepair *pair;
1320 struct diff_filespec *pool;
1321
1322 pair = xmalloc(sizeof(*pair));
50a6c8ef 1323 pool = xcalloc(st_add(num_parent, 1), sizeof(struct diff_filespec));
25e5e2bf
JH
1324 pair->one = pool + 1;
1325 pair->two = pool;
1326
1327 for (i = 0; i < num_parent; i++) {
1328 pair->one[i].path = p->path;
1329 pair->one[i].mode = p->parent[i].mode;
a0d12c44 1330 oidcpy(&pair->one[i].oid, &p->parent[i].oid);
41c9560e 1331 pair->one[i].oid_valid = !is_null_oid(&p->parent[i].oid);
25e5e2bf
JH
1332 pair->one[i].has_more_entries = 1;
1333 }
1334 pair->one[num_parent - 1].has_more_entries = 0;
1335
1336 pair->two->path = p->path;
1337 pair->two->mode = p->mode;
a0d12c44 1338 oidcpy(&pair->two->oid, &p->oid);
41c9560e 1339 pair->two->oid_valid = !is_null_oid(&p->oid);
25e5e2bf
JH
1340 return pair;
1341}
1342
1343static void handle_combined_callback(struct diff_options *opt,
1344 struct combine_diff_path *paths,
1345 int num_parent,
1346 int num_paths)
1347{
1348 struct combine_diff_path *p;
1349 struct diff_queue_struct q;
1350 int i;
1351
1352 q.queue = xcalloc(num_paths, sizeof(struct diff_filepair *));
1353 q.alloc = num_paths;
1354 q.nr = num_paths;
af82c788 1355 for (i = 0, p = paths; p; p = p->next)
25e5e2bf 1356 q.queue[i++] = combined_pair(p, num_parent);
25e5e2bf
JH
1357 opt->format_callback(&q, opt, opt->format_callback_data);
1358 for (i = 0; i < num_paths; i++)
1359 free_combined_pair(q.queue[i]);
1360 free(q.queue);
1361}
1362
8518ff8f
KS
1363static const char *path_path(void *obj)
1364{
1365 struct combine_diff_path *path = (struct combine_diff_path *)obj;
1366
1367 return path->path;
1368}
1369
8817f0cc
JK
1370/*
1371 * Diff stat formats which we always compute solely against the first parent.
1372 */
1373#define STAT_FORMAT_MASK (DIFF_FORMAT_NUMSTAT \
8290faa0 1374 | DIFF_FORMAT_SHORTSTAT \
04b19fca 1375 | DIFF_FORMAT_SUMMARY \
dac03b55 1376 | DIFF_FORMAT_DIRSTAT \
8817f0cc 1377 | DIFF_FORMAT_DIFFSTAT)
eeb3f328
KS
1378
1379/* find set of paths that every parent touches */
09fae19a 1380static struct combine_diff_path *find_paths_generic(const struct object_id *oid,
d76ce4f7
EN
1381 const struct oid_array *parents,
1382 struct diff_options *opt,
1383 int combined_all_paths)
eeb3f328
KS
1384{
1385 struct combine_diff_path *paths = NULL;
1386 int i, num_parent = parents->nr;
1387
1388 int output_format = opt->output_format;
1389 const char *orderfile = opt->orderfile;
1390
1391 opt->output_format = DIFF_FORMAT_NO_OUTPUT;
1392 /* tell diff_tree to emit paths in sorted (=tree) order */
1393 opt->orderfile = NULL;
1394
7195fbfa 1395 /* D(A,P1...Pn) = D(A,P1) ^ ... ^ D(A,Pn) (wrt paths) */
eeb3f328
KS
1396 for (i = 0; i < num_parent; i++) {
1397 /*
1398 * show stat against the first parent even when doing
1399 * combined diff.
1400 */
8817f0cc 1401 int stat_opt = output_format & STAT_FORMAT_MASK;
eeb3f328
KS
1402 if (i == 0 && stat_opt)
1403 opt->output_format = stat_opt;
1404 else
1405 opt->output_format = DIFF_FORMAT_NO_OUTPUT;
66f414f8 1406 diff_tree_oid(&parents->oid[i], oid, "", opt);
eeb3f328 1407 diffcore_std(opt);
d76ce4f7
EN
1408 paths = intersect_paths(paths, i, num_parent,
1409 combined_all_paths);
eeb3f328
KS
1410
1411 /* if showing diff, show it in requested order */
1412 if (opt->output_format != DIFF_FORMAT_NO_OUTPUT &&
1413 orderfile) {
1414 diffcore_order(orderfile);
1415 }
1416
1417 diff_flush(opt);
1418 }
1419
1420 opt->output_format = output_format;
1421 opt->orderfile = orderfile;
1422 return paths;
1423}
1424
1425
7195fbfa
KS
1426/*
1427 * find set of paths that everybody touches, assuming diff is run without
1428 * rename/copy detection, etc, comparing all trees simultaneously (= faster).
1429 */
1430static struct combine_diff_path *find_paths_multitree(
09fae19a 1431 const struct object_id *oid, const struct oid_array *parents,
7195fbfa
KS
1432 struct diff_options *opt)
1433{
1434 int i, nparent = parents->nr;
fda94b41 1435 const struct object_id **parents_oid;
7195fbfa
KS
1436 struct combine_diff_path paths_head;
1437 struct strbuf base;
1438
fda94b41 1439 ALLOC_ARRAY(parents_oid, nparent);
7195fbfa 1440 for (i = 0; i < nparent; i++)
fda94b41 1441 parents_oid[i] = &parents->oid[i];
7195fbfa
KS
1442
1443 /* fake list head, so worker can assume it is non-NULL */
1444 paths_head.next = NULL;
1445
1446 strbuf_init(&base, PATH_MAX);
fda94b41 1447 diff_tree_paths(&paths_head, oid, parents_oid, nparent, &base, opt);
7195fbfa
KS
1448
1449 strbuf_release(&base);
fda94b41 1450 free(parents_oid);
7195fbfa
KS
1451 return paths_head.next;
1452}
1453
1454
b9acf54d 1455void diff_tree_combined(const struct object_id *oid,
910650d2 1456 const struct oid_array *parents,
0fe7c1de
JH
1457 int dense,
1458 struct rev_info *rev)
af3feefa 1459{
91539833 1460 struct diff_options *opt = &rev->diffopt;
af3feefa 1461 struct diff_options diffopts;
eeb3f328 1462 struct combine_diff_path *p, *paths;
0041f09d 1463 int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
7195fbfa 1464 int need_generic_pathscan;
af3feefa 1465
51af1886
KS
1466 /* nothing to do, if no parents */
1467 if (!num_parent)
1468 return;
1469
1470 show_log_first = !!rev->loginfo && !rev->no_commit_id;
1471 needsep = 0;
1472 if (show_log_first) {
1473 show_log(rev);
1474
e7cc0ede 1475 if (rev->verbose_header && opt->output_format &&
b9c7d6e4
JK
1476 opt->output_format != DIFF_FORMAT_NO_OUTPUT &&
1477 !commit_format_is_empty(rev->commit_format))
51af1886
KS
1478 printf("%s%c", diff_line_prefix(opt),
1479 opt->line_termination);
1480 }
1481
5b236832 1482 diffopts = *opt;
bd1928df 1483 copy_pathspec(&diffopts.pathspec, &opt->pathspec);
0d1e0e78
BW
1484 diffopts.flags.recursive = 1;
1485 diffopts.flags.allow_external = 0;
af3feefa 1486
eeb3f328
KS
1487 /* find set of paths that everybody touches
1488 *
7195fbfa
KS
1489 * NOTE
1490 *
1491 * Diffcore transformations are bound to diff_filespec and logic
1492 * comparing two entries - i.e. they do not apply directly to combine
1493 * diff.
1494 *
1495 * If some of such transformations is requested - we launch generic
1496 * path scanning, which works significantly slower compared to
1497 * simultaneous all-trees-in-one-go scan in find_paths_multitree().
1498 *
1499 * TODO some of the filters could be ported to work on
1500 * combine_diff_paths - i.e. all functionality that skips paths, so in
1501 * theory, we could end up having only multitree path scanning.
1502 *
1503 * NOTE please keep this semantically in sync with diffcore_std()
eeb3f328 1504 */
7195fbfa 1505 need_generic_pathscan = opt->skip_stat_unmatch ||
0d1e0e78 1506 opt->flags.follow_renames ||
7195fbfa
KS
1507 opt->break_opt != -1 ||
1508 opt->detect_rename ||
cf63051a 1509 (opt->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
7195fbfa
KS
1510 opt->filter;
1511
1512
1513 if (need_generic_pathscan) {
1514 /*
1515 * NOTE generic case also handles --stat, as it computes
1516 * diff(sha1,parent_i) for all i to do the job, specifically
1517 * for parent0.
1518 */
d76ce4f7
EN
1519 paths = find_paths_generic(oid, parents, &diffopts,
1520 rev->combined_all_paths);
7195fbfa
KS
1521 }
1522 else {
1523 int stat_opt;
09fae19a 1524 paths = find_paths_multitree(oid, parents, &diffopts);
7195fbfa
KS
1525
1526 /*
1527 * show stat against the first parent even
1528 * when doing combined diff.
1529 */
8817f0cc 1530 stat_opt = opt->output_format & STAT_FORMAT_MASK;
7195fbfa
KS
1531 if (stat_opt) {
1532 diffopts.output_format = stat_opt;
1533
66f414f8 1534 diff_tree_oid(&parents->oid[0], oid, "", &diffopts);
7195fbfa
KS
1535 diffcore_std(&diffopts);
1536 if (opt->orderfile)
1537 diffcore_order(opt->orderfile);
1538 diff_flush(&diffopts);
1539 }
1540 }
af3feefa 1541
af82c788
KS
1542 /* find out number of surviving paths */
1543 for (num_paths = 0, p = paths; p; p = p->next)
1544 num_paths++;
8518ff8f
KS
1545
1546 /* order paths according to diffcore_order */
1547 if (opt->orderfile && num_paths) {
1548 struct obj_order *o;
1549
b32fa95f 1550 ALLOC_ARRAY(o, num_paths);
8518ff8f
KS
1551 for (i = 0, p = paths; p; p = p->next, i++)
1552 o[i].obj = p;
1553 order_objects(opt->orderfile, path_path, o, num_paths);
1554 for (i = 0; i < num_paths - 1; i++) {
1555 p = o[i].obj;
1556 p->next = o[i+1].obj;
1557 }
1558
1559 p = o[num_paths-1].obj;
1560 p->next = NULL;
1561 paths = o[0].obj;
1562 free(o);
1563 }
1564
1565
e3c3a550 1566 if (num_paths) {
c6744349
TH
1567 if (opt->output_format & (DIFF_FORMAT_RAW |
1568 DIFF_FORMAT_NAME |
1569 DIFF_FORMAT_NAME_STATUS)) {
af82c788
KS
1570 for (p = paths; p; p = p->next)
1571 show_raw_diff(p, num_parent, rev);
3969cf7d 1572 needsep = 1;
86ff1d20 1573 }
8817f0cc 1574 else if (opt->output_format & STAT_FORMAT_MASK)
3969cf7d 1575 needsep = 1;
25e5e2bf
JH
1576 else if (opt->output_format & DIFF_FORMAT_CALLBACK)
1577 handle_combined_callback(opt, paths, num_parent, num_paths);
1578
c6744349 1579 if (opt->output_format & DIFF_FORMAT_PATCH) {
3969cf7d 1580 if (needsep)
41ee2ad6
JK
1581 printf("%s%c", diff_line_prefix(opt),
1582 opt->line_termination);
af82c788
KS
1583 for (p = paths; p; p = p->next)
1584 show_patch_diff(p, num_parent, dense,
1585 0, rev);
af3feefa
JH
1586 }
1587 }
1588
1589 /* Clean things up */
1590 while (paths) {
ea726d02 1591 struct combine_diff_path *tmp = paths;
af3feefa 1592 paths = paths->next;
d76ce4f7
EN
1593 for (i = 0; i < num_parent; i++)
1594 if (rev->combined_all_paths &&
1595 filename_changed(tmp->parent[i].status))
1596 strbuf_release(&tmp->parent[i].path);
af3feefa
JH
1597 free(tmp);
1598 }
46ec510a 1599
ed6e8038 1600 clear_pathspec(&diffopts.pathspec);
af3feefa 1601}
0fe7c1de 1602
82889295
RS
1603void diff_tree_combined_merge(const struct commit *commit, int dense,
1604 struct rev_info *rev)
0fe7c1de 1605{
53d00b39 1606 struct commit_list *parent = get_saved_parents(rev, commit);
910650d2 1607 struct oid_array parents = OID_ARRAY_INIT;
0041f09d
RS
1608
1609 while (parent) {
910650d2 1610 oid_array_append(&parents, &parent->item->object.oid);
0041f09d
RS
1611 parent = parent->next;
1612 }
b9acf54d 1613 diff_tree_combined(&commit->object.oid, &parents, dense, rev);
910650d2 1614 oid_array_clear(&parents);
0fe7c1de 1615}