2 #include "range-diff.h"
3 #include "string-list.h"
4 #include "run-command.h"
7 #include "xdiff-interface.h"
8 #include "linear-assignment.h"
16 /* For the search for an exact match */
17 struct hashmap_entry e;
18 const char *diff, *patch;
23 /* the index of the matching item in the other branch, or -1 */
28 static size_t find_end_of_line(char *buffer, unsigned long size)
30 char *eol = memchr(buffer, '\n', size);
36 return eol + 1 - buffer;
40 * Reads the patches into a string list, with the `util` field being populated
41 * as struct object_id (will need to be free()d).
43 static int read_patches(const char *range, struct string_list *list,
44 const struct strvec *other_arg)
46 struct child_process cp = CHILD_PROCESS_INIT;
47 struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
48 struct patch_util *util = NULL;
50 char *line, *current_filename = NULL;
54 strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
55 "--reverse", "--date-order", "--decorate=no",
58 * Choose indicators that are not used anywhere
59 * else in diffs, but still look reasonable
60 * (e.g. will not be confusing when debugging)
62 "--output-indicator-new=>",
63 "--output-indicator-old=<",
64 "--output-indicator-context=#",
70 strvec_pushv(&cp.args, other_arg->v);
71 strvec_push(&cp.args, range);
76 if (start_command(&cp))
77 return error_errno(_("could not start `log`"));
78 if (strbuf_read(&contents, cp.out, 0) < 0) {
79 error_errno(_("could not read `log` output"));
86 for (offset = 0; size > 0; offset += len, size -= len, line += len) {
89 len = find_end_of_line(line, size);
91 if (skip_prefix(line, "commit ", &p)) {
93 string_list_append(list, buf.buf)->util = util;
96 util = xcalloc(sizeof(*util), 1);
97 if (get_oid(p, &util->oid)) {
98 error(_("could not parse commit '%s'"), p);
100 string_list_clear(list, 1);
101 strbuf_release(&buf);
102 strbuf_release(&contents);
112 error(_("could not parse first line of `log` output: "
113 "did not start with 'commit ': '%s'"),
115 string_list_clear(list, 1);
116 strbuf_release(&buf);
117 strbuf_release(&contents);
122 if (starts_with(line, "diff --git")) {
123 struct patch patch = { 0 };
124 struct strbuf root = STRBUF_INIT;
129 strbuf_addch(&buf, '\n');
130 if (!util->diff_offset)
131 util->diff_offset = buf.len;
132 line[len - 1] = '\n';
134 len = parse_git_diff_header(&root, &linenr, 0, line,
137 die(_("could not parse git header '%.*s'"),
139 strbuf_addstr(&buf, " ## ");
140 if (patch.is_new > 0)
141 strbuf_addf(&buf, "%s (new)", patch.new_name);
142 else if (patch.is_delete > 0)
143 strbuf_addf(&buf, "%s (deleted)", patch.old_name);
144 else if (patch.is_rename)
145 strbuf_addf(&buf, "%s => %s", patch.old_name, patch.new_name);
147 strbuf_addstr(&buf, patch.new_name);
149 free(current_filename);
150 if (patch.is_delete > 0)
151 current_filename = xstrdup(patch.old_name);
153 current_filename = xstrdup(patch.new_name);
155 if (patch.new_mode && patch.old_mode &&
156 patch.old_mode != patch.new_mode)
157 strbuf_addf(&buf, " (mode change %06o => %06o)",
158 patch.old_mode, patch.new_mode);
160 strbuf_addstr(&buf, " ##");
161 } else if (in_header) {
162 if (starts_with(line, "Author: ")) {
163 strbuf_addstr(&buf, " ## Metadata ##\n");
164 strbuf_addstr(&buf, line);
165 strbuf_addstr(&buf, "\n\n");
166 strbuf_addstr(&buf, " ## Commit message ##\n");
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);
173 } else if (starts_with(line, " ")) {
175 while (isspace(*p) && p >= line)
177 strbuf_add(&buf, line, p - line + 1);
178 strbuf_addch(&buf, '\n');
181 } else if (skip_prefix(line, "@@ ", &p)) {
183 strbuf_addstr(&buf, "@@");
184 if (current_filename && p[2])
185 strbuf_addf(&buf, " %s:", current_filename);
187 strbuf_addstr(&buf, p + 2);
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
197 else if (line[0] == '>') {
198 strbuf_addch(&buf, '+');
199 strbuf_addstr(&buf, line + 1);
200 } else if (line[0] == '<') {
201 strbuf_addch(&buf, '-');
202 strbuf_addstr(&buf, line + 1);
203 } else if (line[0] == '#') {
204 strbuf_addch(&buf, ' ');
205 strbuf_addstr(&buf, line + 1);
207 strbuf_addch(&buf, ' ');
208 strbuf_addstr(&buf, line);
211 strbuf_addch(&buf, '\n');
214 strbuf_release(&contents);
217 string_list_append(list, buf.buf)->util = util;
218 strbuf_release(&buf);
219 free(current_filename);
221 if (finish_command(&cp))
227 static int patch_util_cmp(const void *dummy, const struct patch_util *a,
228 const struct patch_util *b, const char *keydata)
230 return strcmp(a->diff, keydata ? keydata : b->diff);
233 static void find_exact_matches(struct string_list *a, struct string_list *b)
235 struct hashmap map = HASHMAP_INIT((hashmap_cmp_fn)patch_util_cmp, NULL);
238 /* First, add the patches of a to a hash map */
239 for (i = 0; i < a->nr; i++) {
240 struct patch_util *util = a->items[i].util;
243 util->patch = a->items[i].string;
244 util->diff = util->patch + util->diff_offset;
245 hashmap_entry_init(&util->e, strhash(util->diff));
246 hashmap_add(&map, &util->e);
249 /* Now try to find exact matches in b */
250 for (i = 0; i < b->nr; i++) {
251 struct patch_util *util = b->items[i].util, *other;
254 util->patch = b->items[i].string;
255 util->diff = util->patch + util->diff_offset;
256 hashmap_entry_init(&util->e, strhash(util->diff));
257 other = hashmap_remove_entry(&map, util, e, NULL);
259 if (other->matching >= 0)
260 BUG("already assigned!");
263 util->matching = other->i;
270 static void diffsize_consume(void *data, char *line, unsigned long len)
275 static void diffsize_hunk(void *data, long ob, long on, long nb, long nn,
276 const char *funcline, long funclen)
278 diffsize_consume(data, NULL, 0);
281 static int diffsize(const char *a, const char *b)
283 xpparam_t pp = { 0 };
284 xdemitconf_t cfg = { 0 };
289 mf1.size = strlen(a);
291 mf2.size = strlen(b);
294 if (!xdi_diff_outf(&mf1, &mf2,
295 diffsize_hunk, diffsize_consume, &count,
299 error(_("failed to generate diff"));
303 static void get_correspondences(struct string_list *a, struct string_list *b,
306 int n = a->nr + b->nr;
307 int *cost, c, *a2b, *b2a;
310 ALLOC_ARRAY(cost, st_mult(n, n));
314 for (i = 0; i < a->nr; i++) {
315 struct patch_util *a_util = a->items[i].util;
317 for (j = 0; j < b->nr; j++) {
318 struct patch_util *b_util = b->items[j].util;
320 if (a_util->matching == j)
322 else if (a_util->matching < 0 && b_util->matching < 0)
323 c = diffsize(a_util->diff, b_util->diff);
329 c = a_util->matching < 0 ?
330 a_util->diffsize * creation_factor / 100 : COST_MAX;
331 for (j = b->nr; j < n; j++)
335 for (j = 0; j < b->nr; j++) {
336 struct patch_util *util = b->items[j].util;
338 c = util->matching < 0 ?
339 util->diffsize * creation_factor / 100 : COST_MAX;
340 for (i = a->nr; i < n; i++)
344 for (i = a->nr; i < n; i++)
345 for (j = b->nr; j < n; j++)
348 compute_assignment(n, n, cost, a2b, b2a);
350 for (i = 0; i < a->nr; i++)
351 if (a2b[i] >= 0 && a2b[i] < b->nr) {
352 struct patch_util *a_util = a->items[i].util;
353 struct patch_util *b_util = b->items[a2b[i]].util;
355 a_util->matching = a2b[i];
356 b_util->matching = i;
364 static void output_pair_header(struct diff_options *diffopt,
367 struct strbuf *dashes,
368 struct patch_util *a_util,
369 struct patch_util *b_util)
371 struct object_id *oid = a_util ? &a_util->oid : &b_util->oid;
372 struct commit *commit;
374 const char *color_reset = diff_get_color_opt(diffopt, DIFF_RESET);
375 const char *color_old = diff_get_color_opt(diffopt, DIFF_FILE_OLD);
376 const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW);
377 const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT);
381 strbuf_addchars(dashes, '-',
382 strlen(find_unique_abbrev(oid,
388 } else if (!a_util) {
391 } else if (strcmp(a_util->patch, b_util->patch)) {
392 color = color_commit;
395 color = color_commit;
400 strbuf_addstr(buf, status == '!' ? color_old : color);
402 strbuf_addf(buf, "%*s: %s ", patch_no_width, "-", dashes->buf);
404 strbuf_addf(buf, "%*d: %s ", patch_no_width, a_util->i + 1,
405 find_unique_abbrev(&a_util->oid, DEFAULT_ABBREV));
408 strbuf_addf(buf, "%s%s", color_reset, color);
409 strbuf_addch(buf, status);
411 strbuf_addf(buf, "%s%s", color_reset, color_new);
414 strbuf_addf(buf, " %*s: %s", patch_no_width, "-", dashes->buf);
416 strbuf_addf(buf, " %*d: %s", patch_no_width, b_util->i + 1,
417 find_unique_abbrev(&b_util->oid, DEFAULT_ABBREV));
419 commit = lookup_commit_reference(the_repository, oid);
422 strbuf_addf(buf, "%s%s", color_reset, color);
424 strbuf_addch(buf, ' ');
425 pp_commit_easy(CMIT_FMT_ONELINE, commit, buf);
427 strbuf_addf(buf, "%s\n", color_reset);
429 fwrite(buf->buf, buf->len, 1, diffopt->file);
432 static struct userdiff_driver section_headers = {
433 .funcname = { "^ ## (.*) ##$\n"
434 "^.?@@ (.*)$", REG_EXTENDED }
437 static struct diff_filespec *get_filespec(const char *name, const char *p)
439 struct diff_filespec *spec = alloc_filespec(name);
441 fill_filespec(spec, &null_oid, 0, 0100644);
442 spec->data = (char *)p;
443 spec->size = strlen(p);
444 spec->should_munmap = 0;
446 spec->driver = §ion_headers;
451 static void patch_diff(const char *a, const char *b,
452 struct diff_options *diffopt)
454 diff_queue(&diff_queued_diff,
455 get_filespec("a", a), get_filespec("b", b));
457 diffcore_std(diffopt);
461 static void output(struct string_list *a, struct string_list *b,
462 struct diff_options *diffopt)
464 struct strbuf buf = STRBUF_INIT, dashes = STRBUF_INIT;
465 int patch_no_width = decimal_width(1 + (a->nr > b->nr ? a->nr : b->nr));
469 * We assume the user is really more interested in the second argument
470 * ("newer" version). To that end, we print the output in the order of
471 * the RHS (the `b` parameter). To put the LHS (the `a` parameter)
472 * commits that are no longer in the RHS into a good place, we place
473 * them once we have shown all of their predecessors in the LHS.
476 while (i < a->nr || j < b->nr) {
477 struct patch_util *a_util, *b_util;
478 a_util = i < a->nr ? a->items[i].util : NULL;
479 b_util = j < b->nr ? b->items[j].util : NULL;
481 /* Skip all the already-shown commits from the LHS. */
482 while (i < a->nr && a_util->shown)
483 a_util = ++i < a->nr ? a->items[i].util : NULL;
485 /* Show unmatched LHS commit whose predecessors were shown. */
486 if (i < a->nr && a_util->matching < 0) {
487 output_pair_header(diffopt, patch_no_width,
488 &buf, &dashes, a_util, NULL);
493 /* Show unmatched RHS commits. */
494 while (j < b->nr && b_util->matching < 0) {
495 output_pair_header(diffopt, patch_no_width,
496 &buf, &dashes, NULL, b_util);
497 b_util = ++j < b->nr ? b->items[j].util : NULL;
500 /* Show matching LHS/RHS pair. */
502 a_util = a->items[b_util->matching].util;
503 output_pair_header(diffopt, patch_no_width,
504 &buf, &dashes, a_util, b_util);
505 if (!(diffopt->output_format & DIFF_FORMAT_NO_OUTPUT))
506 patch_diff(a->items[b_util->matching].string,
507 b->items[j].string, diffopt);
512 strbuf_release(&buf);
513 strbuf_release(&dashes);
516 static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
521 int show_range_diff(const char *range1, const char *range2,
522 int creation_factor, int dual_color,
523 const struct diff_options *diffopt,
524 const struct strvec *other_arg)
528 struct string_list branch1 = STRING_LIST_INIT_DUP;
529 struct string_list branch2 = STRING_LIST_INIT_DUP;
531 if (read_patches(range1, &branch1, other_arg))
532 res = error(_("could not parse log for '%s'"), range1);
533 if (!res && read_patches(range2, &branch2, other_arg))
534 res = error(_("could not parse log for '%s'"), range2);
537 struct diff_options opts;
538 struct strbuf indent = STRBUF_INIT;
541 memcpy(&opts, diffopt, sizeof(opts));
545 if (!opts.output_format)
546 opts.output_format = DIFF_FORMAT_PATCH;
547 opts.flags.suppress_diff_headers = 1;
548 opts.flags.dual_color_diffed_diffs = dual_color;
549 opts.flags.suppress_hunk_header_line_count = 1;
550 opts.output_prefix = output_prefix_cb;
551 strbuf_addstr(&indent, " ");
552 opts.output_prefix_data = &indent;
553 diff_setup_done(&opts);
555 find_exact_matches(&branch1, &branch2);
556 get_correspondences(&branch1, &branch2, creation_factor);
557 output(&branch1, &branch2, &opts);
559 strbuf_release(&indent);
562 string_list_clear(&branch1, 1);
563 string_list_clear(&branch2, 1);