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