Blame range-diff.c

Packit Service b5fd21
#include "cache.h"
Packit Service b5fd21
#include "range-diff.h"
Packit Service b5fd21
#include "string-list.h"
Packit Service b5fd21
#include "run-command.h"
Packit Service b5fd21
#include "argv-array.h"
Packit Service b5fd21
#include "hashmap.h"
Packit Service b5fd21
#include "xdiff-interface.h"
Packit Service b5fd21
#include "linear-assignment.h"
Packit Service b5fd21
#include "diffcore.h"
Packit Service b5fd21
#include "commit.h"
Packit Service b5fd21
#include "pretty.h"
Packit Service b5fd21
#include "userdiff.h"
Packit Service b5fd21
#include "apply.h"
Packit Service b5fd21
Packit Service b5fd21
struct patch_util {
Packit Service b5fd21
	/* For the search for an exact match */
Packit Service b5fd21
	struct hashmap_entry e;
Packit Service b5fd21
	const char *diff, *patch;
Packit Service b5fd21
Packit Service b5fd21
	int i, shown;
Packit Service b5fd21
	int diffsize;
Packit Service b5fd21
	size_t diff_offset;
Packit Service b5fd21
	/* the index of the matching item in the other branch, or -1 */
Packit Service b5fd21
	int matching;
Packit Service b5fd21
	struct object_id oid;
Packit Service b5fd21
};
Packit Service b5fd21
Packit Service b5fd21
static size_t find_end_of_line(char *buffer, unsigned long size)
Packit Service b5fd21
{
Packit Service b5fd21
	char *eol = memchr(buffer, '\n', size);
Packit Service b5fd21
Packit Service b5fd21
	if (!eol)
Packit Service b5fd21
		return size;
Packit Service b5fd21
Packit Service b5fd21
	*eol = '\0';
Packit Service b5fd21
	return eol + 1 - buffer;
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
/*
Packit Service b5fd21
 * Reads the patches into a string list, with the `util` field being populated
Packit Service b5fd21
 * as struct object_id (will need to be free()d).
Packit Service b5fd21
 */
Packit Service b5fd21
static int read_patches(const char *range, struct string_list *list,
Packit Service b5fd21
			const struct argv_array *other_arg)
Packit Service b5fd21
{
Packit Service b5fd21
	struct child_process cp = CHILD_PROCESS_INIT;
Packit Service b5fd21
	struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
Packit Service b5fd21
	struct patch_util *util = NULL;
Packit Service b5fd21
	int in_header = 1;
Packit Service b5fd21
	char *line, *current_filename = NULL;
Packit Service b5fd21
	int offset, len;
Packit Service b5fd21
	size_t size;
Packit Service b5fd21
Packit Service b5fd21
	argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
Packit Service b5fd21
			"--reverse", "--date-order", "--decorate=no",
Packit Service b5fd21
			"--no-prefix",
Packit Service b5fd21
			/*
Packit Service b5fd21
			 * Choose indicators that are not used anywhere
Packit Service b5fd21
			 * else in diffs, but still look reasonable
Packit Service b5fd21
			 * (e.g. will not be confusing when debugging)
Packit Service b5fd21
			 */
Packit Service b5fd21
			"--output-indicator-new=>",
Packit Service b5fd21
			"--output-indicator-old=<",
Packit Service b5fd21
			"--output-indicator-context=#",
Packit Service b5fd21
			"--no-abbrev-commit",
Packit Service b5fd21
			"--pretty=medium",
Packit Service b5fd21
			"--notes",
Packit Service b5fd21
			NULL);
Packit Service b5fd21
	if (other_arg)
Packit Service b5fd21
		argv_array_pushv(&cp.args, other_arg->argv);
Packit Service b5fd21
	argv_array_push(&cp.args, range);
Packit Service b5fd21
	cp.out = -1;
Packit Service b5fd21
	cp.no_stdin = 1;
Packit Service b5fd21
	cp.git_cmd = 1;
Packit Service b5fd21
Packit Service b5fd21
	if (start_command(&cp))
Packit Service b5fd21
		return error_errno(_("could not start `log`"));
Packit Service b5fd21
	if (strbuf_read(&contents, cp.out, 0) < 0) {
Packit Service b5fd21
		error_errno(_("could not read `log` output"));
Packit Service b5fd21
		finish_command(&cp;;
Packit Service b5fd21
		return -1;
Packit Service b5fd21
	}
Packit Service b5fd21
Packit Service b5fd21
	line = contents.buf;
Packit Service b5fd21
	size = contents.len;
Packit Service b5fd21
	for (offset = 0; size > 0; offset += len, size -= len, line += len) {
Packit Service b5fd21
		const char *p;
Packit Service b5fd21
Packit Service b5fd21
		len = find_end_of_line(line, size);
Packit Service b5fd21
		line[len - 1] = '\0';
Packit Service b5fd21
		if (skip_prefix(line, "commit ", &p)) {
Packit Service b5fd21
			if (util) {
Packit Service b5fd21
				string_list_append(list, buf.buf)->util = util;
Packit Service b5fd21
				strbuf_reset(&buf;;
Packit Service b5fd21
			}
Packit Service b5fd21
			util = xcalloc(sizeof(*util), 1);
Packit Service b5fd21
			if (get_oid(p, &util->oid)) {
Packit Service b5fd21
				error(_("could not parse commit '%s'"), p);
Packit Service b5fd21
				free(util);
Packit Service b5fd21
				string_list_clear(list, 1);
Packit Service b5fd21
				strbuf_release(&buf;;
Packit Service b5fd21
				strbuf_release(&contents);
Packit Service b5fd21
				finish_command(&cp;;
Packit Service b5fd21
				return -1;
Packit Service b5fd21
			}
Packit Service b5fd21
			util->matching = -1;
Packit Service b5fd21
			in_header = 1;
Packit Service b5fd21
			continue;
Packit Service b5fd21
		}
Packit Service b5fd21
Packit Service b5fd21
		if (!util) {
Packit Service b5fd21
			error(_("could not parse first line of `log` output: "
Packit Service b5fd21
				"did not start with 'commit ': '%s'"),
Packit Service b5fd21
			      line);
Packit Service b5fd21
			string_list_clear(list, 1);
Packit Service b5fd21
			strbuf_release(&buf;;
Packit Service b5fd21
			strbuf_release(&contents);
Packit Service b5fd21
			finish_command(&cp;;
Packit Service b5fd21
			return -1;
Packit Service b5fd21
		}
Packit Service b5fd21
Packit Service b5fd21
		if (starts_with(line, "diff --git")) {
Packit Service b5fd21
			struct patch patch = { 0 };
Packit Service b5fd21
			struct strbuf root = STRBUF_INIT;
Packit Service b5fd21
			int linenr = 0;
Packit Service b5fd21
			int orig_len;
Packit Service b5fd21
Packit Service b5fd21
			in_header = 0;
Packit Service b5fd21
			strbuf_addch(&buf, '\n');
Packit Service b5fd21
			if (!util->diff_offset)
Packit Service b5fd21
				util->diff_offset = buf.len;
Packit Service b5fd21
			line[len - 1] = '\n';
Packit Service b5fd21
			orig_len = len;
Packit Service b5fd21
			len = parse_git_diff_header(&root, &linenr, 0, line,
Packit Service b5fd21
						    len, size, &patch);
Packit Service b5fd21
			if (len < 0)
Packit Service b5fd21
				die(_("could not parse git header '%.*s'"),
Packit Service b5fd21
				    orig_len, line);
Packit Service b5fd21
			strbuf_addstr(&buf, " ## ");
Packit Service b5fd21
			if (patch.is_new > 0)
Packit Service b5fd21
				strbuf_addf(&buf, "%s (new)", patch.new_name);
Packit Service b5fd21
			else if (patch.is_delete > 0)
Packit Service b5fd21
				strbuf_addf(&buf, "%s (deleted)", patch.old_name);
Packit Service b5fd21
			else if (patch.is_rename)
Packit Service b5fd21
				strbuf_addf(&buf, "%s => %s", patch.old_name, patch.new_name);
Packit Service b5fd21
			else
Packit Service b5fd21
				strbuf_addstr(&buf, patch.new_name);
Packit Service b5fd21
Packit Service b5fd21
			free(current_filename);
Packit Service b5fd21
			if (patch.is_delete > 0)
Packit Service b5fd21
				current_filename = xstrdup(patch.old_name);
Packit Service b5fd21
			else
Packit Service b5fd21
				current_filename = xstrdup(patch.new_name);
Packit Service b5fd21
Packit Service b5fd21
			if (patch.new_mode && patch.old_mode &&
Packit Service b5fd21
			    patch.old_mode != patch.new_mode)
Packit Service b5fd21
				strbuf_addf(&buf, " (mode change %06o => %06o)",
Packit Service b5fd21
					    patch.old_mode, patch.new_mode);
Packit Service b5fd21
Packit Service b5fd21
			strbuf_addstr(&buf, " ##");
Packit Service b5fd21
		} else if (in_header) {
Packit Service b5fd21
			if (starts_with(line, "Author: ")) {
Packit Service b5fd21
				strbuf_addstr(&buf, " ## Metadata ##\n");
Packit Service b5fd21
				strbuf_addstr(&buf, line);
Packit Service b5fd21
				strbuf_addstr(&buf, "\n\n");
Packit Service b5fd21
				strbuf_addstr(&buf, " ## Commit message ##\n");
Packit Service b5fd21
			} else if (starts_with(line, "Notes") &&
Packit Service b5fd21
				   line[strlen(line) - 1] == ':') {
Packit Service b5fd21
				strbuf_addstr(&buf, "\n\n");
Packit Service b5fd21
				/* strip the trailing colon */
Packit Service b5fd21
				strbuf_addf(&buf, " ## %.*s ##\n",
Packit Service b5fd21
					    (int)(strlen(line) - 1), line);
Packit Service b5fd21
			} else if (starts_with(line, "    ")) {
Packit Service b5fd21
				p = line + len - 2;
Packit Service b5fd21
				while (isspace(*p) && p >= line)
Packit Service b5fd21
					p--;
Packit Service b5fd21
				strbuf_add(&buf, line, p - line + 1);
Packit Service b5fd21
				strbuf_addch(&buf, '\n');
Packit Service b5fd21
			}
Packit Service b5fd21
			continue;
Packit Service b5fd21
		} else if (skip_prefix(line, "@@ ", &p)) {
Packit Service b5fd21
			p = strstr(p, "@@");
Packit Service b5fd21
			strbuf_addstr(&buf, "@@");
Packit Service b5fd21
			if (current_filename && p[2])
Packit Service b5fd21
				strbuf_addf(&buf, " %s:", current_filename);
Packit Service b5fd21
			if (p)
Packit Service b5fd21
				strbuf_addstr(&buf, p + 2);
Packit Service b5fd21
		} else if (!line[0])
Packit Service b5fd21
			/*
Packit Service b5fd21
			 * A completely blank (not ' \n', which is context)
Packit Service b5fd21
			 * line is not valid in a diff.  We skip it
Packit Service b5fd21
			 * silently, because this neatly handles the blank
Packit Service b5fd21
			 * separator line between commits in git-log
Packit Service b5fd21
			 * output.
Packit Service b5fd21
			 */
Packit Service b5fd21
			continue;
Packit Service b5fd21
		else if (line[0] == '>') {
Packit Service b5fd21
			strbuf_addch(&buf, '+');
Packit Service b5fd21
			strbuf_addstr(&buf, line + 1);
Packit Service b5fd21
		} else if (line[0] == '<') {
Packit Service b5fd21
			strbuf_addch(&buf, '-');
Packit Service b5fd21
			strbuf_addstr(&buf, line + 1);
Packit Service b5fd21
		} else if (line[0] == '#') {
Packit Service b5fd21
			strbuf_addch(&buf, ' ');
Packit Service b5fd21
			strbuf_addstr(&buf, line + 1);
Packit Service b5fd21
		} else {
Packit Service b5fd21
			strbuf_addch(&buf, ' ');
Packit Service b5fd21
			strbuf_addstr(&buf, line);
Packit Service b5fd21
		}
Packit Service b5fd21
Packit Service b5fd21
		strbuf_addch(&buf, '\n');
Packit Service b5fd21
		util->diffsize++;
Packit Service b5fd21
	}
Packit Service b5fd21
	strbuf_release(&contents);
Packit Service b5fd21
Packit Service b5fd21
	if (util)
Packit Service b5fd21
		string_list_append(list, buf.buf)->util = util;
Packit Service b5fd21
	strbuf_release(&buf;;
Packit Service b5fd21
	free(current_filename);
Packit Service b5fd21
Packit Service b5fd21
	if (finish_command(&cp))
Packit Service b5fd21
		return -1;
Packit Service b5fd21
Packit Service b5fd21
	return 0;
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static int patch_util_cmp(const void *dummy, const struct patch_util *a,
Packit Service b5fd21
			  const struct patch_util *b, const char *keydata)
Packit Service b5fd21
{
Packit Service b5fd21
	return strcmp(a->diff, keydata ? keydata : b->diff);
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static void find_exact_matches(struct string_list *a, struct string_list *b)
Packit Service b5fd21
{
Packit Service b5fd21
	struct hashmap map;
Packit Service b5fd21
	int i;
Packit Service b5fd21
Packit Service b5fd21
	hashmap_init(&map, (hashmap_cmp_fn)patch_util_cmp, NULL, 0);
Packit Service b5fd21
Packit Service b5fd21
	/* First, add the patches of a to a hash map */
Packit Service b5fd21
	for (i = 0; i < a->nr; i++) {
Packit Service b5fd21
		struct patch_util *util = a->items[i].util;
Packit Service b5fd21
Packit Service b5fd21
		util->i = i;
Packit Service b5fd21
		util->patch = a->items[i].string;
Packit Service b5fd21
		util->diff = util->patch + util->diff_offset;
Packit Service b5fd21
		hashmap_entry_init(&util->e, strhash(util->diff));
Packit Service b5fd21
		hashmap_add(&map, &util->e);
Packit Service b5fd21
	}
Packit Service b5fd21
Packit Service b5fd21
	/* Now try to find exact matches in b */
Packit Service b5fd21
	for (i = 0; i < b->nr; i++) {
Packit Service b5fd21
		struct patch_util *util = b->items[i].util, *other;
Packit Service b5fd21
Packit Service b5fd21
		util->i = i;
Packit Service b5fd21
		util->patch = b->items[i].string;
Packit Service b5fd21
		util->diff = util->patch + util->diff_offset;
Packit Service b5fd21
		hashmap_entry_init(&util->e, strhash(util->diff));
Packit Service b5fd21
		other = hashmap_remove_entry(&map, util, e, NULL);
Packit Service b5fd21
		if (other) {
Packit Service b5fd21
			if (other->matching >= 0)
Packit Service b5fd21
				BUG("already assigned!");
Packit Service b5fd21
Packit Service b5fd21
			other->matching = i;
Packit Service b5fd21
			util->matching = other->i;
Packit Service b5fd21
		}
Packit Service b5fd21
	}
Packit Service b5fd21
Packit Service b5fd21
	hashmap_free(&map);
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static void diffsize_consume(void *data, char *line, unsigned long len)
Packit Service b5fd21
{
Packit Service b5fd21
	(*(int *)data)++;
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static void diffsize_hunk(void *data, long ob, long on, long nb, long nn,
Packit Service b5fd21
			  const char *funcline, long funclen)
Packit Service b5fd21
{
Packit Service b5fd21
	diffsize_consume(data, NULL, 0);
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static int diffsize(const char *a, const char *b)
Packit Service b5fd21
{
Packit Service b5fd21
	xpparam_t pp = { 0 };
Packit Service b5fd21
	xdemitconf_t cfg = { 0 };
Packit Service b5fd21
	mmfile_t mf1, mf2;
Packit Service b5fd21
	int count = 0;
Packit Service b5fd21
Packit Service b5fd21
	mf1.ptr = (char *)a;
Packit Service b5fd21
	mf1.size = strlen(a);
Packit Service b5fd21
	mf2.ptr = (char *)b;
Packit Service b5fd21
	mf2.size = strlen(b);
Packit Service b5fd21
Packit Service b5fd21
	cfg.ctxlen = 3;
Packit Service b5fd21
	if (!xdi_diff_outf(&mf1, &mf2,
Packit Service b5fd21
			   diffsize_hunk, diffsize_consume, &count,
Packit Service b5fd21
			   &pp, &cfg))
Packit Service b5fd21
		return count;
Packit Service b5fd21
Packit Service b5fd21
	error(_("failed to generate diff"));
Packit Service b5fd21
	return COST_MAX;
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static void get_correspondences(struct string_list *a, struct string_list *b,
Packit Service b5fd21
				int creation_factor)
Packit Service b5fd21
{
Packit Service b5fd21
	int n = a->nr + b->nr;
Packit Service b5fd21
	int *cost, c, *a2b, *b2a;
Packit Service b5fd21
	int i, j;
Packit Service b5fd21
Packit Service b5fd21
	ALLOC_ARRAY(cost, st_mult(n, n));
Packit Service b5fd21
	ALLOC_ARRAY(a2b, n);
Packit Service b5fd21
	ALLOC_ARRAY(b2a, n);
Packit Service b5fd21
Packit Service b5fd21
	for (i = 0; i < a->nr; i++) {
Packit Service b5fd21
		struct patch_util *a_util = a->items[i].util;
Packit Service b5fd21
Packit Service b5fd21
		for (j = 0; j < b->nr; j++) {
Packit Service b5fd21
			struct patch_util *b_util = b->items[j].util;
Packit Service b5fd21
Packit Service b5fd21
			if (a_util->matching == j)
Packit Service b5fd21
				c = 0;
Packit Service b5fd21
			else if (a_util->matching < 0 && b_util->matching < 0)
Packit Service b5fd21
				c = diffsize(a_util->diff, b_util->diff);
Packit Service b5fd21
			else
Packit Service b5fd21
				c = COST_MAX;
Packit Service b5fd21
			cost[i + n * j] = c;
Packit Service b5fd21
		}
Packit Service b5fd21
Packit Service b5fd21
		c = a_util->matching < 0 ?
Packit Service b5fd21
			a_util->diffsize * creation_factor / 100 : COST_MAX;
Packit Service b5fd21
		for (j = b->nr; j < n; j++)
Packit Service b5fd21
			cost[i + n * j] = c;
Packit Service b5fd21
	}
Packit Service b5fd21
Packit Service b5fd21
	for (j = 0; j < b->nr; j++) {
Packit Service b5fd21
		struct patch_util *util = b->items[j].util;
Packit Service b5fd21
Packit Service b5fd21
		c = util->matching < 0 ?
Packit Service b5fd21
			util->diffsize * creation_factor / 100 : COST_MAX;
Packit Service b5fd21
		for (i = a->nr; i < n; i++)
Packit Service b5fd21
			cost[i + n * j] = c;
Packit Service b5fd21
	}
Packit Service b5fd21
Packit Service b5fd21
	for (i = a->nr; i < n; i++)
Packit Service b5fd21
		for (j = b->nr; j < n; j++)
Packit Service b5fd21
			cost[i + n * j] = 0;
Packit Service b5fd21
Packit Service b5fd21
	compute_assignment(n, n, cost, a2b, b2a);
Packit Service b5fd21
Packit Service b5fd21
	for (i = 0; i < a->nr; i++)
Packit Service b5fd21
		if (a2b[i] >= 0 && a2b[i] < b->nr) {
Packit Service b5fd21
			struct patch_util *a_util = a->items[i].util;
Packit Service b5fd21
			struct patch_util *b_util = b->items[a2b[i]].util;
Packit Service b5fd21
Packit Service b5fd21
			a_util->matching = a2b[i];
Packit Service b5fd21
			b_util->matching = i;
Packit Service b5fd21
		}
Packit Service b5fd21
Packit Service b5fd21
	free(cost);
Packit Service b5fd21
	free(a2b);
Packit Service b5fd21
	free(b2a);
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static void output_pair_header(struct diff_options *diffopt,
Packit Service b5fd21
			       int patch_no_width,
Packit Service b5fd21
			       struct strbuf *buf,
Packit Service b5fd21
			       struct strbuf *dashes,
Packit Service b5fd21
			       struct patch_util *a_util,
Packit Service b5fd21
			       struct patch_util *b_util)
Packit Service b5fd21
{
Packit Service b5fd21
	struct object_id *oid = a_util ? &a_util->oid : &b_util->oid;
Packit Service b5fd21
	struct commit *commit;
Packit Service b5fd21
	char status;
Packit Service b5fd21
	const char *color_reset = diff_get_color_opt(diffopt, DIFF_RESET);
Packit Service b5fd21
	const char *color_old = diff_get_color_opt(diffopt, DIFF_FILE_OLD);
Packit Service b5fd21
	const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW);
Packit Service b5fd21
	const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT);
Packit Service b5fd21
	const char *color;
Packit Service b5fd21
Packit Service b5fd21
	if (!dashes->len)
Packit Service b5fd21
		strbuf_addchars(dashes, '-',
Packit Service b5fd21
				strlen(find_unique_abbrev(oid,
Packit Service b5fd21
							  DEFAULT_ABBREV)));
Packit Service b5fd21
Packit Service b5fd21
	if (!b_util) {
Packit Service b5fd21
		color = color_old;
Packit Service b5fd21
		status = '<';
Packit Service b5fd21
	} else if (!a_util) {
Packit Service b5fd21
		color = color_new;
Packit Service b5fd21
		status = '>';
Packit Service b5fd21
	} else if (strcmp(a_util->patch, b_util->patch)) {
Packit Service b5fd21
		color = color_commit;
Packit Service b5fd21
		status = '!';
Packit Service b5fd21
	} else {
Packit Service b5fd21
		color = color_commit;
Packit Service b5fd21
		status = '=';
Packit Service b5fd21
	}
Packit Service b5fd21
Packit Service b5fd21
	strbuf_reset(buf);
Packit Service b5fd21
	strbuf_addstr(buf, status == '!' ? color_old : color);
Packit Service b5fd21
	if (!a_util)
Packit Service b5fd21
		strbuf_addf(buf, "%*s:  %s ", patch_no_width, "-", dashes->buf);
Packit Service b5fd21
	else
Packit Service b5fd21
		strbuf_addf(buf, "%*d:  %s ", patch_no_width, a_util->i + 1,
Packit Service b5fd21
			    find_unique_abbrev(&a_util->oid, DEFAULT_ABBREV));
Packit Service b5fd21
Packit Service b5fd21
	if (status == '!')
Packit Service b5fd21
		strbuf_addf(buf, "%s%s", color_reset, color);
Packit Service b5fd21
	strbuf_addch(buf, status);
Packit Service b5fd21
	if (status == '!')
Packit Service b5fd21
		strbuf_addf(buf, "%s%s", color_reset, color_new);
Packit Service b5fd21
Packit Service b5fd21
	if (!b_util)
Packit Service b5fd21
		strbuf_addf(buf, " %*s:  %s", patch_no_width, "-", dashes->buf);
Packit Service b5fd21
	else
Packit Service b5fd21
		strbuf_addf(buf, " %*d:  %s", patch_no_width, b_util->i + 1,
Packit Service b5fd21
			    find_unique_abbrev(&b_util->oid, DEFAULT_ABBREV));
Packit Service b5fd21
Packit Service b5fd21
	commit = lookup_commit_reference(the_repository, oid);
Packit Service b5fd21
	if (commit) {
Packit Service b5fd21
		if (status == '!')
Packit Service b5fd21
			strbuf_addf(buf, "%s%s", color_reset, color);
Packit Service b5fd21
Packit Service b5fd21
		strbuf_addch(buf, ' ');
Packit Service b5fd21
		pp_commit_easy(CMIT_FMT_ONELINE, commit, buf);
Packit Service b5fd21
	}
Packit Service b5fd21
	strbuf_addf(buf, "%s\n", color_reset);
Packit Service b5fd21
Packit Service b5fd21
	fwrite(buf->buf, buf->len, 1, diffopt->file);
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static struct userdiff_driver section_headers = {
Packit Service b5fd21
	.funcname = { "^ ## (.*) ##$\n"
Packit Service b5fd21
		      "^.?@@ (.*)$", REG_EXTENDED }
Packit Service b5fd21
};
Packit Service b5fd21
Packit Service b5fd21
static struct diff_filespec *get_filespec(const char *name, const char *p)
Packit Service b5fd21
{
Packit Service b5fd21
	struct diff_filespec *spec = alloc_filespec(name);
Packit Service b5fd21
Packit Service b5fd21
	fill_filespec(spec, &null_oid, 0, 0100644);
Packit Service b5fd21
	spec->data = (char *)p;
Packit Service b5fd21
	spec->size = strlen(p);
Packit Service b5fd21
	spec->should_munmap = 0;
Packit Service b5fd21
	spec->is_stdin = 1;
Packit Service b5fd21
	spec->driver = &section_headers;
Packit Service b5fd21
Packit Service b5fd21
	return spec;
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static void patch_diff(const char *a, const char *b,
Packit Service b5fd21
		       struct diff_options *diffopt)
Packit Service b5fd21
{
Packit Service b5fd21
	diff_queue(&diff_queued_diff,
Packit Service b5fd21
		   get_filespec("a", a), get_filespec("b", b));
Packit Service b5fd21
Packit Service b5fd21
	diffcore_std(diffopt);
Packit Service b5fd21
	diff_flush(diffopt);
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static void output(struct string_list *a, struct string_list *b,
Packit Service b5fd21
		   struct diff_options *diffopt)
Packit Service b5fd21
{
Packit Service b5fd21
	struct strbuf buf = STRBUF_INIT, dashes = STRBUF_INIT;
Packit Service b5fd21
	int patch_no_width = decimal_width(1 + (a->nr > b->nr ? a->nr : b->nr));
Packit Service b5fd21
	int i = 0, j = 0;
Packit Service b5fd21
Packit Service b5fd21
	/*
Packit Service b5fd21
	 * We assume the user is really more interested in the second argument
Packit Service b5fd21
	 * ("newer" version). To that end, we print the output in the order of
Packit Service b5fd21
	 * the RHS (the `b` parameter). To put the LHS (the `a` parameter)
Packit Service b5fd21
	 * commits that are no longer in the RHS into a good place, we place
Packit Service b5fd21
	 * them once we have shown all of their predecessors in the LHS.
Packit Service b5fd21
	 */
Packit Service b5fd21
Packit Service b5fd21
	while (i < a->nr || j < b->nr) {
Packit Service b5fd21
		struct patch_util *a_util, *b_util;
Packit Service b5fd21
		a_util = i < a->nr ? a->items[i].util : NULL;
Packit Service b5fd21
		b_util = j < b->nr ? b->items[j].util : NULL;
Packit Service b5fd21
Packit Service b5fd21
		/* Skip all the already-shown commits from the LHS. */
Packit Service b5fd21
		while (i < a->nr && a_util->shown)
Packit Service b5fd21
			a_util = ++i < a->nr ? a->items[i].util : NULL;
Packit Service b5fd21
Packit Service b5fd21
		/* Show unmatched LHS commit whose predecessors were shown. */
Packit Service b5fd21
		if (i < a->nr && a_util->matching < 0) {
Packit Service b5fd21
			output_pair_header(diffopt, patch_no_width,
Packit Service b5fd21
					   &buf, &dashes, a_util, NULL);
Packit Service b5fd21
			i++;
Packit Service b5fd21
			continue;
Packit Service b5fd21
		}
Packit Service b5fd21
Packit Service b5fd21
		/* Show unmatched RHS commits. */
Packit Service b5fd21
		while (j < b->nr && b_util->matching < 0) {
Packit Service b5fd21
			output_pair_header(diffopt, patch_no_width,
Packit Service b5fd21
					   &buf, &dashes, NULL, b_util);
Packit Service b5fd21
			b_util = ++j < b->nr ? b->items[j].util : NULL;
Packit Service b5fd21
		}
Packit Service b5fd21
Packit Service b5fd21
		/* Show matching LHS/RHS pair. */
Packit Service b5fd21
		if (j < b->nr) {
Packit Service b5fd21
			a_util = a->items[b_util->matching].util;
Packit Service b5fd21
			output_pair_header(diffopt, patch_no_width,
Packit Service b5fd21
					   &buf, &dashes, a_util, b_util);
Packit Service b5fd21
			if (!(diffopt->output_format & DIFF_FORMAT_NO_OUTPUT))
Packit Service b5fd21
				patch_diff(a->items[b_util->matching].string,
Packit Service b5fd21
					   b->items[j].string, diffopt);
Packit Service b5fd21
			a_util->shown = 1;
Packit Service b5fd21
			j++;
Packit Service b5fd21
		}
Packit Service b5fd21
	}
Packit Service b5fd21
	strbuf_release(&buf;;
Packit Service b5fd21
	strbuf_release(&dashes);
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
Packit Service b5fd21
{
Packit Service b5fd21
	return data;
Packit Service b5fd21
}
Packit Service b5fd21
Packit Service b5fd21
int show_range_diff(const char *range1, const char *range2,
Packit Service b5fd21
		    int creation_factor, int dual_color,
Packit Service b5fd21
		    const struct diff_options *diffopt,
Packit Service b5fd21
		    const struct argv_array *other_arg)
Packit Service b5fd21
{
Packit Service b5fd21
	int res = 0;
Packit Service b5fd21
Packit Service b5fd21
	struct string_list branch1 = STRING_LIST_INIT_DUP;
Packit Service b5fd21
	struct string_list branch2 = STRING_LIST_INIT_DUP;
Packit Service b5fd21
Packit Service b5fd21
	if (read_patches(range1, &branch1, other_arg))
Packit Service b5fd21
		res = error(_("could not parse log for '%s'"), range1);
Packit Service b5fd21
	if (!res && read_patches(range2, &branch2, other_arg))
Packit Service b5fd21
		res = error(_("could not parse log for '%s'"), range2);
Packit Service b5fd21
Packit Service b5fd21
	if (!res) {
Packit Service b5fd21
		struct diff_options opts;
Packit Service b5fd21
		struct strbuf indent = STRBUF_INIT;
Packit Service b5fd21
Packit Service b5fd21
		if (diffopt)
Packit Service b5fd21
			memcpy(&opts, diffopt, sizeof(opts));
Packit Service b5fd21
		else
Packit Service b5fd21
			diff_setup(&opts);
Packit Service b5fd21
Packit Service b5fd21
		if (!opts.output_format)
Packit Service b5fd21
			opts.output_format = DIFF_FORMAT_PATCH;
Packit Service b5fd21
		opts.flags.suppress_diff_headers = 1;
Packit Service b5fd21
		opts.flags.dual_color_diffed_diffs = dual_color;
Packit Service b5fd21
		opts.flags.suppress_hunk_header_line_count = 1;
Packit Service b5fd21
		opts.output_prefix = output_prefix_cb;
Packit Service b5fd21
		strbuf_addstr(&indent, "    ");
Packit Service b5fd21
		opts.output_prefix_data = &indent;
Packit Service b5fd21
		diff_setup_done(&opts);
Packit Service b5fd21
Packit Service b5fd21
		find_exact_matches(&branch1, &branch2);
Packit Service b5fd21
		get_correspondences(&branch1, &branch2, creation_factor);
Packit Service b5fd21
		output(&branch1, &branch2, &opts);
Packit Service b5fd21
Packit Service b5fd21
		strbuf_release(&indent);
Packit Service b5fd21
	}
Packit Service b5fd21
Packit Service b5fd21
	string_list_clear(&branch1, 1);
Packit Service b5fd21
	string_list_clear(&branch2, 1);
Packit Service b5fd21
Packit Service b5fd21
	return res;
Packit Service b5fd21
}