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

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

static int show_root_diff = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
static int recursive = 0;
static int show_tree_entry_in_recursive = 0;
static int read_stdin = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
static int diff_setup_opt = 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static int pickaxe_opts = 0;
static int diff_break_opt = -1;
static const char *orderfile = 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, ' ');
	unsigned int mode;

	if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1)
		die("corrupt tree file");
	*pathp = path+1;
	*modep = DIFF_FILE_CANON_MODE(mode);
	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 (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);
		if (show_tree_entry_in_recursive)
			diff_change(mode1, mode2, sha1, sha2, base, path1);
		retval = diff_tree_sha1(sha1, sha2, newbase);
		free(newbase);
		return retval;
	}

	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(diff_setup_opt);
}

static int call_diff_flush(void)
{
	diffcore_std(0,
		     detect_rename, diff_score_opt,
		     pickaxe, pickaxe_opts,
		     diff_break_opt,
		     orderfile);
	if (diff_queue_is_empty()) {
		diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
		return 0;
	}
	if (header) {
		const char *fmt = "%s";
		if (diff_output_format == DIFF_FORMAT_MACHINE)
			fmt = "%s%c";
		
		printf(fmt, header, 0);
		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 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) {
		offset += pretty_print_commit(msg, len, this_header + offset, sizeof(this_header) - offset);
		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.
			 */
		}
		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>] [-O<orderfile>] [-m] [-s] [-v] [-t] <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, "-t")) {
			recursive = show_tree_entry_in_recursive = 1;
			continue;
		}
		if (!strcmp(arg, "-R")) {
			diff_setup_opt |= DIFF_SETUP_REVERSE;
			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, "-O", 2)) {
			orderfile = arg + 2;
			continue;
		}
		if (!strcmp(arg, "--pickaxe-all")) {
			pickaxe_opts = DIFF_PICKAXE_ALL;
			continue;
		}
		if (!strncmp(arg, "-M", 2)) {
			detect_rename = DIFF_DETECT_RENAME;
			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
				usage(diff_tree_usage);
			continue;
		}
		if (!strncmp(arg, "-C", 2)) {
			detect_rename = DIFF_DETECT_COPY;
			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
				usage(diff_tree_usage);
			continue;
		}
		if (!strncmp(arg, "-B", 2)) {
			if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
				usage(diff_tree_usage);
			continue;
		}
		if (!strcmp(arg, "-z")) {
			diff_output_format = DIFF_FORMAT_MACHINE;
			continue;
		}
		if (!strcmp(arg, "-m")) {
			ignore_merges = 0;
			continue;
		}
		if (!strcmp(arg, "-s")) {
			diff_output_format = DIFF_FORMAT_NO_OUTPUT;
			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;

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