8 struct path_list *next;
11 unsigned char sha1[20];
12 unsigned char parent_sha1[FLEX_ARRAY][20];
15 static int uninteresting(struct diff_filepair *p)
17 if (diff_unmodified_pair(p))
19 if (!S_ISREG(p->one->mode) || !S_ISREG(p->two->mode))
24 static struct path_list *intersect_paths(struct path_list *curr,
25 int n, int num_parent)
27 struct diff_queue_struct *q = &diff_queued_diff;
32 struct path_list *list = NULL, **tail = &list;
33 for (i = 0; i < q->nr; i++) {
36 if (uninteresting(q->queue[i]))
38 path = q->queue[i]->two->path;
41 p = xmalloc(sizeof(*p) + len + 1 + num_parent * 20);
42 p->path = (char*) &(p->parent_sha1[num_parent][0]);
43 memcpy(p->path, path, len);
47 memcpy(p->sha1, q->queue[i]->two->sha1, 20);
48 memcpy(p->parent_sha1[n], q->queue[i]->one->sha1, 20);
55 for (p = curr; p; p = p->next) {
59 for (i = 0; i < q->nr; i++) {
63 if (uninteresting(q->queue[i]))
65 path = q->queue[i]->two->path;
67 if (len == p->len && !memcmp(path, p->path, len)) {
69 memcpy(p->parent_sha1[n],
70 q->queue[i]->one->sha1, 20);
83 unsigned long parent_map;
84 char line[FLEX_ARRAY];
88 struct lline *lost_head, **lost_tail;
94 static char *grab_blob(const unsigned char *sha1, unsigned long *size)
98 if (!memcmp(sha1, null_sha1, 20)) {
101 return xcalloc(1, 1);
103 blob = read_sha1_file(sha1, type, size);
104 if (strcmp(type, "blob"))
105 die("object '%s' is not a blob!", sha1_to_hex(sha1));
109 #define TMPPATHLEN 50
110 #define MAXLINELEN 10240
112 static void write_to_temp_file(char *tmpfile, void *blob, unsigned long size)
114 int fd = git_mkstemp(tmpfile, TMPPATHLEN, ".diff_XXXXXX");
116 die("unable to create temp-file");
117 if (write(fd, blob, size) != size)
118 die("unable to write temp-file");
122 static void write_temp_blob(char *tmpfile, const unsigned char *sha1)
126 blob = grab_blob(sha1, &size);
127 write_to_temp_file(tmpfile, blob, size);
131 static int parse_num(char **cp_p, unsigned int *num_p)
134 unsigned int num = 0;
137 while ('0' <= *cp && *cp <= '9')
138 num = num * 10 + *cp++ - '0';
139 if (!(read_some = cp - *cp_p))
146 static int parse_hunk_header(char *line, int len,
147 unsigned int *ob, unsigned int *on,
148 unsigned int *nb, unsigned int *nn)
152 if (parse_num(&cp, ob)) {
154 return error("malformed diff output: %s", line);
158 if (parse_num(&cp, on))
163 if (*cp++ != ' ' || *cp++ != '+')
165 if (parse_num(&cp, nb))
169 if (parse_num(&cp, nn))
174 return -!!memcmp(cp, " @@", 3);
177 static void append_lost(struct sline *sline, int n, const char *line)
180 int len = strlen(line);
181 unsigned long this_mask = (1UL<<n);
182 if (line[len-1] == '\n')
185 /* Check to see if we can squash things */
186 if (sline->lost_head) {
187 struct lline *last_one = NULL;
188 /* We cannot squash it with earlier one */
189 for (lline = sline->lost_head;
192 if (lline->parent_map & this_mask)
194 lline = last_one ? last_one->next : sline->lost_head;
196 if (lline->len == len &&
197 !memcmp(lline->line, line, len)) {
198 lline->parent_map |= this_mask;
205 lline = xmalloc(sizeof(*lline) + len + 1);
208 lline->parent_map = this_mask;
209 memcpy(lline->line, line, len);
210 lline->line[len] = 0;
211 *sline->lost_tail = lline;
212 sline->lost_tail = &lline->next;
215 static void combine_diff(const unsigned char *parent, const char *ourtmp,
216 struct sline *sline, int cnt, int n)
219 char parent_tmp[TMPPATHLEN];
220 char cmd[TMPPATHLEN * 2 + 1024];
221 char line[MAXLINELEN];
222 unsigned int lno, ob, on, nb, nn;
223 unsigned long pmask = ~(1UL << n);
224 struct sline *lost_bucket = NULL;
226 write_temp_blob(parent_tmp, parent);
227 sprintf(cmd, "diff --unified=0 -La/x -Lb/x '%s' '%s'",
229 in = popen(cmd, "r");
234 while (fgets(line, sizeof(line), in) != NULL) {
235 int len = strlen(line);
236 if (5 < len && !memcmp("@@ -", line, 4)) {
237 if (parse_hunk_header(line, len,
242 /* @@ -1,2 +0,0 @@ to remove the
247 lost_bucket = &sline[nb-1]; /* sline is 0 based */
254 append_lost(lost_bucket, n, line+1);
257 sline[lno-1].flag &= pmask;
266 static unsigned long context = 3;
267 static char combine_marker = '@';
269 static int interesting(struct sline *sline, unsigned long all_mask)
271 return ((sline->flag & all_mask) != all_mask || sline->lost_head);
274 static unsigned long line_diff_parents(struct sline *sline, unsigned long all_mask)
277 * Look at the line and see from which parents we have difference.
278 * Lower bits of sline->flag records if the parent had this line,
279 * so XOR with all_mask gives us on-bits for parents we have
282 unsigned long parents = (sline->flag ^ all_mask);
283 if (sline->lost_head) {
285 for (ll = sline->lost_head; ll; ll = ll->next)
286 parents |= ll->parent_map;
288 return parents & all_mask;
291 static void make_hunks(struct sline *sline, unsigned long cnt,
292 int num_parent, int dense)
294 unsigned long all_mask = (1UL<<num_parent) - 1;
295 unsigned long mark = (1UL<<num_parent);
300 if (interesting(&sline[i], all_mask)) {
301 unsigned long j = (context < i) ? i - context : 0;
303 sline[j++].flag |= mark;
305 if (!interesting(&sline[i], all_mask))
307 sline[i].flag |= mark;
309 j = (i + context < cnt) ? i + context : cnt;
311 sline[i++].flag |= mark;
319 /* Look at each hunk, and if it contains changes from only
320 * one parent, mark that uninteresting.
324 int j, hunk_end, diffs;
325 unsigned long parents;
326 while (i < cnt && !(sline[i].flag & mark))
329 break; /* No more interesting hunks */
330 for (hunk_end = i + 1; hunk_end < cnt; hunk_end++)
331 if (!(sline[hunk_end].flag & mark))
333 /* [i..hunk_end) are interesting. Now is it from
335 * If lost lines are only from one parent and
336 * remaining lines existed in parents other than
337 * that parent, then the hunk is not that interesting.
341 for (j = i; j < hunk_end; j++)
342 parents |= line_diff_parents(sline + j, all_mask);
343 /* Now, how many bits from [0..num_parent) are on? */
344 for (j = 0; j < num_parent; j++) {
345 if (parents & (1UL<<j))
349 /* This hunk is not that interesting after all */
350 for (j = i; j < hunk_end; j++)
351 sline[j].flag &= ~mark;
357 static void dump_sline(struct sline *sline, int cnt, int num_parent)
359 unsigned long mark = (1UL<<num_parent);
364 struct sline *sl = &sline[lno];
366 while (lno < cnt && !(sline[lno].flag & mark))
370 for (hunk_end = lno + 1; hunk_end < cnt; hunk_end++)
371 if (!(sline[hunk_end].flag & mark))
373 for (i = 0; i <= num_parent; i++) putchar(combine_marker);
374 printf(" +%d,%d ", lno+1, hunk_end-lno);
375 for (i = 0; i <= num_parent; i++) putchar(combine_marker);
377 while (lno < hunk_end) {
383 for (j = 0; j < num_parent; j++) {
384 if (ll->parent_map & (1UL<<j))
392 for (j = 0; j < num_parent; j++) {
393 if ((1UL<<j) & sl->flag)
398 printf("%.*s\n", sl->len, sl->bol);
403 static void show_combined_diff(struct path_list *elem, int num_parent,
406 unsigned long size, cnt, lno;
407 char *result, *cp, *ep;
408 struct sline *sline; /* survived lines */
410 char ourtmp[TMPPATHLEN];
412 /* Read the result of merge first */
413 result = grab_blob(elem->sha1, &size);
414 write_to_temp_file(ourtmp, result, size);
416 for (cnt = 0, cp = result; cp - result < size; cp++) {
420 if (result[size-1] != '\n')
421 cnt++; /* incomplete line */
423 sline = xcalloc(cnt, sizeof(*sline));
425 sline[0].bol = result;
426 for (lno = 0, cp = result; cp - result < size; cp++) {
428 sline[lno].lost_tail = &sline[lno].lost_head;
429 sline[lno].len = cp - sline[lno].bol;
430 sline[lno].flag = (1UL<<num_parent) - 1;
433 sline[lno].bol = cp + 1;
436 if (result[size-1] != '\n') {
437 sline[cnt-1].lost_tail = &sline[cnt-1].lost_head;
438 sline[cnt-1].len = size - (sline[cnt-1].bol - result);
439 sline[cnt-1].flag = (1UL<<num_parent) - 1;
442 for (i = 0; i < num_parent; i++)
443 combine_diff(elem->parent_sha1[i], ourtmp, sline, cnt, i);
445 make_hunks(sline, cnt, num_parent, dense);
447 dump_sline(sline, cnt, num_parent);
451 for (i = 0; i < cnt; i++) {
452 if (sline[i].lost_head) {
453 struct lline *ll = sline[i].lost_head;
455 struct lline *tmp = ll;
464 int diff_tree_combined_merge(const unsigned char *sha1,
466 int show_empty_merge, int dense)
468 struct commit *commit = lookup_commit(sha1);
469 struct diff_options diffopts;
470 struct commit_list *parents;
471 struct path_list *p, *paths = NULL;
472 int num_parent, i, num_paths;
474 diff_setup(&diffopts);
475 diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
476 diffopts.recursive = 1;
479 for (parents = commit->parents, num_parent = 0;
481 parents = parents->next, num_parent++)
484 /* find set of paths that everybody touches */
485 for (parents = commit->parents, i = 0;
487 parents = parents->next, i++) {
488 struct commit *parent = parents->item;
489 diff_tree_sha1(parent->object.sha1, commit->object.sha1, "",
491 paths = intersect_paths(paths, i, num_parent);
492 diff_flush(&diffopts);
495 /* find out surviving paths */
496 for (num_paths = 0, p = paths; p; p = p->next) {
500 if (num_paths || show_empty_merge) {
502 for (p = paths; p; p = p->next) {
505 printf("diff --%s ", dense ? "cc" : "combined");
506 if (quote_c_style(p->path, NULL, NULL, 0))
507 quote_c_style(p->path, NULL, stdout, 0);
509 printf("%s", p->path);
511 show_combined_diff(p, num_parent, dense);
515 /* Clean things up */
517 struct path_list *tmp = paths;