X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=b2d74eb1d1d74c87dd2530aba4638da760913916;hb=babfaba23d530e2818db62161825a65e582adbdc;hp=9e15b70642c543326f4a0b432258f489e1776c8a;hpb=e0965d83c533e8b6a51f1c6c1be12f5edee5ca65;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index 9e15b706..b2d74eb1 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,16 +1,24 @@
 #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 line_termination = '\n';
-static int generate_patch = 0;
+
+static struct diff_options diff_options;
+
+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 char **paths = NULL;
+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);
@@ -32,10 +40,12 @@ static const unsigned char *extract(void *tree, unsigned long size, const char *
 	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", modep) != 1)
+	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;
 }
 
@@ -50,15 +60,7 @@ static char *malloc_base(const char *base, const char *path, int pathlen)
 }
 
 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
-
-/* 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) {
-		show_file(prefix, tree, size, base);
-		update_tree_entry(&tree, &size);
-	}
-}
+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)
@@ -78,21 +80,13 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
 			die("corrupt tree sha %s", sha1_to_hex(sha1));
 
 		show_tree(prefix, tree, size, newbase);
-		
+
 		free(tree);
 		free(newbase);
 		return;
 	}
 
-	if (generate_patch) {
-		if (!S_ISDIR(mode))
-			diff_addremove(prefix[0], mode, sha1, base, path);
-	}
-	else
-		printf("%s%06o\t%s\t%s\t%s%s%c", prefix, mode,
-		       S_ISDIR(mode) ? "tree" : "blob",
-		       sha1_to_hex(sha1), base, path,
-		       line_termination);
+	diff_addremove(&diff_options, prefix[0], mode, sha1, base, path);
 }
 
 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@@ -101,14 +95,13 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 	const char *path1, *path2;
 	const unsigned char *sha1, *sha2;
 	int cmp, pathlen1, pathlen2;
-	char old_sha1_hex[50];
 
 	sha1 = extract(tree1, size1, &path1, &mode1);
 	sha2 = extract(tree2, size2, &path2, &mode2);
 
 	pathlen1 = strlen(path1);
 	pathlen2 = strlen(path2);
-	cmp = cache_name_compare(path1, pathlen1, path2, pathlen2);
+	cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
 	if (cmp < 0) {
 		show_file("-", tree1, size1, base);
 		return -1;
@@ -117,7 +110,8 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 		show_file("+", tree2, size2, base);
 		return 1;
 	}
-	if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
+	if (!diff_options.find_copies_harder &&
+	    !memcmp(sha1, sha2, 20) && mode1 == mode2)
 		return 0;
 
 	/*
@@ -133,22 +127,15 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 	if (recursive && S_ISDIR(mode1)) {
 		int retval;
 		char *newbase = malloc_base(base, path1, pathlen1);
+		if (show_tree_entry_in_recursive)
+			diff_change(&diff_options, mode1, mode2,
+				    sha1, sha2, base, path1);
 		retval = diff_tree_sha1(sha1, sha2, newbase);
 		free(newbase);
 		return retval;
 	}
 
-	if (generate_patch) {
-		if (!S_ISDIR(mode1))
-			diff_change(mode1, mode2, sha1, sha2, base, path1);
-	}
-	else {
-		strcpy(old_sha1_hex, sha1_to_hex(sha1));
-		printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
-		       S_ISDIR(mode1) ? "tree" : "blob",
-		       old_sha1_hex, sha1_to_hex(sha2), base, path1,
-		       line_termination);
-	}
+	diff_change(&diff_options, mode1, mode2, sha1, sha2, base, path1);
 	return 0;
 }
 
@@ -190,6 +177,13 @@ static int interesting(void *tree, unsigned long size, const char *base)
 		if (pathlen > matchlen)
 			continue;
 
+		if (matchlen > pathlen) {
+			if (match[pathlen] != '/')
+				continue;
+			if (!S_ISDIR(mode))
+				continue;
+		}
+
 		if (strncmp(path, match, pathlen))
 			continue;
 
@@ -198,6 +192,16 @@ static int interesting(void *tree, unsigned long size, const char *base)
 	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) {
@@ -230,7 +234,7 @@ static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned lon
 			update_tree_entry(&tree2, &size2);
 			continue;
 		}
-		die("diff-tree: internal error");
+		die("git-diff-tree: internal error");
 	}
 	return 0;
 }
@@ -241,10 +245,10 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 	unsigned long size1, size2;
 	int retval;
 
-	tree1 = read_object_with_reference(old, "tree", &size1, 0);
+	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, 0);
+	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);
@@ -253,63 +257,189 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 	return retval;
 }
 
-static int diff_tree_stdin(char *line)
+static void call_diff_setup_done(void)
 {
-	int len = strlen(line);
-	unsigned char commit[20], parent[20];
-	unsigned long size, offset;
-	char *buf;
+	diff_setup_done(&diff_options);
+}
 
-	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] = ' ';
-		line[81] = 0;
-		printf("%s:\n", line);
-		return diff_tree_sha1(parent, commit, "");
+static int call_diff_flush(void)
+{
+	diffcore_std(&diff_options);
+	if (diff_queue_is_empty()) {
+		int saved_fmt = diff_options.output_format;
+		diff_options.output_format = DIFF_FORMAT_NO_OUTPUT;
+		diff_flush(&diff_options);
+		diff_options.output_format = saved_fmt;
+		return 0;
+	}
+	if (header) {
+		printf("%s%c", header, diff_options.line_termination);
+		header = NULL;
 	}
-	buf = read_object_with_reference(commit, "commit", &size, NULL);
+	diff_flush(&diff_options);
+	return 1;
+}
+
+static int diff_tree_sha1_top(const unsigned char *old,
+			      const unsigned char *new, const char *base)
+{
+	int ret;
+
+	call_diff_setup_done();
+	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_done();
+	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;
 	}
 
-	line[40] = 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;
-		printf("%s %s:\n", line, sha1_to_hex(parent));
-		diff_tree_sha1(parent, commit, "");
+		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 -1;
+	free(buf);
+	return 0;
 }
 
-static char *diff_tree_usage = "diff-tree [-p] [-r] [-z] <tree sha1> <tree sha1>";
+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);
+}
 
-int main(int argc, char **argv)
+static int count_paths(const char **paths)
 {
+	int i = 0;
+	while (*paths++)
+		i++;
+	return i;
+}
+
+static const 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 old[20], new[20];
+	unsigned char sha1[2][20];
+	const char *prefix = setup_git_directory();
+
+	nr_sha1 = 0;
+	diff_setup(&diff_options);
 
 	for (;;) {
-		char *arg;
+		int diff_opt_cnt;
+		const char *arg;
 
 		argv++;
 		argc--;
 		arg = *argv;
-		if (!arg || *arg != '-')
+		if (!arg)
 			break;
 
-		if (!strcmp(arg, "-")) {
+		if (*arg != '-') {
+			if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
+				nr_sha1++;
+				continue;
+			}
+			break;
+		}
+
+		diff_opt_cnt = diff_opt_parse(&diff_options, argv, argc);
+		if (diff_opt_cnt < 0)
+			usage(diff_tree_usage);
+		else if (diff_opt_cnt) {
+			argv += diff_opt_cnt - 1;
+			argc -= diff_opt_cnt - 1;
+			continue;
+		}
+
+
+		if (!strcmp(arg, "--")) {
 			argv++;
 			argc--;
 			break;
@@ -318,45 +448,67 @@ int main(int argc, char **argv)
 			recursive = 1;
 			continue;
 		}
-		if (!strcmp(arg, "-p")) {
-			recursive = generate_patch = 1;
-			continue;
-		}
-		if (!strcmp(arg, "-z")) {
-			line_termination = '\0';
+		if (!strcmp(arg, "-t")) {
+			recursive = show_tree_entry_in_recursive = 1;
 			continue;
 		}
 		if (!strcmp(arg, "-m")) {
 			ignore_merges = 0;
 			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 (diff_options.output_format == DIFF_FORMAT_PATCH)
+		recursive = 1;
 
-	if (!read_stdin) {
-		if (argc < 2 || get_sha1(argv[0], old) || get_sha1(argv[1], new))
-			usage(diff_tree_usage);
-		argv += 2;
-		argc -= 2;
-	}
-
-	if (argc > 0) {
+	paths = get_pathspec(prefix, argv);
+	if (paths) {
 		int i;
 
-		paths = argv;
-		nr_paths = argc;
+		nr_paths = count_paths(paths);
 		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 diff_tree_sha1(old, new, "");
+		return 0;
 
+	if (diff_options.detect_rename)
+		diff_options.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
+				       DIFF_SETUP_USE_CACHE);
 	while (fgets(line, sizeof(line), stdin))
 		diff_tree_stdin(line);