X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=0b629d20b36f283b70751963bb4fcf5571f28641;hb=6b14d7faf0bad026a81a27bac07b47691f621b8f;hp=3bf8899873a3743eae9a541ec7829fdf20c22b19;hpb=e46091d5f3da713cd3c141ce0bfcd805c6d0ddf8;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index 3bf88998..0b629d20 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -8,17 +8,17 @@ static int verbose_header = 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 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 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);
@@ -67,11 +67,6 @@ 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;
 
@@ -137,10 +132,6 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 		return retval;
 	}
 
-	if (header) {
-		printf("%s", header);
-		header = NULL;
-	}
 	if (silent)
 		return 0;
 
@@ -254,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);
@@ -266,16 +257,41 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 	return retval;
 }
 
+static void call_diff_setup(void)
+{
+	diff_setup(reverse_diff);
+}
+
+static int call_diff_flush()
+{
+	if (detect_rename)
+		diffcore_rename(detect_rename, diff_score_opt);
+	diffcore_prune();
+	if (pickaxe) {
+		diffcore_pickaxe(pickaxe);
+		if (diff_queue_is_empty()) {
+			diff_flush(DIFF_FORMAT_NO_OUTPUT);
+			return 0;
+		}
+	}
+	if (nr_paths)
+		diffcore_pathspec(paths);
+	if (header) {
+		printf("%s", header);
+		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;
 
-	diff_setup(detect_rename, diff_score_opt, reverse_diff,
-		   (generate_patch ? -1 : line_termination),
-		   0, 0);
+	call_diff_setup();
 	ret = diff_tree_sha1(old, new, base);
-	diff_flush();
+	call_diff_flush();
 	return ret;
 }
 
@@ -285,15 +301,13 @@ static int diff_root_tree(const unsigned char *new, const char *base)
 	void *tree;
 	unsigned long size;
 
-	diff_setup(detect_rename, diff_score_opt, reverse_diff,
-		   (generate_patch ? -1 : line_termination),
-		   0, 0);
-	tree = read_object_with_reference(new, "tree", &size, 0);
+	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);
-	diff_flush();
+	call_diff_flush();
 	return retval;
 }
 
@@ -331,7 +345,7 @@ static int add_author_info(char *buf, const char *line, int len)
 
 static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
 {
-	static char this_header[1000];
+	static char this_header[16384];
 	int offset;
 
 	offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
@@ -344,8 +358,16 @@ static char *generate_header(const char *commit, const char *parent, const char
 
 			if (!linelen)
 				break;
-			if (offset + linelen + 10 > sizeof(this_header))
+
+			/*
+			 * 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;
@@ -360,7 +382,12 @@ static char *generate_header(const char *commit, const char *parent, const char
 			memcpy(this_header + offset + 4, line, linelen);
 			offset += linelen + 4;
 		}
-		this_header[offset++] = '\n';
+		/* 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;
 	}
 
@@ -400,8 +427,15 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
 			return -1;
 		header = generate_header(name, sha1_to_hex(parent), buf, size);
 		diff_tree_sha1_top(parent, commit, "");
-		if (!header && verbose_header)
+		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;
@@ -430,9 +464,9 @@ static int diff_tree_stdin(char *line)
 }
 
 static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-R] [-m] [-s] [-v] <tree-ish> <tree-ish>";
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
 	int nr_sha1;
 	char line[1000];
@@ -440,7 +474,7 @@ int main(int argc, char **argv)
 
 	nr_sha1 = 0;
 	for (;;) {
-		char *arg;
+		const char *arg;
 
 		argv++;
 		argc--;
@@ -470,16 +504,26 @@ int main(int argc, char **argv)
 			continue;
 		}
 		if (!strcmp(arg, "-p")) {
-			recursive = generate_patch = 1;
+			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 = recursive = generate_patch = 1;
+			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")) {
-			line_termination = '\0';
+			diff_output_format = DIFF_FORMAT_MACHINE;
 			continue;
 		}
 		if (!strcmp(arg, "-m")) {