X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-tree.c;h=b9267d6159c33b9b6325d14c1936f7254cfa53bb;hb=f4f21ce367a5119be1c4396d01271ece6e40ff70;hp=3579b5fd1182679a39b83eaaa9dd0e7c970f4545;hpb=812666c8e66a21e668c0789d0422aa5a7db54961;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index 3579b5fd..b9267d61 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,7 +1,14 @@
+#include <ctype.h>
 #include "cache.h"
+#include "diff.h"
 
+static int silent = 0;
+static int ignore_merges = 1;
 static int recursive = 0;
+static int read_stdin = 0;
 static int line_termination = '\n';
+static int generate_patch = 0;
+static const char *header = NULL;
 
 // What paths are we interested in?
 static int nr_paths = 0;
@@ -62,6 +69,14 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
 	const char *path;
 	const unsigned char *sha1 = extract(tree, size, &path, &mode);
 
+	if (header) {
+		printf("%s", header);
+		header = NULL;
+	}
+
+	if (silent)
+		return;
+
 	if (recursive && S_ISDIR(mode)) {
 		char type[20];
 		unsigned long size;
@@ -79,10 +94,15 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
 		return;
 	}
 
-	printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode,
-	       S_ISDIR(mode) ? "tree" : "blob",
-	       sha1_to_hex(sha1), base, path,
-	       line_termination);
+	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);
 }
 
 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@@ -128,11 +148,24 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 		return retval;
 	}
 
-	strcpy(old_sha1_hex, sha1_to_hex(sha1));
-	printf("*%o->%o\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);
+	if (header) {
+		printf("%s", header);
+		header = NULL;
+	}
+	if (silent)
+		return 0;
+
+	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);
+	}
 	return 0;
 }
 
@@ -225,10 +258,10 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 	unsigned long size1, size2;
 	int retval;
 
-	tree1 = read_tree_with_tree_or_commit_sha1(old, &size1, 0);
+	tree1 = read_object_with_reference(old, "tree", &size1, 0);
 	if (!tree1)
 		die("unable to read source tree (%s)", sha1_to_hex(old));
-	tree2 = read_tree_with_tree_or_commit_sha1(new, &size2, 0);
+	tree2 = read_object_with_reference(new, "tree", &size2, 0);
 	if (!tree2)
 		die("unable to read destination tree (%s)", sha1_to_hex(new));
 	retval = diff_tree(tree1, size1, tree2, size2, base);
@@ -237,43 +270,119 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 	return retval;
 }
 
-static char *diff_tree_usage = "diff-tree [-r] [-z] <tree sha1> <tree sha1>";
+static int diff_tree_stdin(char *line)
+{
+	int len = strlen(line);
+	unsigned char commit[20], parent[20];
+	unsigned long size, offset;
+	static char this_header[100];
+	char *buf;
+
+	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(parent, commit, "");
+	}
+	buf = read_object_with_reference(commit, "commit", &size, NULL);
+	if (!buf)
+		return -1;
+
+	/* 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)) {
+		if (get_sha1_hex(buf + offset + 7, parent))
+			return -1;
+		sprintf(this_header, "%s (from %s)\n", line, sha1_to_hex(parent));
+		header = this_header;
+		diff_tree_sha1(parent, commit, "");
+		offset += 48;
+	}
+	return -1;
+}
+
+static char *diff_tree_usage = "diff-tree [-p] [-r] [-z] <tree sha1> <tree sha1>";
 
 int main(int argc, char **argv)
 {
+	char line[1000];
 	unsigned char old[20], new[20];
 
 	for (;;) {
-		char *arg = argv[1];
+		char *arg;
 
+		argv++;
+		argc--;
+		arg = *argv;
 		if (!arg || *arg != '-')
 			break;
 
-		argv++;
-		argc--;
+		if (!strcmp(arg, "-")) {
+			argv++;
+			argc--;
+			break;
+		}
 		if (!strcmp(arg, "-r")) {
 			recursive = 1;
 			continue;
 		}
+		if (!strcmp(arg, "-p")) {
+			recursive = generate_patch = 1;
+			continue;
+		}
 		if (!strcmp(arg, "-z")) {
 			line_termination = '\0';
 			continue;
 		}
+		if (!strcmp(arg, "-m")) {
+			ignore_merges = 0;
+			continue;
+		}
+		if (!strcmp(arg, "-s")) {
+			silent = 1;
+			continue;
+		}
+		if (!strcmp(arg, "--stdin")) {
+			read_stdin = 1;
+			continue;
+		}
 		usage(diff_tree_usage);
 	}
 
-	if (argc < 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
-		usage(diff_tree_usage);
+	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 > 3) {
+	if (argc > 0) {
 		int i;
 
-		paths = &argv[3];
-		nr_paths = argc - 3;
+		paths = argv;
+		nr_paths = argc;
 		pathlens = xmalloc(nr_paths * sizeof(int));
 		for (i=0; i<nr_paths; i++)
 			pathlens[i] = strlen(paths[i]);
 	}
 
-	return diff_tree_sha1(old, new, "");
+	if (!read_stdin)
+		return diff_tree_sha1(old, new, "");
+
+	while (fgets(line, sizeof(line), stdin))
+		diff_tree_stdin(line);
+
+	return 0;
 }