[thirdparty/git.git] / diff-tree.c

#include <ctype.h>
#include "cache.h"
#include "diff.h"

static int silent = 0;
static int show_root_diff = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
static int recursive = 0;
static int read_stdin = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
static int reverse_diff = 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static const char *header = NULL;
static const char *header_prefix = "";

// What paths are we interested in?
static int nr_paths = 0;
static const char **paths = NULL;
static int *pathlens = NULL;

static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);

static void update_tree_entry(void **bufp, unsigned long *sizep)
{
	void *buf = *bufp;
	unsigned long size = *sizep;
	int len = strlen(buf) + 1 + 20;

	if (size < len)
		die("corrupt tree file");
	*bufp = buf + len;
	*sizep = size - len;
}

static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep)
{
	int len = strlen(tree)+1;
	const unsigned char *sha1 = tree + len;
	const char *path = strchr(tree, ' ');

	if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
		die("corrupt tree file");
	*pathp = path+1;
	return sha1;
}

static char *malloc_base(const char *base, const char *path, int pathlen)
{
	int baselen = strlen(base);
	char *newbase = xmalloc(baselen + pathlen + 2);
	memcpy(newbase, base, baselen);
	memcpy(newbase + baselen, path, pathlen);
	memcpy(newbase + baselen + pathlen, "/", 2);
	return newbase;
}

static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base);

/* A file entry went away or appeared */
static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
{
	unsigned mode;
	const char *path;
	const unsigned char *sha1 = extract(tree, size, &path, &mode);

	if (silent)
		return;

	if (recursive && S_ISDIR(mode)) {
		char type[20];
		unsigned long size;
		char *newbase = malloc_base(base, path, strlen(path));
		void *tree;

		tree = read_sha1_file(sha1, type, &size);
		if (!tree || strcmp(type, "tree"))
			die("corrupt tree sha %s", sha1_to_hex(sha1));

		show_tree(prefix, tree, size, newbase);

		free(tree);
		free(newbase);
		return;
	}

	diff_addremove(prefix[0], mode, sha1, base, path);
}

static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
{
	unsigned mode1, mode2;
	const char *path1, *path2;
	const unsigned char *sha1, *sha2;
	int cmp, pathlen1, pathlen2;

	sha1 = extract(tree1, size1, &path1, &mode1);
	sha2 = extract(tree2, size2, &path2, &mode2);

	pathlen1 = strlen(path1);
	pathlen2 = strlen(path2);
	cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
	if (cmp < 0) {
		show_file("-", tree1, size1, base);
		return -1;
	}
	if (cmp > 0) {
		show_file("+", tree2, size2, base);
		return 1;
	}
	if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
		return 0;

	/*
	 * If the filemode has changed to/from a directory from/to a regular
	 * file, we need to consider it a remove and an add.
	 */
	if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
		show_file("-", tree1, size1, base);
		show_file("+", tree2, size2, base);
		return 0;
	}

	if (recursive && S_ISDIR(mode1)) {
		int retval;
		char *newbase = malloc_base(base, path1, pathlen1);
		retval = diff_tree_sha1(sha1, sha2, newbase);
		free(newbase);
		return retval;
	}

	if (silent)
		return 0;

	diff_change(mode1, mode2, sha1, sha2, base, path1);
	return 0;
}

static int interesting(void *tree, unsigned long size, const char *base)
{
	const char *path;
	unsigned mode;
	int i;
	int baselen, pathlen;

	if (!nr_paths)
		return 1;

	(void)extract(tree, size, &path, &mode);

	pathlen = strlen(path);
	baselen = strlen(base);

	for (i=0; i < nr_paths; i++) {
		const char *match = paths[i];
		int matchlen = pathlens[i];

		if (baselen >= matchlen) {
			/* If it doesn't match, move along... */
			if (strncmp(base, match, matchlen))
				continue;

			/* The base is a subdirectory of a path which was specified. */
			return 1;
		}

		/* Does the base match? */
		if (strncmp(base, match, baselen))
			continue;

		match += baselen;
		matchlen -= baselen;

		if (pathlen > matchlen)
			continue;

		if (matchlen > pathlen) {
			if (match[pathlen] != '/')
				continue;
			if (!S_ISDIR(mode))
				continue;
		}

		if (strncmp(path, match, pathlen))
			continue;

		return 1;
	}
	return 0; /* No matches */
}

/* A whole sub-tree went away or appeared */
static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
{
	while (size) {
		if (interesting(tree, size, base))
			show_file(prefix, tree, size, base);
		update_tree_entry(&tree, &size);
	}
}

static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
{
	while (size1 | size2) {
		if (nr_paths && size1 && !interesting(tree1, size1, base)) {
			update_tree_entry(&tree1, &size1);
			continue;
		}
		if (nr_paths && size2 && !interesting(tree2, size2, base)) {
			update_tree_entry(&tree2, &size2);
			continue;
		}
		if (!size1) {
			show_file("+", tree2, size2, base);
			update_tree_entry(&tree2, &size2);
			continue;
		}
		if (!size2) {
			show_file("-", tree1, size1, base);
			update_tree_entry(&tree1, &size1);
			continue;
		}
		switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
		case -1:
			update_tree_entry(&tree1, &size1);
			continue;
		case 0:
			update_tree_entry(&tree1, &size1);
			/* Fallthrough */
		case 1:
			update_tree_entry(&tree2, &size2);
			continue;
		}
		die("git-diff-tree: internal error");
	}
	return 0;
}

static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base)
{
	void *tree1, *tree2;
	unsigned long size1, size2;
	int retval;

	tree1 = read_object_with_reference(old, "tree", &size1, NULL);
	if (!tree1)
		die("unable to read source tree (%s)", sha1_to_hex(old));
	tree2 = read_object_with_reference(new, "tree", &size2, NULL);
	if (!tree2)
		die("unable to read destination tree (%s)", sha1_to_hex(new));
	retval = diff_tree(tree1, size1, tree2, size2, base);
	free(tree1);
	free(tree2);
	return retval;
}

static void call_diff_setup(void)
{
	diff_setup(reverse_diff);
}

static int call_diff_flush(void)
{
	if (detect_rename)
		diffcore_rename(detect_rename, diff_score_opt);
	if (pickaxe)
		diffcore_pickaxe(pickaxe);
	if (diff_queue_is_empty()) {
		diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
		return 0;
	}
	if (nr_paths)
		diffcore_pathspec(paths);
	if (header) {
		if (diff_output_format == DIFF_FORMAT_MACHINE) {
			const char *ep, *cp;
			for (cp = header; *cp; cp = ep) {
				ep = strchr(cp, '\n');
				if (ep == 0) ep = cp + strlen(cp);
				printf("%.*s%c", ep-cp, cp, 0);
				if (*ep) ep++;
			}
		}
		else {
			printf("%s", header);
		}
		header = NULL;
	}
	diff_flush(diff_output_format, 1);
	return 1;
}

static int diff_tree_sha1_top(const unsigned char *old,
			      const unsigned char *new, const char *base)
{
	int ret;

	call_diff_setup();
	ret = diff_tree_sha1(old, new, base);
	call_diff_flush();
	return ret;
}

static int diff_root_tree(const unsigned char *new, const char *base)
{
	int retval;
	void *tree;
	unsigned long size;

	call_diff_setup();
	tree = read_object_with_reference(new, "tree", &size, NULL);
	if (!tree)
		die("unable to read root tree (%s)", sha1_to_hex(new));
	retval = diff_tree("", 0, tree, size, base);
	free(tree);
	call_diff_flush();
	return retval;
}

static int get_one_line(const char *msg, unsigned long len)
{
	int ret = 0;

	while (len--) {
		ret++;
		if (*msg++ == '\n')
			break;
	}
	return ret;
}

static int add_author_info(char *buf, const char *line, int len)
{
	char *date;
	unsigned int namelen;
	unsigned long time;
	int tz;

	line += strlen("author ");
	date = strchr(line, '>');
	if (!date)
		return 0;
	namelen = ++date - line;
	time = strtoul(date, &date, 10);
	tz = strtol(date, NULL, 10);

	return sprintf(buf, "Author: %.*s\nDate:   %s\n",
		namelen, line,
		show_date(time, tz));
}

static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
{
	static char this_header[16384];
	int offset;

	offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
	if (verbose_header) {
		int hdr = 1;

		for (;;) {
			const char *line = msg;
			int linelen = get_one_line(msg, len);

			if (!linelen)
				break;

			/*
			 * We want some slop for indentation and a possible
			 * final "...". Thus the "+ 20".
			 */
			if (offset + linelen + 20 > sizeof(this_header)) {
				memcpy(this_header + offset, "    ...\n", 8);
				offset += 8;
				break;
			}

			msg += linelen;
			len -= linelen;
			if (linelen == 1)
				hdr = 0;
			if (hdr) {
				if (!memcmp(line, "author ", 7))
					offset += add_author_info(this_header + offset, line, linelen);
				continue;
			}
			memset(this_header + offset, ' ', 4);
			memcpy(this_header + offset + 4, line, linelen);
			offset += linelen + 4;
		}
		/* Make sure there is an EOLN */
		if (this_header[offset-1] != '\n')
			this_header[offset++] = '\n';
		/* Add _another_ EOLN if we are doing diff output */
		if (!silent)
			this_header[offset++] = '\n';
		this_header[offset] = 0;
	}

	return this_header;
}

static int diff_tree_commit(const unsigned char *commit, const char *name)
{
	unsigned long size, offset;
	char *buf = read_object_with_reference(commit, "commit", &size, NULL);

	if (!buf)
		return -1;

	if (!name) {
		static char commit_name[60];
		strcpy(commit_name, sha1_to_hex(commit));
		name = commit_name;
	}

	/* Root commit? */
	if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
		header = generate_header(name, "root", buf, size);
		diff_root_tree(commit, "");
	}

	/* More than one parent? */
	if (ignore_merges) {
		if (!memcmp(buf + 46 + 48, "parent ", 7))
			return 0;
	}

	offset = 46;
	while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
		unsigned char parent[20];
		if (get_sha1_hex(buf + offset + 7, parent))
			return -1;
		header = generate_header(name, sha1_to_hex(parent), buf, size);
		diff_tree_sha1_top(parent, commit, "");
		if (!header && verbose_header) {
			header_prefix = "\ndiff-tree ";
			/*
			 * Don't print multiple merge entries if we
			 * don't print the diffs.
			 */
			if (silent)
				break;
		}
		offset += 48;
	}
	return 0;
}

static int diff_tree_stdin(char *line)
{
	int len = strlen(line);
	unsigned char commit[20], parent[20];
	static char this_header[1000];

	if (!len || line[len-1] != '\n')
		return -1;
	line[len-1] = 0;
	if (get_sha1_hex(line, commit))
		return -1;
	if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
		line[40] = 0;
		line[81] = 0;
		sprintf(this_header, "%s (from %s)\n", line, line+41);
		header = this_header;
		return diff_tree_sha1_top(parent, commit, "");
	}
	line[40] = 0;
	return diff_tree_commit(commit, line);
}

static char *diff_tree_usage =
"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";

int main(int argc, const char **argv)
{
	int nr_sha1;
	char line[1000];
	unsigned char sha1[2][20];

	nr_sha1 = 0;
	for (;;) {
		const char *arg;

		argv++;
		argc--;
		arg = *argv;
		if (!arg)
			break;

		if (*arg != '-') {
			if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
				nr_sha1++;
				continue;
			}
			break;
		}

		if (!strcmp(arg, "--")) {
			argv++;
			argc--;
			break;
		}
		if (!strcmp(arg, "-r")) {
			recursive = 1;
			continue;
		}
		if (!strcmp(arg, "-R")) {
			reverse_diff = 1;
			continue;
		}
		if (!strcmp(arg, "-p")) {
			diff_output_format = DIFF_FORMAT_PATCH;
			recursive = 1;
			continue;
		}
		if (!strncmp(arg, "-S", 2)) {
			pickaxe = arg + 2;
			continue;
		}
		if (!strncmp(arg, "-M", 2)) {
			detect_rename = DIFF_DETECT_RENAME;
			diff_score_opt = diff_scoreopt_parse(arg);
			continue;
		}
		if (!strncmp(arg, "-C", 2)) {
			detect_rename = DIFF_DETECT_COPY;
			diff_score_opt = diff_scoreopt_parse(arg);
			continue;
		}
		if (!strcmp(arg, "-z")) {
			diff_output_format = DIFF_FORMAT_MACHINE;
			continue;
		}
		if (!strcmp(arg, "-m")) {
			ignore_merges = 0;
			continue;
		}
		if (!strcmp(arg, "-s")) {
			silent = 1;
			continue;
		}
		if (!strcmp(arg, "-v")) {
			verbose_header = 1;
			header_prefix = "diff-tree ";
			continue;
		}
		if (!strcmp(arg, "--stdin")) {
			read_stdin = 1;
			continue;
		}
		if (!strcmp(arg, "--root")) {
			show_root_diff = 1;
			continue;
		}
		usage(diff_tree_usage);
	}

	if (argc > 0) {
		int i;

		paths = argv;
		nr_paths = argc;
		pathlens = xmalloc(nr_paths * sizeof(int));
		for (i=0; i<nr_paths; i++)
			pathlens[i] = strlen(paths[i]);
	}

	switch (nr_sha1) {
	case 0:
		if (!read_stdin)
			usage(diff_tree_usage);
		break;
	case 1:
		diff_tree_commit(sha1[0], NULL);
		break;
	case 2:
		diff_tree_sha1_top(sha1[0], sha1[1], "");
		break;
	}

	if (!read_stdin)
		return 0;

	while (fgets(line, sizeof(line), stdin))
		diff_tree_stdin(line);

	return 0;
}
Commit	Line	Data
e0965d83	1	#include <ctype.h>
9174026c	2	#include "cache.h"
3ebfd4aa	3	#include "diff.h"
9174026c	4
f4f21ce3	5	static int silent = 0;
dc26bd89	6	static int show_root_diff = 0;
cee99d22	7	static int verbose_header = 0;
e0965d83	8	static int ignore_merges = 1;
73134b6d	9	static int recursive = 0;
e0965d83	10	static int read_stdin = 0;
81e50eab	11	static int diff_output_format = DIFF_FORMAT_HUMAN;
5c97558c	12	static int detect_rename = 0;
de809dbb	13	static int reverse_diff = 0;
57fe64a4	14	static int diff_score_opt = 0;
057c7d30	15	static const char *pickaxe = NULL;
f4f21ce3	16	static const char *header = NULL;
cee99d22	17	static const char *header_prefix = "";
9174026c	18
c5b42386 LT	19	// What paths are we interested in?
c5b42386 LT	20	static int nr_paths = 0;
6b14d7fa	21	static const char **paths = NULL;
c5b42386 LT	22	static int *pathlens = NULL;
c5b42386 LT	23
eeb79916	24	static int diff_tree_sha1(const unsigned char old, const unsigned char new, const char *base);
73134b6d LT	25
73134b6d LT	26	static void update_tree_entry(void *bufp, unsigned long sizep)
9174026c LT	27	{
	28	void buf = bufp;
	29	unsigned long size = *sizep;
	30	int len = strlen(buf) + 1 + 20;
	31
	32	if (size < len)
2de381f9	33	die("corrupt tree file");
9174026c LT	34	*bufp = buf + len;
9174026c LT	35	*sizep = size - len;
9174026c LT	36	}
	37
	38	static const unsigned char extract(void tree, unsigned long size, const char *pathp, unsigned int modep)
	39	{
	40	int len = strlen(tree)+1;
	41	const unsigned char *sha1 = tree + len;
	42	const char *path = strchr(tree, ' ');
	43
	44	if (!path \|\| size < len + 20 \|\| sscanf(tree, "%o", modep) != 1)
2de381f9	45	die("corrupt tree file");
9174026c LT	46	*pathp = path+1;
	47	return sha1;
	48	}
	49
262e82b4 LT	50	static char malloc_base(const char base, const char *path, int pathlen)
	51	{
	52	int baselen = strlen(base);
812666c8	53	char *newbase = xmalloc(baselen + pathlen + 2);
262e82b4 LT	54	memcpy(newbase, base, baselen);
	55	memcpy(newbase + baselen, path, pathlen);
	56	memcpy(newbase + baselen + pathlen, "/", 2);
	57	return newbase;
	58	}
	59
	60	static void show_file(const char prefix, void tree, unsigned long size, const char *base);
ed1a368b	61	static void show_tree(const char prefix, void tree, unsigned long size, const char *base);
262e82b4 LT	62
262e82b4 LT	63	/* A file entry went away or appeared */
73134b6d	64	static void show_file(const char prefix, void tree, unsigned long size, const char *base)
9174026c LT	65	{
	66	unsigned mode;
	67	const char *path;
	68	const unsigned char *sha1 = extract(tree, size, &path, &mode);
262e82b4	69
f4f21ce3 LT	70	if (silent)
	71	return;
	72
262e82b4 LT	73	if (recursive && S_ISDIR(mode)) {
	74	char type[20];
	75	unsigned long size;
	76	char *newbase = malloc_base(base, path, strlen(path));
	77	void *tree;
	78
	79	tree = read_sha1_file(sha1, type, &size);
	80	if (!tree \|\| strcmp(type, "tree"))
2de381f9	81	die("corrupt tree sha %s", sha1_to_hex(sha1));
262e82b4 LT	82
262e82b4 LT	83	show_tree(prefix, tree, size, newbase);
57fe64a4	84
262e82b4 LT	85	free(tree);
	86	free(newbase);
	87	return;
	88	}
	89
57fe64a4	90	diff_addremove(prefix[0], mode, sha1, base, path);
9174026c LT	91	}
9174026c LT	92
eeb79916	93	static int compare_tree_entry(void tree1, unsigned long size1, void tree2, unsigned long size2, const char *base)
9174026c LT	94	{
	95	unsigned mode1, mode2;
	96	const char path1, path2;
	97	const unsigned char sha1, sha2;
73134b6d	98	int cmp, pathlen1, pathlen2;
9174026c LT	99
	100	sha1 = extract(tree1, size1, &path1, &mode1);
	101	sha2 = extract(tree2, size2, &path2, &mode2);
	102
73134b6d LT	103	pathlen1 = strlen(path1);
73134b6d LT	104	pathlen2 = strlen(path2);
e46091d5	105	cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
9174026c	106	if (cmp < 0) {
eeb79916	107	show_file("-", tree1, size1, base);
9174026c LT	108	return -1;
	109	}
	110	if (cmp > 0) {
eeb79916	111	show_file("+", tree2, size2, base);
9174026c LT	112	return 1;
	113	}
	114	if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
	115	return 0;
262e82b4 LT	116
	117	/*
	118	* If the filemode has changed to/from a directory from/to a regular
aebb2679	119	* file, we need to consider it a remove and an add.
262e82b4 LT	120	*/
	121	if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
	122	show_file("-", tree1, size1, base);
	123	show_file("+", tree2, size2, base);
	124	return 0;
	125	}
	126
	127	if (recursive && S_ISDIR(mode1)) {
eeb79916	128	int retval;
262e82b4	129	char *newbase = malloc_base(base, path1, pathlen1);
eeb79916 LT	130	retval = diff_tree_sha1(sha1, sha2, newbase);
	131	free(newbase);
	132	return retval;
73134b6d LT	133	}
73134b6d LT	134
f4f21ce3 LT	135	if (silent)
	136	return 0;
	137
57fe64a4	138	diff_change(mode1, mode2, sha1, sha2, base, path1);
9174026c LT	139	return 0;
	140	}
	141
c5b42386 LT	142	static int interesting(void tree, unsigned long size, const char base)
	143	{
	144	const char *path;
	145	unsigned mode;
	146	int i;
	147	int baselen, pathlen;
	148
	149	if (!nr_paths)
	150	return 1;
	151
	152	(void)extract(tree, size, &path, &mode);
	153
	154	pathlen = strlen(path);
	155	baselen = strlen(base);
	156
	157	for (i=0; i < nr_paths; i++) {
	158	const char *match = paths[i];
	159	int matchlen = pathlens[i];
	160
	161	if (baselen >= matchlen) {
	162	/* If it doesn't match, move along... */
	163	if (strncmp(base, match, matchlen))
	164	continue;
	165
	166	/* The base is a subdirectory of a path which was specified. */
	167	return 1;
	168	}
	169
	170	/* Does the base match? */
	171	if (strncmp(base, match, baselen))
	172	continue;
	173
	174	match += baselen;
	175	matchlen -= baselen;
	176
	177	if (pathlen > matchlen)
	178	continue;
	179
cb6c8ed2 LT	180	if (matchlen > pathlen) {
	181	if (match[pathlen] != '/')
	182	continue;
850e82d8 LT	183	if (!S_ISDIR(mode))
850e82d8 LT	184	continue;
cb6c8ed2 LT	185	}
cb6c8ed2 LT	186
c5b42386 LT	187	if (strncmp(path, match, pathlen))
	188	continue;
	189
	190	return 1;
	191	}
	192	return 0; /* No matches */
	193	}
	194
ed1a368b LT	195	/* A whole sub-tree went away or appeared */
	196	static void show_tree(const char prefix, void tree, unsigned long size, const char *base)
	197	{
	198	while (size) {
	199	if (interesting(tree, size, base))
	200	show_file(prefix, tree, size, base);
	201	update_tree_entry(&tree, &size);
	202	}
	203	}
	204
eeb79916	205	static int diff_tree(void tree1, unsigned long size1, void tree2, unsigned long size2, const char *base)
9174026c LT	206	{
9174026c LT	207	while (size1 \| size2) {
c5b42386 LT	208	if (nr_paths && size1 && !interesting(tree1, size1, base)) {
	209	update_tree_entry(&tree1, &size1);
	210	continue;
	211	}
	212	if (nr_paths && size2 && !interesting(tree2, size2, base)) {
	213	update_tree_entry(&tree2, &size2);
	214	continue;
	215	}
9174026c	216	if (!size1) {
eeb79916	217	show_file("+", tree2, size2, base);
9174026c LT	218	update_tree_entry(&tree2, &size2);
	219	continue;
	220	}
	221	if (!size2) {
eeb79916	222	show_file("-", tree1, size1, base);
9174026c LT	223	update_tree_entry(&tree1, &size1);
	224	continue;
	225	}
eeb79916	226	switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
9174026c LT	227	case -1:
	228	update_tree_entry(&tree1, &size1);
	229	continue;
	230	case 0:
	231	update_tree_entry(&tree1, &size1);
	232	/* Fallthrough */
	233	case 1:
	234	update_tree_entry(&tree2, &size2);
	235	continue;
	236	}
667bb59b	237	die("git-diff-tree: internal error");
9174026c LT	238	}
	239	return 0;
	240	}
	241
eeb79916	242	static int diff_tree_sha1(const unsigned char old, const unsigned char new, const char *base)
9174026c	243	{
9174026c LT	244	void tree1, tree2;
9174026c LT	245	unsigned long size1, size2;
73134b6d	246	int retval;
9174026c	247
e99d59ff	248	tree1 = read_object_with_reference(old, "tree", &size1, NULL);
c1fdf2a6	249	if (!tree1)
2de381f9	250	die("unable to read source tree (%s)", sha1_to_hex(old));
e99d59ff	251	tree2 = read_object_with_reference(new, "tree", &size2, NULL);
c1fdf2a6	252	if (!tree2)
2de381f9	253	die("unable to read destination tree (%s)", sha1_to_hex(new));
eeb79916	254	retval = diff_tree(tree1, size1, tree2, size2, base);
73134b6d LT	255	free(tree1);
	256	free(tree2);
	257	return retval;
	258	}
	259
38c6f780 JH	260	static void call_diff_setup(void)
38c6f780 JH	261	{
6b14d7fa	262	diff_setup(reverse_diff);
38c6f780 JH	263	}
38c6f780 JH	264
09d74b3b	265	static int call_diff_flush(void)
38c6f780 JH	266	{
38c6f780 JH	267	if (detect_rename)
6b14d7fa	268	diffcore_rename(detect_rename, diff_score_opt);
9ab55bd2	269	if (pickaxe)
6b14d7fa	270	diffcore_pickaxe(pickaxe);
9ab55bd2 LT	271	if (diff_queue_is_empty()) {
	272	diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
	273	return 0;
6b14d7fa JH	274	}
	275	if (nr_paths)
	276	diffcore_pathspec(paths);
	277	if (header) {
5831b563 JH	278	if (diff_output_format == DIFF_FORMAT_MACHINE) {
	279	const char ep, cp;
	280	for (cp = header; *cp; cp = ep) {
	281	ep = strchr(cp, '\n');
	282	if (ep == 0) ep = cp + strlen(cp);
	283	printf("%.*s%c", ep-cp, cp, 0);
	284	if (*ep) ep++;
	285	}
	286	}
	287	else {
	288	printf("%s", header);
	289	}
6b14d7fa JH	290	header = NULL;
6b14d7fa JH	291	}
b6d8f309	292	diff_flush(diff_output_format, 1);
6b14d7fa	293	return 1;
38c6f780 JH	294	}
38c6f780 JH	295
5c97558c JH	296	static int diff_tree_sha1_top(const unsigned char *old,
	297	const unsigned char new, const char base)
	298	{
	299	int ret;
57fe64a4	300
38c6f780	301	call_diff_setup();
5c97558c	302	ret = diff_tree_sha1(old, new, base);
38c6f780	303	call_diff_flush();
5c97558c JH	304	return ret;
	305	}
	306
dc26bd89 LT	307	static int diff_root_tree(const unsigned char new, const char base)
	308	{
	309	int retval;
	310	void *tree;
	311	unsigned long size;
	312
38c6f780	313	call_diff_setup();
e99d59ff	314	tree = read_object_with_reference(new, "tree", &size, NULL);
dc26bd89 LT	315	if (!tree)
	316	die("unable to read root tree (%s)", sha1_to_hex(new));
	317	retval = diff_tree("", 0, tree, size, base);
	318	free(tree);
38c6f780	319	call_diff_flush();
dc26bd89 LT	320	return retval;
	321	}
	322
cee99d22 LT	323	static int get_one_line(const char *msg, unsigned long len)
	324	{
	325	int ret = 0;
	326
	327	while (len--) {
	328	ret++;
	329	if (*msg++ == '\n')
	330	break;
	331	}
	332	return ret;
	333	}
	334
a02ebff6 LT	335	static int add_author_info(char buf, const char line, int len)
	336	{
	337	char *date;
	338	unsigned int namelen;
	339	unsigned long time;
	340	int tz;
	341
	342	line += strlen("author ");
	343	date = strchr(line, '>');
	344	if (!date)
	345	return 0;
	346	namelen = ++date - line;
	347	time = strtoul(date, &date, 10);
	348	tz = strtol(date, NULL, 10);
	349
	350	return sprintf(buf, "Author: %.*s\nDate: %s\n",
	351	namelen, line,
	352	show_date(time, tz));
	353	}
	354
cee99d22 LT	355	static char generate_header(const char commit, const char parent, const char msg, unsigned long len)
cee99d22 LT	356	{
3258c902	357	static char this_header[16384];
cee99d22 LT	358	int offset;
	359
	360	offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
	361	if (verbose_header) {
	362	int hdr = 1;
	363
	364	for (;;) {
	365	const char *line = msg;
	366	int linelen = get_one_line(msg, len);
	367
	368	if (!linelen)
	369	break;
3258c902 LT	370
	371	/*
	372	* We want some slop for indentation and a possible
	373	* final "...". Thus the "+ 20".
	374	*/
	375	if (offset + linelen + 20 > sizeof(this_header)) {
	376	memcpy(this_header + offset, " ...\n", 8);
	377	offset += 8;
cee99d22	378	break;
3258c902	379	}
cee99d22 LT	380
	381	msg += linelen;
	382	len -= linelen;
	383	if (linelen == 1)
	384	hdr = 0;
a02ebff6 LT	385	if (hdr) {
	386	if (!memcmp(line, "author ", 7))
	387	offset += add_author_info(this_header + offset, line, linelen);
cee99d22	388	continue;
a02ebff6	389	}
cee99d22 LT	390	memset(this_header + offset, ' ', 4);
	391	memcpy(this_header + offset + 4, line, linelen);
	392	offset += linelen + 4;
	393	}
3258c902 LT	394	/* Make sure there is an EOLN */
	395	if (this_header[offset-1] != '\n')
	396	this_header[offset++] = '\n';
	397	/* Add _another_ EOLN if we are doing diff output */
	398	if (!silent)
	399	this_header[offset++] = '\n';
cee99d22 LT	400	this_header[offset] = 0;
	401	}
	402
	403	return this_header;
	404	}
	405
b11645be	406	static int diff_tree_commit(const unsigned char commit, const char name)
e0965d83	407	{
e0965d83	408	unsigned long size, offset;
b11645be	409	char *buf = read_object_with_reference(commit, "commit", &size, NULL);
e0965d83	410
e0965d83 LT	411	if (!buf)
	412	return -1;
	413
73848892 LT	414	if (!name) {
	415	static char commit_name[60];
	416	strcpy(commit_name, sha1_to_hex(commit));
	417	name = commit_name;
	418	}
	419
dc26bd89 LT	420	/* Root commit? */
	421	if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
	422	header = generate_header(name, "root", buf, size);
	423	diff_root_tree(commit, "");
	424	}
	425
	426	/* More than one parent? */
	427	if (ignore_merges) {
	428	if (!memcmp(buf + 46 + 48, "parent ", 7))
	429	return 0;
	430	}
	431
e0965d83 LT	432	offset = 46;
e0965d83 LT	433	while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
b11645be	434	unsigned char parent[20];
e0965d83 LT	435	if (get_sha1_hex(buf + offset + 7, parent))
e0965d83 LT	436	return -1;
b11645be	437	header = generate_header(name, sha1_to_hex(parent), buf, size);
5c97558c	438	diff_tree_sha1_top(parent, commit, "");
d6db0107	439	if (!header && verbose_header) {
cee99d22	440	header_prefix = "\ndiff-tree ";
d6db0107 LT	441	/*
	442	* Don't print multiple merge entries if we
	443	* don't print the diffs.
	444	*/
	445	if (silent)
	446	break;
	447	}
e0965d83 LT	448	offset += 48;
e0965d83 LT	449	}
b11645be LT	450	return 0;
	451	}
	452
	453	static int diff_tree_stdin(char *line)
	454	{
	455	int len = strlen(line);
	456	unsigned char commit[20], parent[20];
	457	static char this_header[1000];
	458
	459	if (!len \|\| line[len-1] != '\n')
	460	return -1;
	461	line[len-1] = 0;
	462	if (get_sha1_hex(line, commit))
	463	return -1;
	464	if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
	465	line[40] = 0;
	466	line[81] = 0;
	467	sprintf(this_header, "%s (from %s)\n", line, line+41);
	468	header = this_header;
5c97558c	469	return diff_tree_sha1_top(parent, commit, "");
b11645be LT	470	}
	471	line[40] = 0;
	472	return diff_tree_commit(commit, line);
e0965d83 LT	473	}
e0965d83 LT	474
5aad72f2	475	static char *diff_tree_usage =
52e95789	476	"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
c5bac17a	477
6b14d7fa	478	int main(int argc, const char **argv)
73134b6d	479	{
0a8365a1	480	int nr_sha1;
e0965d83	481	char line[1000];
0a8365a1	482	unsigned char sha1[2][20];
73134b6d	483
0a8365a1	484	nr_sha1 = 0;
c5b42386	485	for (;;) {
6b14d7fa	486	const char *arg;
c5b42386	487
e0965d83 LT	488	argv++;
	489	argc--;
	490	arg = *argv;
0a8365a1	491	if (!arg)
c5b42386 LT	492	break;
c5b42386 LT	493
0a8365a1 LT	494	if (*arg != '-') {
	495	if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
	496	nr_sha1++;
	497	continue;
	498	}
	499	break;
	500	}
	501
	502	if (!strcmp(arg, "--")) {
e0965d83 LT	503	argv++;
	504	argc--;
	505	break;
	506	}
bf16c71e	507	if (!strcmp(arg, "-r")) {
73134b6d LT	508	recursive = 1;
	509	continue;
	510	}
de809dbb LT	511	if (!strcmp(arg, "-R")) {
	512	reverse_diff = 1;
	513	continue;
	514	}
3ebfd4aa	515	if (!strcmp(arg, "-p")) {
81e50eab JH	516	diff_output_format = DIFF_FORMAT_PATCH;
81e50eab JH	517	recursive = 1;
3ebfd4aa JH	518	continue;
3ebfd4aa JH	519	}
52e95789 JH	520	if (!strncmp(arg, "-S", 2)) {
	521	pickaxe = arg + 2;
	522	continue;
	523	}
57fe64a4	524	if (!strncmp(arg, "-M", 2)) {
6b14d7fa	525	detect_rename = DIFF_DETECT_RENAME;
57fe64a4	526	diff_score_opt = diff_scoreopt_parse(arg);
427dcb4b JH	527	continue;
	528	}
	529	if (!strncmp(arg, "-C", 2)) {
6b14d7fa	530	detect_rename = DIFF_DETECT_COPY;
427dcb4b	531	diff_score_opt = diff_scoreopt_parse(arg);
5c97558c JH	532	continue;
5c97558c JH	533	}
6cbd72f8	534	if (!strcmp(arg, "-z")) {
81e50eab	535	diff_output_format = DIFF_FORMAT_MACHINE;
6cbd72f8 LT	536	continue;
6cbd72f8 LT	537	}
e0965d83 LT	538	if (!strcmp(arg, "-m")) {
	539	ignore_merges = 0;
	540	continue;
	541	}
f4f21ce3 LT	542	if (!strcmp(arg, "-s")) {
	543	silent = 1;
	544	continue;
	545	}
cee99d22 LT	546	if (!strcmp(arg, "-v")) {
	547	verbose_header = 1;
	548	header_prefix = "diff-tree ";
	549	continue;
	550	}
e0965d83 LT	551	if (!strcmp(arg, "--stdin")) {
	552	read_stdin = 1;
	553	continue;
	554	}
dc26bd89 LT	555	if (!strcmp(arg, "--root")) {
	556	show_root_diff = 1;
	557	continue;
	558	}
c5bac17a	559	usage(diff_tree_usage);
73134b6d LT	560	}
73134b6d LT	561
e0965d83	562	if (argc > 0) {
c5b42386 LT	563	int i;
c5b42386 LT	564
e0965d83 LT	565	paths = argv;
e0965d83 LT	566	nr_paths = argc;
812666c8	567	pathlens = xmalloc(nr_paths * sizeof(int));
c5b42386 LT	568	for (i=0; i<nr_paths; i++)
	569	pathlens[i] = strlen(paths[i]);
	570	}
	571
0a8365a1 LT	572	switch (nr_sha1) {
	573	case 0:
	574	if (!read_stdin)
	575	usage(diff_tree_usage);
	576	break;
	577	case 1:
73848892	578	diff_tree_commit(sha1[0], NULL);
0a8365a1 LT	579	break;
0a8365a1 LT	580	case 2:
5c97558c	581	diff_tree_sha1_top(sha1[0], sha1[1], "");
0a8365a1 LT	582	break;
	583	}
	584
e0965d83	585	if (!read_stdin)
0a8365a1	586	return 0;
e0965d83 LT	587
	588	while (fgets(line, sizeof(line), stdin))
	589	diff_tree_stdin(line);
	590
	591	return 0;
9174026c	592	}