X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=diff-tree.c;h=a6d358fb34cdae32917bd08ab8d3f7bb2d10f3a7;hb=65c2e0c349aa5c7f605defb52dc67f1b3658a1b9;hp=ec2c078170b4323bdd1ba188addbe89c2528c79f;hpb=af5323e0274fad058f13949b89a9191a7bef7e38;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index ec2c0781..a6d358fb 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,6 +1,7 @@
 #include <ctype.h>
 #include "cache.h"
 #include "diff.h"
+#include "commit.h"
 
 static int show_root_diff = 0;
 static int verbose_header = 0;
@@ -43,10 +44,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;
 }
 
@@ -311,38 +314,6 @@ static int diff_root_tree(const unsigned char *new, const char *base)
 	return retval;
 }
 
-static int get_one_line(const char *msg, unsigned long len)
-{
-	int ret = 0;
-
-	while (len--) {
-		ret++;
-		if (*msg++ == '\n')
-			break;
-	}
-	return ret;
-}
-
-static int add_author_info(char *buf, const char *line, int len)
-{
-	char *date;
-	unsigned int namelen;
-	unsigned long time;
-	int tz;
-
-	line += strlen("author ");
-	date = strchr(line, '>');
-	if (!date)
-		return 0;
-	namelen = ++date - line;
-	time = strtoul(date, &date, 10);
-	tz = strtol(date, NULL, 10);
-
-	return sprintf(buf, "Author: %.*s\nDate:   %s\n",
-		namelen, line,
-		show_date(time, tz));
-}
-
 static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
 {
 	static char this_header[16384];
@@ -350,44 +321,9 @@ static char *generate_header(const char *commit, const char *parent, const char
 
 	offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
 	if (verbose_header) {
-		int hdr = 1;
-
-		for (;;) {
-			const char *line = msg;
-			int linelen = get_one_line(msg, len);
-
-			if (!linelen)
-				break;
-
-			/*
-			 * 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;
-			if (linelen == 1)
-				hdr = 0;
-			if (hdr) {
-				if (!memcmp(line, "author ", 7))
-					offset += add_author_info(this_header + offset, line, linelen);
-				continue;
-			}
-			memset(this_header + offset, ' ', 4);
-			memcpy(this_header + offset + 4, line, linelen);
-			offset += linelen + 4;
-		}
-		/* 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 */
+		offset += pretty_print_commit(msg, len, this_header + offset, sizeof(this_header) - offset);
 		this_header[offset++] = '\n';
-		this_header[offset] = 0;
+		this_header[offset++] = 0;
 	}
 
 	return this_header;