]>
Commit | Line | Data |
---|---|---|
d9c66f0b JS |
1 | #include "cache.h" |
2 | #include "range-diff.h" | |
3 | #include "string-list.h" | |
4 | #include "run-command.h" | |
dbbcd44f | 5 | #include "strvec.h" |
d9c66f0b JS |
6 | #include "hashmap.h" |
7 | #include "xdiff-interface.h" | |
8 | #include "linear-assignment.h" | |
c8c5e43a | 9 | #include "diffcore.h" |
eb0be38c JS |
10 | #include "commit.h" |
11 | #include "pretty.h" | |
4eba1fe6 | 12 | #include "userdiff.h" |
b66885a3 | 13 | #include "apply.h" |
359f0d75 | 14 | #include "revision.h" |
d9c66f0b JS |
15 | |
16 | struct patch_util { | |
17 | /* For the search for an exact match */ | |
18 | struct hashmap_entry e; | |
19 | const char *diff, *patch; | |
20 | ||
9dc46e02 | 21 | int i, shown; |
d9c66f0b JS |
22 | int diffsize; |
23 | size_t diff_offset; | |
24 | /* the index of the matching item in the other branch, or -1 */ | |
25 | int matching; | |
26 | struct object_id oid; | |
27 | }; | |
28 | ||
29 | /* | |
30 | * Reads the patches into a string list, with the `util` field being populated | |
31 | * as struct object_id (will need to be free()d). | |
32 | */ | |
bd361918 | 33 | static int read_patches(const char *range, struct string_list *list, |
c972bf4c | 34 | const struct strvec *other_arg) |
d9c66f0b JS |
35 | { |
36 | struct child_process cp = CHILD_PROCESS_INIT; | |
44b67cb6 | 37 | struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT; |
d9c66f0b JS |
38 | struct patch_util *util = NULL; |
39 | int in_header = 1; | |
444e0969 | 40 | char *line, *current_filename = NULL; |
c4d59073 | 41 | ssize_t len; |
44b67cb6 | 42 | size_t size; |
2d102c2b | 43 | int ret = -1; |
d9c66f0b | 44 | |
c972bf4c | 45 | strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges", |
f6d8942b | 46 | "--reverse", "--date-order", "--decorate=no", |
04b1f1fd | 47 | "--no-prefix", "--submodule=short", |
f6d8942b JK |
48 | /* |
49 | * Choose indicators that are not used anywhere | |
50 | * else in diffs, but still look reasonable | |
51 | * (e.g. will not be confusing when debugging) | |
52 | */ | |
53 | "--output-indicator-new=>", | |
54 | "--output-indicator-old=<", | |
55 | "--output-indicator-context=#", | |
56 | "--no-abbrev-commit", | |
57 | "--pretty=medium", | |
58 | "--notes", | |
59 | NULL); | |
b7574782 | 60 | strvec_push(&cp.args, range); |
bd361918 | 61 | if (other_arg) |
d70a9eb6 | 62 | strvec_pushv(&cp.args, other_arg->v); |
d9c66f0b JS |
63 | cp.out = -1; |
64 | cp.no_stdin = 1; | |
65 | cp.git_cmd = 1; | |
66 | ||
67 | if (start_command(&cp)) | |
68 | return error_errno(_("could not start `log`")); | |
44b67cb6 | 69 | if (strbuf_read(&contents, cp.out, 0) < 0) { |
d9c66f0b JS |
70 | error_errno(_("could not read `log` output")); |
71 | finish_command(&cp); | |
2d102c2b | 72 | goto cleanup; |
d9c66f0b | 73 | } |
5189bb87 | 74 | if (finish_command(&cp)) |
2d102c2b | 75 | goto cleanup; |
d9c66f0b | 76 | |
44b67cb6 TG |
77 | line = contents.buf; |
78 | size = contents.len; | |
47ac23d3 | 79 | for (; size > 0; size -= len, line += len) { |
d9c66f0b | 80 | const char *p; |
7c86d365 JK |
81 | char *eol; |
82 | ||
83 | eol = memchr(line, '\n', size); | |
84 | if (eol) { | |
85 | *eol = '\0'; | |
86 | len = eol + 1 - line; | |
87 | } else { | |
88 | len = size; | |
89 | } | |
d9c66f0b | 90 | |
44b67cb6 | 91 | if (skip_prefix(line, "commit ", &p)) { |
d9c66f0b JS |
92 | if (util) { |
93 | string_list_append(list, buf.buf)->util = util; | |
94 | strbuf_reset(&buf); | |
95 | } | |
ca56dadb | 96 | CALLOC_ARRAY(util, 1); |
d9c66f0b JS |
97 | if (get_oid(p, &util->oid)) { |
98 | error(_("could not parse commit '%s'"), p); | |
2d102c2b | 99 | FREE_AND_NULL(util); |
d9c66f0b | 100 | string_list_clear(list, 1); |
2d102c2b | 101 | goto cleanup; |
d9c66f0b JS |
102 | } |
103 | util->matching = -1; | |
104 | in_header = 1; | |
105 | continue; | |
106 | } | |
107 | ||
8cf51561 VD |
108 | if (!util) { |
109 | error(_("could not parse first line of `log` output: " | |
110 | "did not start with 'commit ': '%s'"), | |
111 | line); | |
112 | string_list_clear(list, 1); | |
2d102c2b | 113 | goto cleanup; |
8cf51561 VD |
114 | } |
115 | ||
44b67cb6 | 116 | if (starts_with(line, "diff --git")) { |
b66885a3 TG |
117 | struct patch patch = { 0 }; |
118 | struct strbuf root = STRBUF_INIT; | |
119 | int linenr = 0; | |
8d1675eb | 120 | int orig_len; |
b66885a3 | 121 | |
d9c66f0b JS |
122 | in_header = 0; |
123 | strbuf_addch(&buf, '\n'); | |
124 | if (!util->diff_offset) | |
125 | util->diff_offset = buf.len; | |
7c86d365 JK |
126 | if (eol) |
127 | *eol = '\n'; | |
8d1675eb | 128 | orig_len = len; |
937b76ed | 129 | len = parse_git_diff_header(&root, &linenr, 0, line, |
b66885a3 | 130 | len, size, &patch); |
a2d474ad JS |
131 | if (len < 0) { |
132 | error(_("could not parse git header '%.*s'"), | |
133 | orig_len, line); | |
2d102c2b | 134 | FREE_AND_NULL(util); |
a2d474ad | 135 | string_list_clear(list, 1); |
2d102c2b | 136 | goto cleanup; |
a2d474ad | 137 | } |
b66885a3 TG |
138 | strbuf_addstr(&buf, " ## "); |
139 | if (patch.is_new > 0) | |
140 | strbuf_addf(&buf, "%s (new)", patch.new_name); | |
141 | else if (patch.is_delete > 0) | |
142 | strbuf_addf(&buf, "%s (deleted)", patch.old_name); | |
143 | else if (patch.is_rename) | |
144 | strbuf_addf(&buf, "%s => %s", patch.old_name, patch.new_name); | |
145 | else | |
146 | strbuf_addstr(&buf, patch.new_name); | |
147 | ||
444e0969 TG |
148 | free(current_filename); |
149 | if (patch.is_delete > 0) | |
150 | current_filename = xstrdup(patch.old_name); | |
151 | else | |
152 | current_filename = xstrdup(patch.new_name); | |
153 | ||
b66885a3 TG |
154 | if (patch.new_mode && patch.old_mode && |
155 | patch.old_mode != patch.new_mode) | |
156 | strbuf_addf(&buf, " (mode change %06o => %06o)", | |
157 | patch.old_mode, patch.new_mode); | |
158 | ||
159 | strbuf_addstr(&buf, " ##"); | |
4998e93f | 160 | release_patch(&patch); |
d9c66f0b | 161 | } else if (in_header) { |
44b67cb6 | 162 | if (starts_with(line, "Author: ")) { |
499352c2 | 163 | strbuf_addstr(&buf, " ## Metadata ##\n"); |
44b67cb6 | 164 | strbuf_addstr(&buf, line); |
d9c66f0b | 165 | strbuf_addstr(&buf, "\n\n"); |
499352c2 | 166 | strbuf_addstr(&buf, " ## Commit message ##\n"); |
9f726e1b DL |
167 | } else if (starts_with(line, "Notes") && |
168 | line[strlen(line) - 1] == ':') { | |
169 | strbuf_addstr(&buf, "\n\n"); | |
170 | /* strip the trailing colon */ | |
171 | strbuf_addf(&buf, " ## %.*s ##\n", | |
172 | (int)(strlen(line) - 1), line); | |
44b67cb6 TG |
173 | } else if (starts_with(line, " ")) { |
174 | p = line + len - 2; | |
175 | while (isspace(*p) && p >= line) | |
176 | p--; | |
177 | strbuf_add(&buf, line, p - line + 1); | |
d9c66f0b JS |
178 | strbuf_addch(&buf, '\n'); |
179 | } | |
180 | continue; | |
e1db2630 TG |
181 | } else if (skip_prefix(line, "@@ ", &p)) { |
182 | p = strstr(p, "@@"); | |
444e0969 TG |
183 | strbuf_addstr(&buf, "@@"); |
184 | if (current_filename && p[2]) | |
185 | strbuf_addf(&buf, " %s:", current_filename); | |
186 | if (p) | |
187 | strbuf_addstr(&buf, p + 2); | |
b66885a3 | 188 | } else if (!line[0]) |
d9c66f0b JS |
189 | /* |
190 | * A completely blank (not ' \n', which is context) | |
191 | * line is not valid in a diff. We skip it | |
192 | * silently, because this neatly handles the blank | |
193 | * separator line between commits in git-log | |
194 | * output. | |
d9c66f0b JS |
195 | */ |
196 | continue; | |
44b67cb6 | 197 | else if (line[0] == '>') { |
8d5ccb59 | 198 | strbuf_addch(&buf, '+'); |
44b67cb6 TG |
199 | strbuf_addstr(&buf, line + 1); |
200 | } else if (line[0] == '<') { | |
8d5ccb59 | 201 | strbuf_addch(&buf, '-'); |
44b67cb6 TG |
202 | strbuf_addstr(&buf, line + 1); |
203 | } else if (line[0] == '#') { | |
8d5ccb59 | 204 | strbuf_addch(&buf, ' '); |
44b67cb6 | 205 | strbuf_addstr(&buf, line + 1); |
8d5ccb59 | 206 | } else { |
2543a641 | 207 | strbuf_addch(&buf, ' '); |
44b67cb6 | 208 | strbuf_addstr(&buf, line); |
8d5ccb59 | 209 | } |
d9c66f0b JS |
210 | |
211 | strbuf_addch(&buf, '\n'); | |
212 | util->diffsize++; | |
213 | } | |
2d102c2b ÆAB |
214 | |
215 | ret = 0; | |
216 | cleanup: | |
44b67cb6 | 217 | strbuf_release(&contents); |
d9c66f0b JS |
218 | |
219 | if (util) | |
220 | string_list_append(list, buf.buf)->util = util; | |
221 | strbuf_release(&buf); | |
444e0969 | 222 | free(current_filename); |
d9c66f0b | 223 | |
2d102c2b | 224 | return ret; |
d9c66f0b JS |
225 | } |
226 | ||
5cf88fd8 | 227 | static int patch_util_cmp(const void *cmp_data UNUSED, |
02c3c59e JK |
228 | const struct patch_util *a, |
229 | const struct patch_util *b, | |
230 | const char *keydata) | |
d9c66f0b JS |
231 | { |
232 | return strcmp(a->diff, keydata ? keydata : b->diff); | |
233 | } | |
234 | ||
235 | static void find_exact_matches(struct string_list *a, struct string_list *b) | |
236 | { | |
b19315d8 | 237 | struct hashmap map = HASHMAP_INIT((hashmap_cmp_fn)patch_util_cmp, NULL); |
d9c66f0b JS |
238 | int i; |
239 | ||
d9c66f0b JS |
240 | /* First, add the patches of a to a hash map */ |
241 | for (i = 0; i < a->nr; i++) { | |
242 | struct patch_util *util = a->items[i].util; | |
243 | ||
244 | util->i = i; | |
245 | util->patch = a->items[i].string; | |
246 | util->diff = util->patch + util->diff_offset; | |
d22245a2 | 247 | hashmap_entry_init(&util->e, strhash(util->diff)); |
b94e5c1d | 248 | hashmap_add(&map, &util->e); |
d9c66f0b JS |
249 | } |
250 | ||
251 | /* Now try to find exact matches in b */ | |
252 | for (i = 0; i < b->nr; i++) { | |
253 | struct patch_util *util = b->items[i].util, *other; | |
254 | ||
255 | util->i = i; | |
256 | util->patch = b->items[i].string; | |
257 | util->diff = util->patch + util->diff_offset; | |
d22245a2 | 258 | hashmap_entry_init(&util->e, strhash(util->diff)); |
404ab78e | 259 | other = hashmap_remove_entry(&map, util, e, NULL); |
d9c66f0b JS |
260 | if (other) { |
261 | if (other->matching >= 0) | |
262 | BUG("already assigned!"); | |
263 | ||
264 | other->matching = i; | |
265 | util->matching = other->i; | |
266 | } | |
267 | } | |
268 | ||
6da1a258 | 269 | hashmap_clear(&map); |
d9c66f0b JS |
270 | } |
271 | ||
61bdc7c5 JK |
272 | static int diffsize_consume(void *data, |
273 | char *line UNUSED, | |
274 | unsigned long len UNUSED) | |
d9c66f0b JS |
275 | { |
276 | (*(int *)data)++; | |
a8d5eb6d | 277 | return 0; |
d9c66f0b JS |
278 | } |
279 | ||
61bdc7c5 JK |
280 | static void diffsize_hunk(void *data, |
281 | long ob UNUSED, long on UNUSED, | |
282 | long nb UNUSED, long nn UNUSED, | |
283 | const char *func UNUSED, long funclen UNUSED) | |
d2eb8093 JK |
284 | { |
285 | diffsize_consume(data, NULL, 0); | |
286 | } | |
287 | ||
d9c66f0b JS |
288 | static int diffsize(const char *a, const char *b) |
289 | { | |
290 | xpparam_t pp = { 0 }; | |
291 | xdemitconf_t cfg = { 0 }; | |
292 | mmfile_t mf1, mf2; | |
293 | int count = 0; | |
294 | ||
295 | mf1.ptr = (char *)a; | |
296 | mf1.size = strlen(a); | |
297 | mf2.ptr = (char *)b; | |
298 | mf2.size = strlen(b); | |
299 | ||
300 | cfg.ctxlen = 3; | |
d2eb8093 JK |
301 | if (!xdi_diff_outf(&mf1, &mf2, |
302 | diffsize_hunk, diffsize_consume, &count, | |
303 | &pp, &cfg)) | |
d9c66f0b JS |
304 | return count; |
305 | ||
306 | error(_("failed to generate diff")); | |
307 | return COST_MAX; | |
308 | } | |
309 | ||
310 | static void get_correspondences(struct string_list *a, struct string_list *b, | |
311 | int creation_factor) | |
312 | { | |
313 | int n = a->nr + b->nr; | |
314 | int *cost, c, *a2b, *b2a; | |
315 | int i, j; | |
316 | ||
317 | ALLOC_ARRAY(cost, st_mult(n, n)); | |
318 | ALLOC_ARRAY(a2b, n); | |
319 | ALLOC_ARRAY(b2a, n); | |
320 | ||
321 | for (i = 0; i < a->nr; i++) { | |
322 | struct patch_util *a_util = a->items[i].util; | |
323 | ||
324 | for (j = 0; j < b->nr; j++) { | |
325 | struct patch_util *b_util = b->items[j].util; | |
326 | ||
327 | if (a_util->matching == j) | |
328 | c = 0; | |
329 | else if (a_util->matching < 0 && b_util->matching < 0) | |
330 | c = diffsize(a_util->diff, b_util->diff); | |
331 | else | |
332 | c = COST_MAX; | |
333 | cost[i + n * j] = c; | |
334 | } | |
335 | ||
336 | c = a_util->matching < 0 ? | |
337 | a_util->diffsize * creation_factor / 100 : COST_MAX; | |
338 | for (j = b->nr; j < n; j++) | |
339 | cost[i + n * j] = c; | |
340 | } | |
341 | ||
342 | for (j = 0; j < b->nr; j++) { | |
343 | struct patch_util *util = b->items[j].util; | |
344 | ||
345 | c = util->matching < 0 ? | |
346 | util->diffsize * creation_factor / 100 : COST_MAX; | |
347 | for (i = a->nr; i < n; i++) | |
348 | cost[i + n * j] = c; | |
349 | } | |
350 | ||
351 | for (i = a->nr; i < n; i++) | |
352 | for (j = b->nr; j < n; j++) | |
353 | cost[i + n * j] = 0; | |
354 | ||
355 | compute_assignment(n, n, cost, a2b, b2a); | |
356 | ||
357 | for (i = 0; i < a->nr; i++) | |
358 | if (a2b[i] >= 0 && a2b[i] < b->nr) { | |
359 | struct patch_util *a_util = a->items[i].util; | |
360 | struct patch_util *b_util = b->items[a2b[i]].util; | |
361 | ||
362 | a_util->matching = a2b[i]; | |
363 | b_util->matching = i; | |
364 | } | |
365 | ||
366 | free(cost); | |
367 | free(a2b); | |
368 | free(b2a); | |
369 | } | |
370 | ||
faa1df86 | 371 | static void output_pair_header(struct diff_options *diffopt, |
d1f87a2d | 372 | int patch_no_width, |
faa1df86 | 373 | struct strbuf *buf, |
eb0be38c JS |
374 | struct strbuf *dashes, |
375 | struct patch_util *a_util, | |
376 | struct patch_util *b_util) | |
d9c66f0b | 377 | { |
eb0be38c JS |
378 | struct object_id *oid = a_util ? &a_util->oid : &b_util->oid; |
379 | struct commit *commit; | |
faa1df86 JS |
380 | char status; |
381 | const char *color_reset = diff_get_color_opt(diffopt, DIFF_RESET); | |
382 | const char *color_old = diff_get_color_opt(diffopt, DIFF_FILE_OLD); | |
383 | const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW); | |
384 | const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT); | |
385 | const char *color; | |
d9165bef | 386 | int abbrev = diffopt->abbrev; |
2b15969f TL |
387 | |
388 | if (abbrev < 0) | |
389 | abbrev = DEFAULT_ABBREV; | |
eb0be38c JS |
390 | |
391 | if (!dashes->len) | |
392 | strbuf_addchars(dashes, '-', | |
2b15969f | 393 | strlen(find_unique_abbrev(oid, abbrev))); |
eb0be38c | 394 | |
faa1df86 JS |
395 | if (!b_util) { |
396 | color = color_old; | |
397 | status = '<'; | |
398 | } else if (!a_util) { | |
399 | color = color_new; | |
400 | status = '>'; | |
401 | } else if (strcmp(a_util->patch, b_util->patch)) { | |
402 | color = color_commit; | |
403 | status = '!'; | |
404 | } else { | |
405 | color = color_commit; | |
406 | status = '='; | |
407 | } | |
408 | ||
eb0be38c | 409 | strbuf_reset(buf); |
faa1df86 | 410 | strbuf_addstr(buf, status == '!' ? color_old : color); |
eb0be38c | 411 | if (!a_util) |
d1f87a2d | 412 | strbuf_addf(buf, "%*s: %s ", patch_no_width, "-", dashes->buf); |
eb0be38c | 413 | else |
d1f87a2d | 414 | strbuf_addf(buf, "%*d: %s ", patch_no_width, a_util->i + 1, |
2b15969f | 415 | find_unique_abbrev(&a_util->oid, abbrev)); |
eb0be38c | 416 | |
faa1df86 JS |
417 | if (status == '!') |
418 | strbuf_addf(buf, "%s%s", color_reset, color); | |
419 | strbuf_addch(buf, status); | |
420 | if (status == '!') | |
421 | strbuf_addf(buf, "%s%s", color_reset, color_new); | |
eb0be38c JS |
422 | |
423 | if (!b_util) | |
d1f87a2d | 424 | strbuf_addf(buf, " %*s: %s", patch_no_width, "-", dashes->buf); |
eb0be38c | 425 | else |
d1f87a2d | 426 | strbuf_addf(buf, " %*d: %s", patch_no_width, b_util->i + 1, |
2b15969f | 427 | find_unique_abbrev(&b_util->oid, abbrev)); |
eb0be38c JS |
428 | |
429 | commit = lookup_commit_reference(the_repository, oid); | |
430 | if (commit) { | |
faa1df86 JS |
431 | if (status == '!') |
432 | strbuf_addf(buf, "%s%s", color_reset, color); | |
433 | ||
eb0be38c JS |
434 | strbuf_addch(buf, ' '); |
435 | pp_commit_easy(CMIT_FMT_ONELINE, commit, buf); | |
436 | } | |
faa1df86 | 437 | strbuf_addf(buf, "%s\n", color_reset); |
eb0be38c | 438 | |
87f1b2d4 | 439 | fwrite(buf->buf, buf->len, 1, diffopt->file); |
d9c66f0b JS |
440 | } |
441 | ||
499352c2 TG |
442 | static struct userdiff_driver section_headers = { |
443 | .funcname = { "^ ## (.*) ##$\n" | |
444 | "^.?@@ (.*)$", REG_EXTENDED } | |
4eba1fe6 JS |
445 | }; |
446 | ||
c8c5e43a JS |
447 | static struct diff_filespec *get_filespec(const char *name, const char *p) |
448 | { | |
449 | struct diff_filespec *spec = alloc_filespec(name); | |
450 | ||
14228447 | 451 | fill_filespec(spec, null_oid(), 0, 0100644); |
c8c5e43a JS |
452 | spec->data = (char *)p; |
453 | spec->size = strlen(p); | |
454 | spec->should_munmap = 0; | |
455 | spec->is_stdin = 1; | |
499352c2 | 456 | spec->driver = §ion_headers; |
c8c5e43a JS |
457 | |
458 | return spec; | |
459 | } | |
460 | ||
461 | static void patch_diff(const char *a, const char *b, | |
1ca69225 | 462 | struct diff_options *diffopt) |
c8c5e43a JS |
463 | { |
464 | diff_queue(&diff_queued_diff, | |
465 | get_filespec("a", a), get_filespec("b", b)); | |
466 | ||
467 | diffcore_std(diffopt); | |
468 | diff_flush(diffopt); | |
469 | } | |
470 | ||
61bdc7c5 | 471 | static struct strbuf *output_prefix_cb(struct diff_options *opt UNUSED, void *data) |
3e6046ed JS |
472 | { |
473 | return data; | |
474 | } | |
475 | ||
c8c5e43a | 476 | static void output(struct string_list *a, struct string_list *b, |
3e6046ed | 477 | struct range_diff_options *range_diff_opts) |
d9c66f0b | 478 | { |
eb0be38c | 479 | struct strbuf buf = STRBUF_INIT, dashes = STRBUF_INIT; |
d1f87a2d | 480 | int patch_no_width = decimal_width(1 + (a->nr > b->nr ? a->nr : b->nr)); |
9dc46e02 | 481 | int i = 0, j = 0; |
3e6046ed JS |
482 | struct diff_options opts; |
483 | struct strbuf indent = STRBUF_INIT; | |
484 | ||
485 | if (range_diff_opts->diffopt) | |
486 | memcpy(&opts, range_diff_opts->diffopt, sizeof(opts)); | |
487 | else | |
488 | diff_setup(&opts); | |
489 | ||
709b3f32 | 490 | opts.no_free = 1; |
3e6046ed JS |
491 | if (!opts.output_format) |
492 | opts.output_format = DIFF_FORMAT_PATCH; | |
493 | opts.flags.suppress_diff_headers = 1; | |
494 | opts.flags.dual_color_diffed_diffs = | |
495 | range_diff_opts->dual_color; | |
496 | opts.flags.suppress_hunk_header_line_count = 1; | |
497 | opts.output_prefix = output_prefix_cb; | |
498 | strbuf_addstr(&indent, " "); | |
499 | opts.output_prefix_data = &indent; | |
500 | diff_setup_done(&opts); | |
9dc46e02 JS |
501 | |
502 | /* | |
503 | * We assume the user is really more interested in the second argument | |
504 | * ("newer" version). To that end, we print the output in the order of | |
505 | * the RHS (the `b` parameter). To put the LHS (the `a` parameter) | |
506 | * commits that are no longer in the RHS into a good place, we place | |
507 | * them once we have shown all of their predecessors in the LHS. | |
508 | */ | |
509 | ||
510 | while (i < a->nr || j < b->nr) { | |
511 | struct patch_util *a_util, *b_util; | |
512 | a_util = i < a->nr ? a->items[i].util : NULL; | |
513 | b_util = j < b->nr ? b->items[j].util : NULL; | |
514 | ||
515 | /* Skip all the already-shown commits from the LHS. */ | |
516 | while (i < a->nr && a_util->shown) | |
517 | a_util = ++i < a->nr ? a->items[i].util : NULL; | |
518 | ||
519 | /* Show unmatched LHS commit whose predecessors were shown. */ | |
520 | if (i < a->nr && a_util->matching < 0) { | |
1e79f973 JS |
521 | if (!range_diff_opts->right_only) |
522 | output_pair_header(&opts, patch_no_width, | |
faa1df86 | 523 | &buf, &dashes, a_util, NULL); |
9dc46e02 JS |
524 | i++; |
525 | continue; | |
526 | } | |
d9c66f0b | 527 | |
9dc46e02 JS |
528 | /* Show unmatched RHS commits. */ |
529 | while (j < b->nr && b_util->matching < 0) { | |
1e79f973 JS |
530 | if (!range_diff_opts->left_only) |
531 | output_pair_header(&opts, patch_no_width, | |
faa1df86 | 532 | &buf, &dashes, NULL, b_util); |
9dc46e02 | 533 | b_util = ++j < b->nr ? b->items[j].util : NULL; |
d9c66f0b | 534 | } |
d9c66f0b | 535 | |
9dc46e02 JS |
536 | /* Show matching LHS/RHS pair. */ |
537 | if (j < b->nr) { | |
538 | a_util = a->items[b_util->matching].util; | |
3e6046ed | 539 | output_pair_header(&opts, patch_no_width, |
faa1df86 | 540 | &buf, &dashes, a_util, b_util); |
3e6046ed | 541 | if (!(opts.output_format & DIFF_FORMAT_NO_OUTPUT)) |
c8c5e43a | 542 | patch_diff(a->items[b_util->matching].string, |
3e6046ed | 543 | b->items[j].string, &opts); |
9dc46e02 JS |
544 | a_util->shown = 1; |
545 | j++; | |
546 | } | |
d9c66f0b | 547 | } |
eb0be38c JS |
548 | strbuf_release(&buf); |
549 | strbuf_release(&dashes); | |
3e6046ed | 550 | strbuf_release(&indent); |
709b3f32 RS |
551 | opts.no_free = 0; |
552 | diff_free(&opts); | |
73a834e9 ES |
553 | } |
554 | ||
d9c66f0b | 555 | int show_range_diff(const char *range1, const char *range2, |
f1ce6c19 | 556 | struct range_diff_options *range_diff_opts) |
d9c66f0b JS |
557 | { |
558 | int res = 0; | |
559 | ||
560 | struct string_list branch1 = STRING_LIST_INIT_DUP; | |
561 | struct string_list branch2 = STRING_LIST_INIT_DUP; | |
562 | ||
1e79f973 | 563 | if (range_diff_opts->left_only && range_diff_opts->right_only) |
43ea635c | 564 | res = error(_("options '%s' and '%s' cannot be used together"), "--left-only", "--right-only"); |
1e79f973 JS |
565 | |
566 | if (!res && read_patches(range1, &branch1, range_diff_opts->other_arg)) | |
d9c66f0b | 567 | res = error(_("could not parse log for '%s'"), range1); |
f1ce6c19 | 568 | if (!res && read_patches(range2, &branch2, range_diff_opts->other_arg)) |
d9c66f0b JS |
569 | res = error(_("could not parse log for '%s'"), range2); |
570 | ||
571 | if (!res) { | |
572 | find_exact_matches(&branch1, &branch2); | |
f1ce6c19 JS |
573 | get_correspondences(&branch1, &branch2, |
574 | range_diff_opts->creation_factor); | |
3e6046ed | 575 | output(&branch1, &branch2, range_diff_opts); |
d9c66f0b JS |
576 | } |
577 | ||
578 | string_list_clear(&branch1, 1); | |
579 | string_list_clear(&branch2, 1); | |
580 | ||
581 | return res; | |
582 | } | |
679b5916 JS |
583 | |
584 | int is_range_diff_range(const char *arg) | |
585 | { | |
359f0d75 JS |
586 | char *copy = xstrdup(arg); /* setup_revisions() modifies it */ |
587 | const char *argv[] = { "", copy, "--", NULL }; | |
588 | int i, positive = 0, negative = 0; | |
589 | struct rev_info revs; | |
590 | ||
591 | init_revisions(&revs, NULL); | |
592 | if (setup_revisions(3, argv, &revs, NULL) == 1) { | |
593 | for (i = 0; i < revs.pending.nr; i++) | |
594 | if (revs.pending.objects[i].item->flags & UNINTERESTING) | |
595 | negative++; | |
596 | else | |
597 | positive++; | |
598 | for (i = 0; i < revs.pending.nr; i++) { | |
599 | struct object *obj = revs.pending.objects[i].item; | |
600 | ||
601 | if (obj->type == OBJ_COMMIT) | |
602 | clear_commit_marks((struct commit *)obj, | |
603 | ALL_REV_FLAGS); | |
604 | } | |
605 | } | |
606 | ||
607 | free(copy); | |
1878b5ed | 608 | release_revisions(&revs); |
359f0d75 | 609 | return negative > 0 && positive > 0; |
679b5916 | 610 | } |