[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 find_copies_harder = 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 *diff_filter = NULL;
static const char *header = NULL;
static const char *header_prefix = "";
static enum cmit_fmt commit_format = CMIT_FMT_RAW;

// 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 (!find_copies_harder && !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(NULL,
		     detect_rename, diff_score_opt,
		     pickaxe, pickaxe_opts,
		     diff_break_opt,
		     orderfile,
		     diff_filter);
	if (diff_queue_is_empty()) {
		diff_flush(DIFF_FORMAT_NO_OUTPUT);
		return 0;
	}
	if (header) {
		printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n');
		header = NULL;
	}
	diff_flush(diff_output_format);
	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 const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
{
	static char this_header[16384];
	int offset;

	if (!verbose_header)
		return commit;

	offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
	offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
	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 [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
"[<common diff options>] <tree-ish> <tree-ish>"
COMMON_DIFF_OPTIONS_HELP;

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