]>
Commit | Line | Data |
---|---|---|
af3feefa JH |
1 | #include "cache.h" |
2 | #include "commit.h" | |
3 | #include "diff.h" | |
4 | #include "diffcore.h" | |
5 | #include "quote.h" | |
6 | ||
7 | struct path_list { | |
8 | struct path_list *next; | |
9 | int len; | |
10 | char *path; | |
11 | unsigned char sha1[20]; | |
12 | unsigned char parent_sha1[FLEX_ARRAY][20]; | |
13 | }; | |
14 | ||
15 | static int uninteresting(struct diff_filepair *p) | |
16 | { | |
17 | if (diff_unmodified_pair(p)) | |
18 | return 1; | |
19 | if (!S_ISREG(p->one->mode) || !S_ISREG(p->two->mode)) | |
20 | return 1; | |
21 | return 0; | |
22 | } | |
23 | ||
24 | static struct path_list *intersect_paths(struct path_list *curr, | |
25 | int n, int num_parent) | |
26 | { | |
27 | struct diff_queue_struct *q = &diff_queued_diff; | |
28 | struct path_list *p; | |
29 | int i; | |
30 | ||
31 | if (!n) { | |
5290a0f8 | 32 | struct path_list *list = NULL, **tail = &list; |
af3feefa JH |
33 | for (i = 0; i < q->nr; i++) { |
34 | int len; | |
35 | const char *path; | |
36 | if (uninteresting(q->queue[i])) | |
37 | continue; | |
38 | path = q->queue[i]->two->path; | |
39 | len = strlen(path); | |
40 | ||
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); | |
44 | p->path[len] = 0; | |
45 | p->len = len; | |
46 | p->next = NULL; | |
47 | memcpy(p->sha1, q->queue[i]->two->sha1, 20); | |
48 | memcpy(p->parent_sha1[n], q->queue[i]->one->sha1, 20); | |
5290a0f8 JH |
49 | *tail = p; |
50 | tail = &p->next; | |
af3feefa JH |
51 | } |
52 | return list; | |
53 | } | |
54 | ||
55 | for (p = curr; p; p = p->next) { | |
56 | int found = 0; | |
57 | if (!p->len) | |
58 | continue; | |
59 | for (i = 0; i < q->nr; i++) { | |
60 | const char *path; | |
61 | int len; | |
62 | ||
63 | if (uninteresting(q->queue[i])) | |
64 | continue; | |
65 | path = q->queue[i]->two->path; | |
66 | len = strlen(path); | |
67 | if (len == p->len && !memcmp(path, p->path, len)) { | |
68 | found = 1; | |
69 | memcpy(p->parent_sha1[n], | |
70 | q->queue[i]->one->sha1, 20); | |
71 | break; | |
72 | } | |
73 | } | |
74 | if (!found) | |
75 | p->len = 0; | |
76 | } | |
77 | return curr; | |
78 | } | |
79 | ||
80 | struct lline { | |
81 | struct lline *next; | |
82 | int len; | |
83 | unsigned long parent_map; | |
84 | char line[FLEX_ARRAY]; | |
85 | }; | |
86 | ||
87 | struct sline { | |
88 | struct lline *lost_head, **lost_tail; | |
89 | char *bol; | |
90 | int len; | |
91 | unsigned long flag; | |
92 | }; | |
93 | ||
94 | static char *grab_blob(const unsigned char *sha1, unsigned long *size) | |
95 | { | |
96 | char *blob; | |
97 | char type[20]; | |
98 | if (!memcmp(sha1, null_sha1, 20)) { | |
99 | /* deleted blob */ | |
100 | *size = 0; | |
101 | return xcalloc(1, 1); | |
102 | } | |
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)); | |
106 | return blob; | |
107 | } | |
108 | ||
109 | #define TMPPATHLEN 50 | |
110 | #define MAXLINELEN 10240 | |
111 | ||
112 | static void write_to_temp_file(char *tmpfile, void *blob, unsigned long size) | |
113 | { | |
114 | int fd = git_mkstemp(tmpfile, TMPPATHLEN, ".diff_XXXXXX"); | |
115 | if (fd < 0) | |
116 | die("unable to create temp-file"); | |
117 | if (write(fd, blob, size) != size) | |
118 | die("unable to write temp-file"); | |
119 | close(fd); | |
120 | } | |
121 | ||
122 | static void write_temp_blob(char *tmpfile, const unsigned char *sha1) | |
123 | { | |
124 | unsigned long size; | |
125 | void *blob; | |
126 | blob = grab_blob(sha1, &size); | |
127 | write_to_temp_file(tmpfile, blob, size); | |
128 | free(blob); | |
129 | } | |
130 | ||
131 | static int parse_num(char **cp_p, unsigned int *num_p) | |
132 | { | |
133 | char *cp = *cp_p; | |
134 | unsigned int num = 0; | |
135 | int read_some; | |
136 | ||
137 | while ('0' <= *cp && *cp <= '9') | |
138 | num = num * 10 + *cp++ - '0'; | |
139 | if (!(read_some = cp - *cp_p)) | |
140 | return -1; | |
141 | *cp_p = cp; | |
142 | *num_p = num; | |
143 | return 0; | |
144 | } | |
145 | ||
146 | static int parse_hunk_header(char *line, int len, | |
147 | unsigned int *ob, unsigned int *on, | |
148 | unsigned int *nb, unsigned int *nn) | |
149 | { | |
150 | char *cp; | |
151 | cp = line + 4; | |
152 | if (parse_num(&cp, ob)) { | |
153 | bad_line: | |
154 | return error("malformed diff output: %s", line); | |
155 | } | |
156 | if (*cp == ',') { | |
157 | cp++; | |
158 | if (parse_num(&cp, on)) | |
159 | goto bad_line; | |
160 | } | |
161 | else | |
162 | *on = 1; | |
163 | if (*cp++ != ' ' || *cp++ != '+') | |
164 | goto bad_line; | |
165 | if (parse_num(&cp, nb)) | |
166 | goto bad_line; | |
167 | if (*cp == ',') { | |
168 | cp++; | |
169 | if (parse_num(&cp, nn)) | |
170 | goto bad_line; | |
171 | } | |
172 | else | |
173 | *nn = 1; | |
174 | return -!!memcmp(cp, " @@", 3); | |
175 | } | |
176 | ||
177 | static void append_lost(struct sline *sline, int n, const char *line) | |
178 | { | |
179 | struct lline *lline; | |
180 | int len = strlen(line); | |
181 | unsigned long this_mask = (1UL<<n); | |
182 | if (line[len-1] == '\n') | |
183 | len--; | |
184 | ||
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; | |
190 | lline; | |
191 | lline = lline->next) | |
192 | if (lline->parent_map & this_mask) | |
193 | last_one = lline; | |
194 | lline = last_one ? last_one->next : sline->lost_head; | |
195 | while (lline) { | |
196 | if (lline->len == len && | |
197 | !memcmp(lline->line, line, len)) { | |
198 | lline->parent_map |= this_mask; | |
199 | return; | |
200 | } | |
201 | lline = lline->next; | |
202 | } | |
203 | } | |
204 | ||
205 | lline = xmalloc(sizeof(*lline) + len + 1); | |
206 | lline->len = len; | |
207 | lline->next = NULL; | |
208 | lline->parent_map = this_mask; | |
209 | memcpy(lline->line, line, len); | |
210 | lline->line[len] = 0; | |
5290a0f8 | 211 | *sline->lost_tail = lline; |
af3feefa JH |
212 | sline->lost_tail = &lline->next; |
213 | } | |
214 | ||
215 | static void combine_diff(const unsigned char *parent, const char *ourtmp, | |
216 | struct sline *sline, int cnt, int n) | |
217 | { | |
218 | FILE *in; | |
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; | |
225 | ||
226 | write_temp_blob(parent_tmp, parent); | |
227 | sprintf(cmd, "diff --unified=0 -La/x -Lb/x '%s' '%s'", | |
228 | parent_tmp, ourtmp); | |
229 | in = popen(cmd, "r"); | |
230 | if (!in) | |
231 | return; | |
232 | ||
233 | lno = 1; | |
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, | |
238 | &ob, &on, &nb, &nn)) | |
239 | break; | |
240 | lno = nb; | |
241 | if (!nb) { | |
242 | /* @@ -1,2 +0,0 @@ to remove the | |
243 | * first two lines... | |
244 | */ | |
245 | nb = 1; | |
246 | } | |
247 | lost_bucket = &sline[nb-1]; /* sline is 0 based */ | |
248 | continue; | |
249 | } | |
250 | if (!lost_bucket) | |
251 | continue; | |
252 | switch (line[0]) { | |
253 | case '-': | |
254 | append_lost(lost_bucket, n, line+1); | |
255 | break; | |
256 | case '+': | |
257 | sline[lno-1].flag &= pmask; | |
258 | lno++; | |
259 | break; | |
260 | } | |
261 | } | |
262 | fclose(in); | |
263 | unlink(parent_tmp); | |
264 | } | |
265 | ||
266 | static unsigned long context = 3; | |
267 | static char combine_marker = '@'; | |
268 | ||
269 | static int interesting(struct sline *sline, unsigned long all_mask) | |
270 | { | |
271 | return ((sline->flag & all_mask) != all_mask || sline->lost_head); | |
272 | } | |
273 | ||
263eee29 | 274 | static unsigned long line_common_diff(struct sline *sline, unsigned long all_mask) |
d8f4790e JH |
275 | { |
276 | /* | |
263eee29 JH |
277 | * Look at the line and see from which parents we have the |
278 | * same difference. | |
d8f4790e | 279 | */ |
263eee29 JH |
280 | |
281 | /* Lower bits of sline->flag records if the parent had this | |
282 | * line, so XOR with all_mask gives us on-bits for parents we | |
283 | * have differences with. | |
284 | */ | |
285 | unsigned long common_adds = (sline->flag ^ all_mask) & all_mask; | |
286 | unsigned long common_removes = all_mask; | |
287 | ||
288 | /* If all the parents have this line, that also counts as | |
289 | * having the same difference. | |
290 | */ | |
291 | if (!common_adds) | |
292 | common_adds = all_mask; | |
293 | ||
294 | if (sline->lost_head) { | |
295 | /* Lost head list records the lines removed from | |
296 | * the parents, and parent_map records from which | |
297 | * parent the line was removed. | |
298 | */ | |
299 | struct lline *ll; | |
300 | for (ll = sline->lost_head; ll; ll = ll->next) { | |
301 | common_removes &= ll->parent_map; | |
302 | } | |
303 | } | |
304 | return common_adds & common_removes; | |
305 | } | |
306 | ||
307 | static unsigned long line_all_diff(struct sline *sline, unsigned long all_mask) | |
308 | { | |
309 | /* | |
310 | * Look at the line and see from which parents we have some difference. | |
311 | */ | |
312 | unsigned long different = (sline->flag ^ all_mask) & all_mask; | |
d8f4790e | 313 | if (sline->lost_head) { |
263eee29 JH |
314 | /* Lost head list records the lines removed from |
315 | * the parents, and parent_map records from which | |
316 | * parent the line was removed. | |
317 | */ | |
d8f4790e | 318 | struct lline *ll; |
263eee29 JH |
319 | for (ll = sline->lost_head; ll; ll = ll->next) { |
320 | different |= ll->parent_map; | |
321 | } | |
d8f4790e | 322 | } |
263eee29 | 323 | return different; |
d8f4790e JH |
324 | } |
325 | ||
326 | static void make_hunks(struct sline *sline, unsigned long cnt, | |
327 | int num_parent, int dense) | |
af3feefa JH |
328 | { |
329 | unsigned long all_mask = (1UL<<num_parent) - 1; | |
330 | unsigned long mark = (1UL<<num_parent); | |
331 | unsigned long i; | |
332 | ||
333 | i = 0; | |
334 | while (i < cnt) { | |
335 | if (interesting(&sline[i], all_mask)) { | |
336 | unsigned long j = (context < i) ? i - context : 0; | |
337 | while (j <= i) | |
338 | sline[j++].flag |= mark; | |
339 | while (++i < cnt) { | |
340 | if (!interesting(&sline[i], all_mask)) | |
341 | break; | |
342 | sline[i].flag |= mark; | |
343 | } | |
344 | j = (i + context < cnt) ? i + context : cnt; | |
345 | while (i < j) | |
346 | sline[i++].flag |= mark; | |
347 | continue; | |
348 | } | |
349 | i++; | |
350 | } | |
d8f4790e JH |
351 | if (!dense) |
352 | return; | |
353 | ||
263eee29 JH |
354 | /* Look at each hunk, and if we have changes from only one |
355 | * parent, or the changes are the same from all but one | |
356 | * parent, mark that uninteresting. | |
d8f4790e JH |
357 | */ |
358 | i = 0; | |
359 | while (i < cnt) { | |
263eee29 JH |
360 | int j, hunk_end, same, diff; |
361 | unsigned long same_diff, all_diff, this_diff; | |
d8f4790e JH |
362 | while (i < cnt && !(sline[i].flag & mark)) |
363 | i++; | |
364 | if (cnt <= i) | |
365 | break; /* No more interesting hunks */ | |
366 | for (hunk_end = i + 1; hunk_end < cnt; hunk_end++) | |
367 | if (!(sline[hunk_end].flag & mark)) | |
368 | break; | |
263eee29 JH |
369 | /* [i..hunk_end) are interesting. Now does it have |
370 | * the same change with all but one parent? | |
d8f4790e | 371 | */ |
263eee29 JH |
372 | same_diff = all_mask; |
373 | all_diff = 0; | |
374 | for (j = i; j < hunk_end; j++) { | |
375 | same_diff &= line_common_diff(sline + j, all_mask); | |
376 | all_diff |= line_all_diff(sline + j, all_mask); | |
377 | } | |
378 | diff = same = 0; | |
d8f4790e | 379 | for (j = 0; j < num_parent; j++) { |
263eee29 JH |
380 | if (same_diff & (1UL<<j)) |
381 | same++; | |
382 | if (all_diff & (1UL<<j)) | |
383 | diff++; | |
d8f4790e | 384 | } |
263eee29 | 385 | if ((num_parent - 1 <= same) || (diff == 1)) { |
d8f4790e JH |
386 | /* This hunk is not that interesting after all */ |
387 | for (j = i; j < hunk_end; j++) | |
388 | sline[j].flag &= ~mark; | |
389 | } | |
390 | i = hunk_end; | |
391 | } | |
af3feefa JH |
392 | } |
393 | ||
394 | static void dump_sline(struct sline *sline, int cnt, int num_parent) | |
395 | { | |
396 | unsigned long mark = (1UL<<num_parent); | |
397 | int i; | |
398 | int lno = 0; | |
399 | ||
400 | while (1) { | |
401 | struct sline *sl = &sline[lno]; | |
402 | int hunk_end; | |
403 | while (lno < cnt && !(sline[lno].flag & mark)) | |
404 | lno++; | |
405 | if (cnt <= lno) | |
406 | break; | |
407 | for (hunk_end = lno + 1; hunk_end < cnt; hunk_end++) | |
408 | if (!(sline[hunk_end].flag & mark)) | |
409 | break; | |
410 | for (i = 0; i <= num_parent; i++) putchar(combine_marker); | |
411 | printf(" +%d,%d ", lno+1, hunk_end-lno); | |
412 | for (i = 0; i <= num_parent; i++) putchar(combine_marker); | |
413 | putchar('\n'); | |
414 | while (lno < hunk_end) { | |
415 | struct lline *ll; | |
416 | int j; | |
417 | sl = &sline[lno++]; | |
418 | ll = sl->lost_head; | |
419 | while (ll) { | |
420 | for (j = 0; j < num_parent; j++) { | |
421 | if (ll->parent_map & (1UL<<j)) | |
422 | putchar('-'); | |
423 | else | |
424 | putchar(' '); | |
425 | } | |
af3feefa JH |
426 | puts(ll->line); |
427 | ll = ll->next; | |
428 | } | |
429 | for (j = 0; j < num_parent; j++) { | |
430 | if ((1UL<<j) & sl->flag) | |
431 | putchar(' '); | |
432 | else | |
433 | putchar('+'); | |
434 | } | |
e2283409 | 435 | printf("%.*s\n", sl->len, sl->bol); |
af3feefa JH |
436 | } |
437 | } | |
438 | } | |
439 | ||
d8f4790e JH |
440 | static void show_combined_diff(struct path_list *elem, int num_parent, |
441 | int dense) | |
af3feefa JH |
442 | { |
443 | unsigned long size, cnt, lno; | |
444 | char *result, *cp, *ep; | |
445 | struct sline *sline; /* survived lines */ | |
446 | int i; | |
447 | char ourtmp[TMPPATHLEN]; | |
448 | ||
449 | /* Read the result of merge first */ | |
450 | result = grab_blob(elem->sha1, &size); | |
451 | write_to_temp_file(ourtmp, result, size); | |
452 | ||
453 | for (cnt = 0, cp = result; cp - result < size; cp++) { | |
454 | if (*cp == '\n') | |
455 | cnt++; | |
456 | } | |
457 | if (result[size-1] != '\n') | |
458 | cnt++; /* incomplete line */ | |
459 | ||
460 | sline = xcalloc(cnt, sizeof(*sline)); | |
461 | ep = result; | |
462 | sline[0].bol = result; | |
463 | for (lno = 0, cp = result; cp - result < size; cp++) { | |
464 | if (*cp == '\n') { | |
5290a0f8 | 465 | sline[lno].lost_tail = &sline[lno].lost_head; |
af3feefa JH |
466 | sline[lno].len = cp - sline[lno].bol; |
467 | sline[lno].flag = (1UL<<num_parent) - 1; | |
468 | lno++; | |
469 | if (lno < cnt) | |
470 | sline[lno].bol = cp + 1; | |
471 | } | |
472 | } | |
473 | if (result[size-1] != '\n') { | |
5290a0f8 | 474 | sline[cnt-1].lost_tail = &sline[cnt-1].lost_head; |
af3feefa JH |
475 | sline[cnt-1].len = size - (sline[cnt-1].bol - result); |
476 | sline[cnt-1].flag = (1UL<<num_parent) - 1; | |
477 | } | |
478 | ||
479 | for (i = 0; i < num_parent; i++) | |
480 | combine_diff(elem->parent_sha1[i], ourtmp, sline, cnt, i); | |
481 | ||
d8f4790e | 482 | make_hunks(sline, cnt, num_parent, dense); |
af3feefa JH |
483 | |
484 | dump_sline(sline, cnt, num_parent); | |
485 | unlink(ourtmp); | |
486 | free(result); | |
487 | ||
488 | for (i = 0; i < cnt; i++) { | |
489 | if (sline[i].lost_head) { | |
490 | struct lline *ll = sline[i].lost_head; | |
491 | while (ll) { | |
492 | struct lline *tmp = ll; | |
493 | ll = ll->next; | |
494 | free(tmp); | |
495 | } | |
496 | } | |
497 | } | |
498 | free(sline); | |
499 | } | |
500 | ||
501 | int diff_tree_combined_merge(const unsigned char *sha1, | |
d8f4790e JH |
502 | const char *header, |
503 | int show_empty_merge, int dense) | |
af3feefa JH |
504 | { |
505 | struct commit *commit = lookup_commit(sha1); | |
506 | struct diff_options diffopts; | |
507 | struct commit_list *parents; | |
508 | struct path_list *p, *paths = NULL; | |
509 | int num_parent, i, num_paths; | |
510 | ||
511 | diff_setup(&diffopts); | |
512 | diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
513 | diffopts.recursive = 1; | |
514 | ||
515 | /* count parents */ | |
516 | for (parents = commit->parents, num_parent = 0; | |
517 | parents; | |
518 | parents = parents->next, num_parent++) | |
519 | ; /* nothing */ | |
520 | ||
521 | /* find set of paths that everybody touches */ | |
522 | for (parents = commit->parents, i = 0; | |
523 | parents; | |
524 | parents = parents->next, i++) { | |
525 | struct commit *parent = parents->item; | |
526 | diff_tree_sha1(parent->object.sha1, commit->object.sha1, "", | |
527 | &diffopts); | |
528 | paths = intersect_paths(paths, i, num_parent); | |
529 | diff_flush(&diffopts); | |
530 | } | |
531 | ||
532 | /* find out surviving paths */ | |
533 | for (num_paths = 0, p = paths; p; p = p->next) { | |
534 | if (p->len) | |
535 | num_paths++; | |
536 | } | |
537 | if (num_paths || show_empty_merge) { | |
538 | puts(header); | |
539 | for (p = paths; p; p = p->next) { | |
540 | if (!p->len) | |
541 | continue; | |
e2283409 | 542 | printf("diff --%s ", dense ? "cc" : "combined"); |
af3feefa JH |
543 | if (quote_c_style(p->path, NULL, NULL, 0)) |
544 | quote_c_style(p->path, NULL, stdout, 0); | |
545 | else | |
546 | printf("%s", p->path); | |
547 | putchar('\n'); | |
d8f4790e | 548 | show_combined_diff(p, num_parent, dense); |
af3feefa JH |
549 | } |
550 | } | |
551 | ||
552 | /* Clean things up */ | |
553 | while (paths) { | |
554 | struct path_list *tmp = paths; | |
555 | paths = paths->next; | |
556 | free(tmp); | |
557 | } | |
558 | return 0; | |
559 | } |