X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=commit.c;h=de5e94d1dd5eabc5dfdf6935cb90096c3d37c13e;hb=65c2e0c349aa5c7f605defb52dc67f1b3658a1b9;hp=e83056406f54495fe8a1090a816c425375858d4d;hpb=961784ee422c22075e131292b2235782e378c612;p=git.git

diff --git a/commit.c b/commit.c
index e8305640..de5e94d1 100644
--- a/commit.c
+++ b/commit.c
@@ -1,8 +1,6 @@
 #include "tag.h"
 #include "commit.h"
 #include "cache.h"
-#include <string.h>
-#include <limits.h>
 
 const char *commit_type = "commit";
 
@@ -37,6 +35,8 @@ struct commit *lookup_commit(unsigned char *sha1)
 		ret->object.type = commit_type;
 		return ret;
 	}
+	if (!obj->type)
+		obj->type = commit_type;
 	return check_commit(obj, sha1);
 }
 
@@ -103,16 +103,21 @@ int parse_commit(struct commit *item)
 			     sha1_to_hex(item->object.sha1));
 	}
 	ret = parse_commit_buffer(item, buffer, size);
+	if (!ret) {
+		item->buffer = buffer;
+		return 0;
+	}
 	free(buffer);
 	return ret;
 }
 
-void commit_list_insert(struct commit *item, struct commit_list **list_p)
+struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
 {
 	struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
 	new_list->item = item;
 	new_list->next = *list_p;
 	*list_p = new_list;
+	return new_list;
 }
 
 void free_commit_list(struct commit_list *list)
@@ -169,3 +174,83 @@ 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(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));
+}
+
+unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf, unsigned long space)
+{
+	int hdr = 1;
+	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 (linelen == 1)
+			hdr = 0;
+		if (hdr) {
+			if (!memcmp(line, "author ", 7))
+				offset += add_author_info(buf + offset, line, linelen);
+			continue;
+		}
+		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;
+}