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