X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit.c;h=3d3bb1cde8cf1f57576d4bed99a4673da2be1bc5;hb=a48e1d67e167507091f25dc00e2bd6c280fa538e;hp=a466f7da6648da80737805b392658c317772770b;hpb=ac5155ef59a686f02e984d449476208ffe33b66d;p=git.git

diff --git a/commit.c b/commit.c
index a466f7da..3d3bb1cd 100644
--- a/commit.c
+++ b/commit.c
@@ -1,3 +1,4 @@
+#include <ctype.h>
 #include "tag.h"
 #include "commit.h"
 #include "cache.h"
@@ -174,3 +175,108 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
 	}
 	return ret;
 }
+
+/*
+ * Generic support for pretty-printing the header
+ */
+static int get_one_line(const char *msg, unsigned long len)
+{
+	int ret = 0;
+
+	while (len--) {
+		char c = *msg++;
+		ret++;
+		if (c == '\n')
+			break;
+		if (!c)
+			return 0;
+	}
+	return ret;
+}
+
+static int add_author_info(enum cmit_fmt fmt, char *buf, const char *line, int len)
+{
+	char *date;
+	unsigned int namelen;
+	unsigned long time;
+	int tz, ret;
+
+	line += strlen("author ");
+	date = strchr(line, '>');
+	if (!date)
+		return 0;
+	namelen = ++date - line;
+	time = strtoul(date, &date, 10);
+	tz = strtol(date, NULL, 10);
+
+	ret = sprintf(buf, "Author: %.*s\n", namelen, line);
+	if (fmt == CMIT_FMT_MEDIUM)
+		ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
+	return ret;
+}
+
+static int is_empty_line(const char *line, int len)
+{
+	while (len && isspace(line[len-1]))
+		len--;
+	return !len;
+}
+
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
+{
+	int hdr = 1, body = 0;
+	unsigned long offset = 0;
+
+	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 > space) {
+			memcpy(buf + offset, "    ...\n", 8);
+			offset += 8;
+			break;
+		}
+
+		msg += linelen;
+		len -= linelen;
+		if (hdr) {
+			if (linelen == 1) {
+				hdr = 0;
+				buf[offset++] = '\n';
+				continue;
+			}
+			if (fmt == CMIT_FMT_RAW) {
+				memcpy(buf + offset, line, linelen);
+				offset += linelen;
+				continue;
+			}
+			if (!memcmp(line, "author ", 7))
+				offset += add_author_info(fmt, buf + offset, line, linelen);
+			continue;
+		}
+
+		if (is_empty_line(line, linelen)) {
+			if (!body)
+				continue;
+			if (fmt == CMIT_FMT_SHORT)
+				break;
+		} else {
+			body = 1;
+		}
+		memset(buf + offset, ' ', 4);
+		memcpy(buf + offset + 4, line, linelen);
+		offset += linelen + 4;
+	}
+	/* Make sure there is an EOLN */
+	if (buf[offset - 1] != '\n')
+		buf[offset++] = '\n';
+	buf[offset] = '\0';
+	return offset;
+}