X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit.c;h=9fa03ef03000979d4a798c8e22cd2074e7c9d48d;hb=ec73962d8e17e89ac0c4b21f07cefe16594e07a2;hp=abbf155da938cf675696e812b4083c8a773ffab0;hpb=3ff1fbbb9446e03050047a67247151887ee59e70;p=git.git

diff --git a/commit.c b/commit.c
index abbf155d..9fa03ef0 100644
--- a/commit.c
+++ b/commit.c
@@ -1,10 +1,11 @@
+#include <ctype.h>
 #include "tag.h"
 #include "commit.h"
 #include "cache.h"
 
 const char *commit_type = "commit";
 
-static struct commit *check_commit(struct object *obj, unsigned char *sha1)
+static struct commit *check_commit(struct object *obj, const unsigned char *sha1)
 {
 	if (obj->type != commit_type) {
 		error("Object %s is a %s, not a commit", 
@@ -14,7 +15,7 @@ static struct commit *check_commit(struct object *obj, unsigned char *sha1)
 	return (struct commit *) obj;
 }
 
-struct commit *lookup_commit_reference(unsigned char *sha1)
+struct commit *lookup_commit_reference(const unsigned char *sha1)
 {
 	struct object *obj = parse_object(sha1);
 
@@ -25,7 +26,7 @@ struct commit *lookup_commit_reference(unsigned char *sha1)
 	return check_commit(obj, sha1);
 }
 
-struct commit *lookup_commit(unsigned char *sha1)
+struct commit *lookup_commit(const unsigned char *sha1)
 {
 	struct object *obj = lookup_object(sha1);
 	if (!obj) {
@@ -111,12 +112,13 @@ int parse_commit(struct commit *item)
 	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)
@@ -128,7 +130,7 @@ void free_commit_list(struct commit_list *list)
 	}
 }
 
-static void insert_by_date(struct commit_list **list, struct commit *item)
+void insert_by_date(struct commit_list **list, struct commit *item)
 {
 	struct commit_list **pp = list;
 	struct commit_list *p;
@@ -173,3 +175,130 @@ 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;
+}
+
+struct commit *pop_commit(struct commit_list **stack)
+{
+	struct commit_list *top = *stack;
+	struct commit *item = top ? top->item : NULL;
+
+	if (top) {
+		*stack = top->next;
+		free(top);
+	}
+	return item;
+}
+
+int count_parents(struct commit * commit)
+{
+        int count = 0;
+        struct commit_list * parents = commit->parents;
+        for (count=0;parents; parents=parents->next,count++)
+          ;
+        return count;
+}
+