]>
Commit | Line | Data |
---|---|---|
af3feefa JH |
1 | #include "cache.h" |
2 | #include "commit.h" | |
8e440259 | 3 | #include "blob.h" |
af3feefa JH |
4 | #include "diff.h" |
5 | #include "diffcore.h" | |
6 | #include "quote.h" | |
d9ea73e0 | 7 | #include "xdiff-interface.h" |
91539833 | 8 | #include "log-tree.h" |
af3feefa | 9 | |
ea726d02 | 10 | static 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 |
72 | struct 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 |
80 | struct 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 | ||
92 | static char *grab_blob(const unsigned char *sha1, unsigned long *size) | |
93 | { | |
94 | char *blob; | |
21666f1a | 95 | enum object_type type; |
0bef57ee | 96 | if (is_null_sha1(sha1)) { |
af3feefa JH |
97 | /* deleted blob */ |
98 | *size = 0; | |
99 | return xcalloc(1, 1); | |
100 | } | |
21666f1a NP |
101 | blob = read_sha1_file(sha1, &type, size); |
102 | if (type != OBJ_BLOB) | |
af3feefa JH |
103 | die("object '%s' is not a blob!", sha1_to_hex(sha1)); |
104 | return blob; | |
105 | } | |
106 | ||
f23fc773 | 107 | static 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 | 144 | struct 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 | 156 | static 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 | 199 | static 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; | |
30b25010 | 218 | memset(&xecfg, 0, sizeof(xecfg)); |
d9ea73e0 | 219 | ecb.outf = xdiff_outf; |
f23fc773 JH |
220 | ecb.priv = &state; |
221 | memset(&state, 0, sizeof(state)); | |
d9ea73e0 | 222 | state.xm.consume = consume_line; |
f23fc773 JH |
223 | state.nmask = nmask; |
224 | state.sline = sline; | |
225 | state.lno = 1; | |
226 | state.num_parent = num_parent; | |
227 | state.n = n; | |
228 | ||
c279d7e9 | 229 | xdi_diff(&parent_file, result_file, &xpp, &xecfg, &ecb); |
f23fc773 | 230 | free(parent_file.ptr); |
f16706cc JH |
231 | |
232 | /* Assign line numbers for this parent. | |
233 | * | |
234 | * sline[lno].p_lno[n] records the first line number | |
235 | * (counting from 1) for parent N if the final hunk display | |
236 | * started by showing sline[lno] (possibly showing the lost | |
237 | * lines attached to it first). | |
238 | */ | |
8a470ebf | 239 | for (lno = 0, p_lno = 1; lno <= cnt; lno++) { |
f16706cc JH |
240 | struct lline *ll; |
241 | sline[lno].p_lno[n] = p_lno; | |
242 | ||
243 | /* How many lines would this sline advance the p_lno? */ | |
244 | ll = sline[lno].lost_head; | |
245 | while (ll) { | |
246 | if (ll->parent_map & nmask) | |
247 | p_lno++; /* '-' means parent had it */ | |
248 | ll = ll->next; | |
249 | } | |
8a470ebf | 250 | if (lno < cnt && !(sline[lno].flag & nmask)) |
f16706cc JH |
251 | p_lno++; /* no '+' means parent had it */ |
252 | } | |
253 | sline[lno].p_lno[n] = p_lno; /* trailer */ | |
af3feefa JH |
254 | } |
255 | ||
256 | static unsigned long context = 3; | |
257 | static char combine_marker = '@'; | |
258 | ||
259 | static int interesting(struct sline *sline, unsigned long all_mask) | |
260 | { | |
46dc9412 JH |
261 | /* If some parents lost lines here, or if we have added to |
262 | * some parent, it is interesting. | |
263 | */ | |
264 | return ((sline->flag & all_mask) || sline->lost_head); | |
af3feefa JH |
265 | } |
266 | ||
3ec1909f JH |
267 | static unsigned long adjust_hunk_tail(struct sline *sline, |
268 | unsigned long all_mask, | |
269 | unsigned long hunk_begin, | |
270 | unsigned long i) | |
271 | { | |
46dc9412 JH |
272 | /* i points at the first uninteresting line. If the last line |
273 | * of the hunk was interesting only because it has some | |
274 | * deletion, then it is not all that interesting for the | |
275 | * purpose of giving trailing context lines. This is because | |
276 | * we output '-' line and then unmodified sline[i-1] itself in | |
277 | * that case which gives us one extra context line. | |
3ec1909f | 278 | */ |
46dc9412 | 279 | if ((hunk_begin + 1 <= i) && !(sline[i-1].flag & all_mask)) |
3ec1909f JH |
280 | i--; |
281 | return i; | |
282 | } | |
283 | ||
46dc9412 JH |
284 | static unsigned long find_next(struct sline *sline, |
285 | unsigned long mark, | |
286 | unsigned long i, | |
287 | unsigned long cnt, | |
2386c297 | 288 | int look_for_uninteresting) |
3ec1909f | 289 | { |
46dc9412 JH |
290 | /* We have examined up to i-1 and are about to look at i. |
291 | * Find next interesting or uninteresting line. Here, | |
292 | * "interesting" does not mean interesting(), but marked by | |
293 | * the give_context() function below (i.e. it includes context | |
294 | * lines that are not interesting to interesting() function | |
295 | * that are surrounded by interesting() ones. | |
296 | */ | |
74065951 | 297 | while (i <= cnt) |
2386c297 | 298 | if (look_for_uninteresting |
46dc9412 JH |
299 | ? !(sline[i].flag & mark) |
300 | : (sline[i].flag & mark)) | |
3ec1909f JH |
301 | return i; |
302 | else | |
303 | i++; | |
74065951 | 304 | return i; |
3ec1909f JH |
305 | } |
306 | ||
307 | static int give_context(struct sline *sline, unsigned long cnt, int num_parent) | |
af3feefa JH |
308 | { |
309 | unsigned long all_mask = (1UL<<num_parent) - 1; | |
310 | unsigned long mark = (1UL<<num_parent); | |
311 | unsigned long i; | |
312 | ||
46dc9412 | 313 | /* Two groups of interesting lines may have a short gap of |
82e5a82f | 314 | * uninteresting lines. Connect such groups to give them a |
46dc9412 JH |
315 | * bit of context. |
316 | * | |
317 | * We first start from what the interesting() function says, | |
318 | * and mark them with "mark", and paint context lines with the | |
319 | * mark. So interesting() would still say false for such context | |
320 | * lines but they are treated as "interesting" in the end. | |
321 | */ | |
322 | i = find_next(sline, mark, 0, cnt, 0); | |
74065951 | 323 | if (cnt < i) |
3ec1909f JH |
324 | return 0; |
325 | ||
74065951 | 326 | while (i <= cnt) { |
3ec1909f JH |
327 | unsigned long j = (context < i) ? (i - context) : 0; |
328 | unsigned long k; | |
46dc9412 JH |
329 | |
330 | /* Paint a few lines before the first interesting line. */ | |
3ec1909f JH |
331 | while (j < i) |
332 | sline[j++].flag |= mark; | |
333 | ||
334 | again: | |
46dc9412 JH |
335 | /* we know up to i is to be included. where does the |
336 | * next uninteresting one start? | |
337 | */ | |
338 | j = find_next(sline, mark, i, cnt, 1); | |
74065951 | 339 | if (cnt < j) |
3ec1909f JH |
340 | break; /* the rest are all interesting */ |
341 | ||
342 | /* lookahead context lines */ | |
46dc9412 | 343 | k = find_next(sline, mark, j, cnt, 0); |
3ec1909f JH |
344 | j = adjust_hunk_tail(sline, all_mask, i, j); |
345 | ||
346 | if (k < j + context) { | |
347 | /* k is interesting and [j,k) are not, but | |
348 | * paint them interesting because the gap is small. | |
349 | */ | |
350 | while (j < k) | |
af3feefa | 351 | sline[j++].flag |= mark; |
3ec1909f JH |
352 | i = k; |
353 | goto again; | |
af3feefa | 354 | } |
3ec1909f JH |
355 | |
356 | /* j is the first uninteresting line and there is | |
46dc9412 JH |
357 | * no overlap beyond it within context lines. Paint |
358 | * the trailing edge a bit. | |
3ec1909f JH |
359 | */ |
360 | i = k; | |
74065951 | 361 | k = (j + context < cnt+1) ? j + context : cnt+1; |
3ec1909f JH |
362 | while (j < k) |
363 | sline[j++].flag |= mark; | |
364 | } | |
365 | return 1; | |
366 | } | |
367 | ||
368 | static int make_hunks(struct sline *sline, unsigned long cnt, | |
369 | int num_parent, int dense) | |
370 | { | |
371 | unsigned long all_mask = (1UL<<num_parent) - 1; | |
372 | unsigned long mark = (1UL<<num_parent); | |
373 | unsigned long i; | |
374 | int has_interesting = 0; | |
375 | ||
74065951 | 376 | for (i = 0; i <= cnt; i++) { |
3ec1909f JH |
377 | if (interesting(&sline[i], all_mask)) |
378 | sline[i].flag |= mark; | |
379 | else | |
380 | sline[i].flag &= ~mark; | |
af3feefa | 381 | } |
d8f4790e | 382 | if (!dense) |
3ec1909f | 383 | return give_context(sline, cnt, num_parent); |
d8f4790e | 384 | |
263eee29 JH |
385 | /* Look at each hunk, and if we have changes from only one |
386 | * parent, or the changes are the same from all but one | |
387 | * parent, mark that uninteresting. | |
d8f4790e JH |
388 | */ |
389 | i = 0; | |
74065951 | 390 | while (i <= cnt) { |
3ec1909f | 391 | unsigned long j, hunk_begin, hunk_end; |
bf1c32bd | 392 | unsigned long same_diff; |
74065951 | 393 | while (i <= cnt && !(sline[i].flag & mark)) |
d8f4790e | 394 | i++; |
74065951 | 395 | if (cnt < i) |
d8f4790e | 396 | break; /* No more interesting hunks */ |
3ec1909f | 397 | hunk_begin = i; |
74065951 | 398 | for (j = i + 1; j <= cnt; j++) { |
3ec1909f JH |
399 | if (!(sline[j].flag & mark)) { |
400 | /* Look beyond the end to see if there | |
401 | * is an interesting line after this | |
402 | * hunk within context span. | |
403 | */ | |
404 | unsigned long la; /* lookahead */ | |
405 | int contin = 0; | |
406 | la = adjust_hunk_tail(sline, all_mask, | |
407 | hunk_begin, j); | |
74065951 JH |
408 | la = (la + context < cnt + 1) ? |
409 | (la + context) : cnt + 1; | |
3ec1909f JH |
410 | while (j <= --la) { |
411 | if (sline[la].flag & mark) { | |
412 | contin = 1; | |
413 | break; | |
414 | } | |
415 | } | |
416 | if (!contin) | |
417 | break; | |
418 | j = la; | |
419 | } | |
420 | } | |
421 | hunk_end = j; | |
422 | ||
bf1c32bd | 423 | /* [i..hunk_end) are interesting. Now is it really |
fd4b1d21 JH |
424 | * interesting? We check if there are only two versions |
425 | * and the result matches one of them. That is, we look | |
426 | * at: | |
427 | * (+) line, which records lines added to which parents; | |
428 | * this line appears in the result. | |
429 | * (-) line, which records from what parents the line | |
430 | * was removed; this line does not appear in the result. | |
431 | * then check the set of parents the result has difference | |
432 | * from, from all lines. If there are lines that has | |
433 | * different set of parents that the result has differences | |
434 | * from, that means we have more than two versions. | |
435 | * | |
436 | * Even when we have only two versions, if the result does | |
437 | * not match any of the parents, the it should be considered | |
438 | * interesting. In such a case, we would have all '+' line. | |
439 | * After passing the above "two versions" test, that would | |
440 | * appear as "the same set of parents" to be "all parents". | |
d8f4790e | 441 | */ |
bf1c32bd JH |
442 | same_diff = 0; |
443 | has_interesting = 0; | |
444 | for (j = i; j < hunk_end && !has_interesting; j++) { | |
46dc9412 | 445 | unsigned long this_diff = sline[j].flag & all_mask; |
bf1c32bd JH |
446 | struct lline *ll = sline[j].lost_head; |
447 | if (this_diff) { | |
448 | /* This has some changes. Is it the | |
449 | * same as others? | |
450 | */ | |
451 | if (!same_diff) | |
452 | same_diff = this_diff; | |
453 | else if (same_diff != this_diff) { | |
454 | has_interesting = 1; | |
455 | break; | |
456 | } | |
457 | } | |
458 | while (ll && !has_interesting) { | |
459 | /* Lost this line from these parents; | |
460 | * who are they? Are they the same? | |
461 | */ | |
462 | this_diff = ll->parent_map; | |
463 | if (!same_diff) | |
464 | same_diff = this_diff; | |
465 | else if (same_diff != this_diff) { | |
466 | has_interesting = 1; | |
467 | } | |
468 | ll = ll->next; | |
469 | } | |
d8f4790e | 470 | } |
bf1c32bd | 471 | |
fd4b1d21 | 472 | if (!has_interesting && same_diff != all_mask) { |
d8f4790e | 473 | /* This hunk is not that interesting after all */ |
3ec1909f | 474 | for (j = hunk_begin; j < hunk_end; j++) |
d8f4790e JH |
475 | sline[j].flag &= ~mark; |
476 | } | |
477 | i = hunk_end; | |
478 | } | |
3ec1909f JH |
479 | |
480 | has_interesting = give_context(sline, cnt, num_parent); | |
8828cdcb | 481 | return has_interesting; |
af3feefa JH |
482 | } |
483 | ||
3b0f5e88 | 484 | static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long l1, int n, unsigned long null_context) |
f16706cc JH |
485 | { |
486 | l0 = sline[l0].p_lno[n]; | |
487 | l1 = sline[l1].p_lno[n]; | |
3b0f5e88 | 488 | printf(" -%lu,%lu", l0, l1-l0-null_context); |
f16706cc JH |
489 | } |
490 | ||
d5f6a01a JH |
491 | static int hunk_comment_line(const char *bol) |
492 | { | |
7a8ac59f JH |
493 | int ch; |
494 | ||
495 | if (!bol) | |
496 | return 0; | |
497 | ch = *bol & 0xff; | |
d5f6a01a JH |
498 | return (isalpha(ch) || ch == '_' || ch == '$'); |
499 | } | |
500 | ||
567a03d1 JH |
501 | static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent, |
502 | int use_color) | |
af3feefa JH |
503 | { |
504 | unsigned long mark = (1UL<<num_parent); | |
505 | int i; | |
f16706cc | 506 | unsigned long lno = 0; |
567a03d1 JH |
507 | const char *c_frag = diff_get_color(use_color, DIFF_FRAGINFO); |
508 | const char *c_new = diff_get_color(use_color, DIFF_FILE_NEW); | |
509 | const char *c_old = diff_get_color(use_color, DIFF_FILE_OLD); | |
510 | const char *c_plain = diff_get_color(use_color, DIFF_PLAIN); | |
511 | const char *c_reset = diff_get_color(use_color, DIFF_RESET); | |
af3feefa | 512 | |
4462731e JH |
513 | if (!cnt) |
514 | return; /* result deleted */ | |
515 | ||
af3feefa JH |
516 | while (1) { |
517 | struct sline *sl = &sline[lno]; | |
8bc7574b JH |
518 | unsigned long hunk_end; |
519 | unsigned long rlines; | |
d5f6a01a | 520 | const char *hunk_comment = NULL; |
3b0f5e88 | 521 | unsigned long null_context = 0; |
d5f6a01a JH |
522 | |
523 | while (lno <= cnt && !(sline[lno].flag & mark)) { | |
524 | if (hunk_comment_line(sline[lno].bol)) | |
525 | hunk_comment = sline[lno].bol; | |
af3feefa | 526 | lno++; |
d5f6a01a | 527 | } |
8a470ebf | 528 | if (cnt < lno) |
af3feefa | 529 | break; |
8a470ebf | 530 | else { |
74065951 | 531 | for (hunk_end = lno + 1; hunk_end <= cnt; hunk_end++) |
8a470ebf JH |
532 | if (!(sline[hunk_end].flag & mark)) |
533 | break; | |
534 | } | |
74065951 JH |
535 | rlines = hunk_end - lno; |
536 | if (cnt < hunk_end) | |
537 | rlines--; /* pointing at the last delete hunk */ | |
3b0f5e88 JH |
538 | |
539 | if (!context) { | |
540 | /* | |
541 | * Even when running with --unified=0, all | |
542 | * lines in the hunk needs to be processed in | |
543 | * the loop below in order to show the | |
544 | * deletion recorded in lost_head. However, | |
545 | * we do not want to show the resulting line | |
546 | * with all blank context markers in such a | |
547 | * case. Compensate. | |
548 | */ | |
549 | unsigned long j; | |
550 | for (j = lno; j < hunk_end; j++) | |
551 | if (!(sline[j].flag & (mark-1))) | |
552 | null_context++; | |
553 | rlines -= null_context; | |
554 | } | |
555 | ||
567a03d1 | 556 | fputs(c_frag, stdout); |
af3feefa | 557 | for (i = 0; i <= num_parent; i++) putchar(combine_marker); |
f16706cc | 558 | for (i = 0; i < num_parent; i++) |
3b0f5e88 | 559 | show_parent_lno(sline, lno, hunk_end, i, null_context); |
74065951 | 560 | printf(" +%lu,%lu ", lno+1, rlines); |
af3feefa | 561 | for (i = 0; i <= num_parent; i++) putchar(combine_marker); |
d5f6a01a JH |
562 | |
563 | if (hunk_comment) { | |
564 | int comment_end = 0; | |
565 | for (i = 0; i < 40; i++) { | |
566 | int ch = hunk_comment[i] & 0xff; | |
567 | if (!ch || ch == '\n') | |
568 | break; | |
569 | if (!isspace(ch)) | |
570 | comment_end = i; | |
571 | } | |
572 | if (comment_end) | |
573 | putchar(' '); | |
574 | for (i = 0; i < comment_end; i++) | |
575 | putchar(hunk_comment[i]); | |
576 | } | |
577 | ||
567a03d1 | 578 | printf("%s\n", c_reset); |
af3feefa JH |
579 | while (lno < hunk_end) { |
580 | struct lline *ll; | |
581 | int j; | |
46dc9412 | 582 | unsigned long p_mask; |
af3feefa JH |
583 | sl = &sline[lno++]; |
584 | ll = sl->lost_head; | |
585 | while (ll) { | |
567a03d1 | 586 | fputs(c_old, stdout); |
af3feefa JH |
587 | for (j = 0; j < num_parent; j++) { |
588 | if (ll->parent_map & (1UL<<j)) | |
589 | putchar('-'); | |
590 | else | |
591 | putchar(' '); | |
592 | } | |
567a03d1 | 593 | printf("%s%s\n", ll->line, c_reset); |
af3feefa JH |
594 | ll = ll->next; |
595 | } | |
74065951 | 596 | if (cnt < lno) |
8a470ebf | 597 | break; |
46dc9412 | 598 | p_mask = 1; |
3b0f5e88 JH |
599 | if (!(sl->flag & (mark-1))) { |
600 | /* | |
601 | * This sline was here to hang the | |
602 | * lost lines in front of it. | |
603 | */ | |
604 | if (!context) | |
605 | continue; | |
567a03d1 | 606 | fputs(c_plain, stdout); |
3b0f5e88 | 607 | } |
567a03d1 JH |
608 | else |
609 | fputs(c_new, stdout); | |
af3feefa | 610 | for (j = 0; j < num_parent; j++) { |
46dc9412 | 611 | if (p_mask & sl->flag) |
af3feefa | 612 | putchar('+'); |
46dc9412 JH |
613 | else |
614 | putchar(' '); | |
615 | p_mask <<= 1; | |
af3feefa | 616 | } |
567a03d1 | 617 | printf("%.*s%s\n", sl->len, sl->bol, c_reset); |
af3feefa JH |
618 | } |
619 | } | |
620 | } | |
621 | ||
3c39e9bd JH |
622 | static void reuse_combine_diff(struct sline *sline, unsigned long cnt, |
623 | int i, int j) | |
624 | { | |
625 | /* We have already examined parent j and we know parent i | |
626 | * and parent j are the same, so reuse the combined result | |
627 | * of parent j for parent i. | |
628 | */ | |
629 | unsigned long lno, imask, jmask; | |
630 | imask = (1UL<<i); | |
631 | jmask = (1UL<<j); | |
632 | ||
8a470ebf | 633 | for (lno = 0; lno <= cnt; lno++) { |
3c39e9bd | 634 | struct lline *ll = sline->lost_head; |
f16706cc | 635 | sline->p_lno[i] = sline->p_lno[j]; |
3c39e9bd JH |
636 | while (ll) { |
637 | if (ll->parent_map & jmask) | |
638 | ll->parent_map |= imask; | |
639 | ll = ll->next; | |
640 | } | |
46dc9412 JH |
641 | if (sline->flag & jmask) |
642 | sline->flag |= imask; | |
3c39e9bd JH |
643 | sline++; |
644 | } | |
4462731e JH |
645 | /* the overall size of the file (sline[cnt]) */ |
646 | sline->p_lno[i] = sline->p_lno[j]; | |
3c39e9bd JH |
647 | } |
648 | ||
462a15bc JH |
649 | static void dump_quoted_path(const char *head, |
650 | const char *prefix, | |
651 | const char *path, | |
567a03d1 | 652 | const char *c_meta, const char *c_reset) |
eab144ac | 653 | { |
462a15bc JH |
654 | static struct strbuf buf = STRBUF_INIT; |
655 | ||
656 | strbuf_reset(&buf); | |
657 | strbuf_addstr(&buf, c_meta); | |
658 | strbuf_addstr(&buf, head); | |
d5625091 | 659 | quote_two_c_style(&buf, prefix, path, 0); |
462a15bc JH |
660 | strbuf_addstr(&buf, c_reset); |
661 | puts(buf.buf); | |
eab144ac LT |
662 | } |
663 | ||
89b0c4b5 JH |
664 | static void show_patch_diff(struct combine_diff_path *elem, int num_parent, |
665 | int dense, struct rev_info *rev) | |
af3feefa | 666 | { |
91539833 | 667 | struct diff_options *opt = &rev->diffopt; |
f23fc773 | 668 | unsigned long result_size, cnt, lno; |
310f8b5b | 669 | char *result, *cp; |
af3feefa | 670 | struct sline *sline; /* survived lines */ |
2454c962 | 671 | int mode_differs = 0; |
89b0c4b5 | 672 | int i, show_hunks; |
0bef57ee | 673 | int working_tree_file = is_null_sha1(elem->sha1); |
8f67f8ae | 674 | int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV; |
f23fc773 | 675 | mmfile_t result_file; |
af3feefa | 676 | |
ee1e5412 | 677 | context = opt->context; |
af3feefa | 678 | /* Read the result of merge first */ |
f23fc773 JH |
679 | if (!working_tree_file) |
680 | result = grab_blob(elem->sha1, &result_size); | |
ea726d02 | 681 | else { |
9843a1f6 | 682 | /* Used by diff-tree to read from the working tree */ |
ea726d02 | 683 | struct stat st; |
4fc970c4 JH |
684 | int fd = -1; |
685 | ||
686 | if (lstat(elem->path, &st) < 0) | |
687 | goto deleted_file; | |
688 | ||
689 | if (S_ISLNK(st.st_mode)) { | |
dc49cd76 | 690 | size_t len = xsize_t(st.st_size); |
4fc970c4 JH |
691 | result_size = len; |
692 | result = xmalloc(len + 1); | |
693 | if (result_size != readlink(elem->path, result, len)) { | |
694 | error("readlink(%s): %s", elem->path, | |
695 | strerror(errno)); | |
696 | return; | |
697 | } | |
698 | result[len] = 0; | |
699 | elem->mode = canon_mode(st.st_mode); | |
700 | } | |
701 | else if (0 <= (fd = open(elem->path, O_RDONLY)) && | |
702 | !fstat(fd, &st)) { | |
dc49cd76 | 703 | size_t len = xsize_t(st.st_size); |
c697ad14 | 704 | ssize_t done; |
a249a9b5 | 705 | int is_file, i; |
ea726d02 | 706 | |
1b0c7174 | 707 | elem->mode = canon_mode(st.st_mode); |
a249a9b5 JS |
708 | /* if symlinks don't work, assume symlink if all parents |
709 | * are symlinks | |
710 | */ | |
711 | is_file = has_symlinks; | |
712 | for (i = 0; !is_file && i < num_parent; i++) | |
713 | is_file = !S_ISLNK(elem->parent[i].mode); | |
714 | if (!is_file) | |
715 | elem->mode = canon_mode(S_IFLNK); | |
716 | ||
f23fc773 | 717 | result_size = len; |
ea726d02 | 718 | result = xmalloc(len + 1); |
c697ad14 HO |
719 | |
720 | done = read_in_full(fd, result, len); | |
721 | if (done < 0) | |
722 | die("read error '%s'", elem->path); | |
723 | else if (done < len) | |
724 | die("early EOF '%s'", elem->path); | |
725 | ||
ea726d02 JH |
726 | result[len] = 0; |
727 | } | |
728 | else { | |
4fc970c4 | 729 | deleted_file: |
f23fc773 | 730 | result_size = 0; |
713a11fc | 731 | elem->mode = 0; |
28f75818 | 732 | result = xcalloc(1, 1); |
ea726d02 | 733 | } |
4fc970c4 | 734 | |
ea726d02 JH |
735 | if (0 <= fd) |
736 | close(fd); | |
737 | } | |
af3feefa | 738 | |
2386c297 | 739 | for (cnt = 0, cp = result; cp < result + result_size; cp++) { |
af3feefa JH |
740 | if (*cp == '\n') |
741 | cnt++; | |
742 | } | |
f23fc773 | 743 | if (result_size && result[result_size-1] != '\n') |
af3feefa JH |
744 | cnt++; /* incomplete line */ |
745 | ||
8a470ebf | 746 | sline = xcalloc(cnt+2, sizeof(*sline)); |
af3feefa | 747 | sline[0].bol = result; |
8a470ebf | 748 | for (lno = 0; lno <= cnt + 1; lno++) { |
4462731e JH |
749 | sline[lno].lost_tail = &sline[lno].lost_head; |
750 | sline[lno].flag = 0; | |
751 | } | |
2386c297 | 752 | for (lno = 0, cp = result; cp < result + result_size; cp++) { |
af3feefa JH |
753 | if (*cp == '\n') { |
754 | sline[lno].len = cp - sline[lno].bol; | |
af3feefa JH |
755 | lno++; |
756 | if (lno < cnt) | |
757 | sline[lno].bol = cp + 1; | |
758 | } | |
759 | } | |
f23fc773 JH |
760 | if (result_size && result[result_size-1] != '\n') |
761 | sline[cnt-1].len = result_size - (sline[cnt-1].bol - result); | |
762 | ||
763 | result_file.ptr = result; | |
764 | result_file.size = result_size; | |
af3feefa | 765 | |
8a470ebf JH |
766 | /* Even p_lno[cnt+1] is valid -- that is for the end line number |
767 | * for deletion hunk at the end. | |
768 | */ | |
769 | sline[0].p_lno = xcalloc((cnt+2) * num_parent, sizeof(unsigned long)); | |
770 | for (lno = 0; lno <= cnt; lno++) | |
f16706cc JH |
771 | sline[lno+1].p_lno = sline[lno].p_lno + num_parent; |
772 | ||
3c39e9bd JH |
773 | for (i = 0; i < num_parent; i++) { |
774 | int j; | |
775 | for (j = 0; j < i; j++) { | |
a89fccd2 DR |
776 | if (!hashcmp(elem->parent[i].sha1, |
777 | elem->parent[j].sha1)) { | |
3c39e9bd JH |
778 | reuse_combine_diff(sline, cnt, i, j); |
779 | break; | |
780 | } | |
781 | } | |
782 | if (i <= j) | |
f23fc773 | 783 | combine_diff(elem->parent[i].sha1, &result_file, sline, |
f16706cc | 784 | cnt, i, num_parent); |
2454c962 JH |
785 | if (elem->parent[i].mode != elem->mode) |
786 | mode_differs = 1; | |
3c39e9bd | 787 | } |
af3feefa | 788 | |
8828cdcb | 789 | show_hunks = make_hunks(sline, cnt, num_parent, dense); |
af3feefa | 790 | |
713a11fc | 791 | if (show_hunks || mode_differs || working_tree_file) { |
9843a1f6 | 792 | const char *abb; |
8f67f8ae | 793 | int use_color = DIFF_OPT_TST(opt, COLOR_DIFF); |
567a03d1 JH |
794 | const char *c_meta = diff_get_color(use_color, DIFF_METAINFO); |
795 | const char *c_reset = diff_get_color(use_color, DIFF_RESET); | |
d5f6a01a JH |
796 | int added = 0; |
797 | int deleted = 0; | |
9843a1f6 | 798 | |
44152787 | 799 | if (rev->loginfo && !rev->no_commit_id) |
02865655 | 800 | show_log(rev); |
567a03d1 | 801 | dump_quoted_path(dense ? "diff --cc " : "diff --combined ", |
462a15bc | 802 | "", elem->path, c_meta, c_reset); |
567a03d1 | 803 | printf("%sindex ", c_meta); |
823bcd6e | 804 | for (i = 0; i < num_parent; i++) { |
297a1aad | 805 | abb = find_unique_abbrev(elem->parent[i].sha1, |
e70c6b35 | 806 | abbrev); |
9843a1f6 | 807 | printf("%s%s", i ? "," : "", abb); |
823bcd6e | 808 | } |
e70c6b35 | 809 | abb = find_unique_abbrev(elem->sha1, abbrev); |
567a03d1 | 810 | printf("..%s%s\n", abb, c_reset); |
2454c962 JH |
811 | |
812 | if (mode_differs) { | |
d5f6a01a JH |
813 | deleted = !elem->mode; |
814 | ||
815 | /* We say it was added if nobody had it */ | |
816 | added = !deleted; | |
d416df88 JH |
817 | for (i = 0; added && i < num_parent; i++) |
818 | if (elem->parent[i].status != | |
819 | DIFF_STATUS_ADDED) | |
820 | added = 0; | |
821 | if (added) | |
567a03d1 JH |
822 | printf("%snew file mode %06o", |
823 | c_meta, elem->mode); | |
d416df88 | 824 | else { |
d5f6a01a | 825 | if (deleted) |
567a03d1 | 826 | printf("%sdeleted file ", c_meta); |
d416df88 JH |
827 | printf("mode "); |
828 | for (i = 0; i < num_parent; i++) { | |
829 | printf("%s%06o", i ? "," : "", | |
830 | elem->parent[i].mode); | |
831 | } | |
832 | if (elem->mode) | |
833 | printf("..%06o", elem->mode); | |
2454c962 | 834 | } |
567a03d1 | 835 | printf("%s\n", c_reset); |
2454c962 | 836 | } |
d5f6a01a | 837 | if (added) |
462a15bc JH |
838 | dump_quoted_path("--- ", "", "/dev/null", |
839 | c_meta, c_reset); | |
d5f6a01a | 840 | else |
462a15bc JH |
841 | dump_quoted_path("--- ", opt->a_prefix, elem->path, |
842 | c_meta, c_reset); | |
d5f6a01a | 843 | if (deleted) |
462a15bc JH |
844 | dump_quoted_path("+++ ", "", "/dev/null", |
845 | c_meta, c_reset); | |
d5f6a01a | 846 | else |
462a15bc JH |
847 | dump_quoted_path("+++ ", opt->b_prefix, elem->path, |
848 | c_meta, c_reset); | |
849 | dump_sline(sline, cnt, num_parent, | |
850 | DIFF_OPT_TST(opt, COLOR_DIFF)); | |
8828cdcb | 851 | } |
af3feefa JH |
852 | free(result); |
853 | ||
2386c297 JH |
854 | for (lno = 0; lno < cnt; lno++) { |
855 | if (sline[lno].lost_head) { | |
856 | struct lline *ll = sline[lno].lost_head; | |
af3feefa JH |
857 | while (ll) { |
858 | struct lline *tmp = ll; | |
859 | ll = ll->next; | |
860 | free(tmp); | |
861 | } | |
862 | } | |
863 | } | |
46dc9412 | 864 | free(sline[0].p_lno); |
af3feefa JH |
865 | free(sline); |
866 | } | |
867 | ||
ee638024 LT |
868 | #define COLONS "::::::::::::::::::::::::::::::::" |
869 | ||
91539833 | 870 | static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct rev_info *rev) |
ee638024 | 871 | { |
91539833 | 872 | struct diff_options *opt = &rev->diffopt; |
310f8b5b | 873 | int i, offset; |
ee638024 LT |
874 | const char *prefix; |
875 | int line_termination, inter_name_termination; | |
876 | ||
877 | line_termination = opt->line_termination; | |
878 | inter_name_termination = '\t'; | |
879 | if (!line_termination) | |
880 | inter_name_termination = 0; | |
881 | ||
44152787 | 882 | if (rev->loginfo && !rev->no_commit_id) |
02865655 | 883 | show_log(rev); |
ee638024 | 884 | |
c6744349 | 885 | if (opt->output_format & DIFF_FORMAT_RAW) { |
0a798076 JH |
886 | offset = strlen(COLONS) - num_parent; |
887 | if (offset < 0) | |
888 | offset = 0; | |
889 | prefix = COLONS + offset; | |
890 | ||
891 | /* Show the modes */ | |
892 | for (i = 0; i < num_parent; i++) { | |
893 | printf("%s%06o", prefix, p->parent[i].mode); | |
894 | prefix = " "; | |
895 | } | |
896 | printf("%s%06o", prefix, p->mode); | |
897 | ||
898 | /* Show sha1's */ | |
899 | for (i = 0; i < num_parent; i++) | |
900 | printf(" %s", diff_unique_abbrev(p->parent[i].sha1, | |
901 | opt->abbrev)); | |
902 | printf(" %s ", diff_unique_abbrev(p->sha1, opt->abbrev)); | |
903 | } | |
904 | ||
c6744349 | 905 | if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) { |
d416df88 JH |
906 | for (i = 0; i < num_parent; i++) |
907 | putchar(p->parent[i].status); | |
908 | putchar(inter_name_termination); | |
909 | } | |
0a798076 | 910 | |
663af342 | 911 | write_name_quoted(p->path, stdout, line_termination); |
0a798076 JH |
912 | } |
913 | ||
91539833 | 914 | void show_combined_diff(struct combine_diff_path *p, |
0a798076 JH |
915 | int num_parent, |
916 | int dense, | |
91539833 | 917 | struct rev_info *rev) |
0a798076 | 918 | { |
91539833 | 919 | struct diff_options *opt = &rev->diffopt; |
0a798076 | 920 | if (!p->len) |
91539833 | 921 | return; |
c6744349 TH |
922 | if (opt->output_format & (DIFF_FORMAT_RAW | |
923 | DIFF_FORMAT_NAME | | |
89b0c4b5 | 924 | DIFF_FORMAT_NAME_STATUS)) |
91539833 | 925 | show_raw_diff(p, num_parent, rev); |
89b0c4b5 | 926 | else if (opt->output_format & DIFF_FORMAT_PATCH) |
91539833 | 927 | show_patch_diff(p, num_parent, dense, rev); |
ee638024 LT |
928 | } |
929 | ||
0fe7c1de JH |
930 | void diff_tree_combined(const unsigned char *sha1, |
931 | const unsigned char parent[][20], | |
932 | int num_parent, | |
933 | int dense, | |
934 | struct rev_info *rev) | |
af3feefa | 935 | { |
91539833 | 936 | struct diff_options *opt = &rev->diffopt; |
af3feefa | 937 | struct diff_options diffopts; |
ea726d02 | 938 | struct combine_diff_path *p, *paths = NULL; |
3969cf7d | 939 | int i, num_paths, needsep, show_log_first; |
af3feefa | 940 | |
5b236832 | 941 | diffopts = *opt; |
3969cf7d | 942 | diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; |
8f67f8ae PH |
943 | DIFF_OPT_SET(&diffopts, RECURSIVE); |
944 | DIFF_OPT_CLR(&diffopts, ALLOW_EXTERNAL); | |
af3feefa | 945 | |
44152787 | 946 | show_log_first = !!rev->loginfo && !rev->no_commit_id; |
3969cf7d | 947 | needsep = 0; |
af3feefa | 948 | /* find set of paths that everybody touches */ |
0fe7c1de | 949 | for (i = 0; i < num_parent; i++) { |
965f803c JH |
950 | /* show stat against the first parent even |
951 | * when doing combined diff. | |
952 | */ | |
74e2abe5 JH |
953 | int stat_opt = (opt->output_format & |
954 | (DIFF_FORMAT_NUMSTAT|DIFF_FORMAT_DIFFSTAT)); | |
955 | if (i == 0 && stat_opt) | |
956 | diffopts.output_format = stat_opt; | |
965f803c JH |
957 | else |
958 | diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
0fe7c1de | 959 | diff_tree_sha1(parent[i], sha1, "", &diffopts); |
5b236832 | 960 | diffcore_std(&diffopts); |
af3feefa | 961 | paths = intersect_paths(paths, i, num_parent); |
eab144ac | 962 | |
3969cf7d | 963 | if (show_log_first && i == 0) { |
02865655 | 964 | show_log(rev); |
3969cf7d JH |
965 | if (rev->verbose_header && opt->output_format) |
966 | putchar(opt->line_termination); | |
967 | } | |
af3feefa JH |
968 | diff_flush(&diffopts); |
969 | } | |
970 | ||
971 | /* find out surviving paths */ | |
972 | for (num_paths = 0, p = paths; p; p = p->next) { | |
973 | if (p->len) | |
974 | num_paths++; | |
975 | } | |
e3c3a550 | 976 | if (num_paths) { |
c6744349 TH |
977 | if (opt->output_format & (DIFF_FORMAT_RAW | |
978 | DIFF_FORMAT_NAME | | |
979 | DIFF_FORMAT_NAME_STATUS)) { | |
86ff1d20 | 980 | for (p = paths; p; p = p->next) { |
c6744349 TH |
981 | if (p->len) |
982 | show_raw_diff(p, num_parent, rev); | |
86ff1d20 | 983 | } |
3969cf7d | 984 | needsep = 1; |
86ff1d20 | 985 | } |
74e2abe5 JH |
986 | else if (opt->output_format & |
987 | (DIFF_FORMAT_NUMSTAT|DIFF_FORMAT_DIFFSTAT)) | |
3969cf7d | 988 | needsep = 1; |
c6744349 | 989 | if (opt->output_format & DIFF_FORMAT_PATCH) { |
3969cf7d JH |
990 | if (needsep) |
991 | putchar(opt->line_termination); | |
c6744349 TH |
992 | for (p = paths; p; p = p->next) { |
993 | if (p->len) | |
994 | show_patch_diff(p, num_parent, dense, | |
995 | rev); | |
996 | } | |
af3feefa JH |
997 | } |
998 | } | |
999 | ||
1000 | /* Clean things up */ | |
1001 | while (paths) { | |
ea726d02 | 1002 | struct combine_diff_path *tmp = paths; |
af3feefa JH |
1003 | paths = paths->next; |
1004 | free(tmp); | |
1005 | } | |
af3feefa | 1006 | } |
0fe7c1de JH |
1007 | |
1008 | void diff_tree_combined_merge(const unsigned char *sha1, | |
1009 | int dense, struct rev_info *rev) | |
1010 | { | |
1011 | int num_parent; | |
1012 | const unsigned char (*parent)[20]; | |
1013 | struct commit *commit = lookup_commit(sha1); | |
1014 | struct commit_list *parents; | |
1015 | ||
1016 | /* count parents */ | |
1017 | for (parents = commit->parents, num_parent = 0; | |
1018 | parents; | |
1019 | parents = parents->next, num_parent++) | |
1020 | ; /* nothing */ | |
1021 | ||
1022 | parent = xmalloc(num_parent * sizeof(*parent)); | |
1023 | for (parents = commit->parents, num_parent = 0; | |
1024 | parents; | |
1025 | parents = parents->next, num_parent++) | |
e702496e SP |
1026 | hashcpy((unsigned char*)(parent + num_parent), |
1027 | parents->item->object.sha1); | |
0fe7c1de JH |
1028 | diff_tree_combined(sha1, parent, num_parent, dense, rev); |
1029 | } |