X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=commit.c;h=21ac2fe9d71832896c21cae6528a2355068e654a;hb=af3f929f9546268ede788b4217ff0b6a655ab62a;hp=eda45d7e15358ed6f2cd0502de2a08987307fc98;hpb=b51ad4314078298194d23d46e2b4473ffd32a88a;p=git.git

diff --git a/commit.c b/commit.c
index eda45d7e1..21ac2fe9d 100644
--- a/commit.c
+++ b/commit.c
@@ -1,24 +1,44 @@
+#include <ctype.h>
+#include "tag.h"
 #include "commit.h"
 #include "cache.h"
-#include <string.h>
 
 const char *commit_type = "commit";
 
+static struct commit *check_commit(struct object *obj, unsigned char *sha1)
+{
+	if (obj->type != commit_type) {
+		error("Object %s is a %s, not a commit", 
+		      sha1_to_hex(sha1), obj->type);
+		return NULL;
+	}
+	return (struct commit *) obj;
+}
+
+struct commit *lookup_commit_reference(unsigned char *sha1)
+{
+	struct object *obj = parse_object(sha1);
+
+	if (!obj)
+		return NULL;
+	if (obj->type == tag_type)
+		obj = ((struct tag *)obj)->tagged;
+	return check_commit(obj, sha1);
+}
+
 struct commit *lookup_commit(unsigned char *sha1)
 {
 	struct object *obj = lookup_object(sha1);
 	if (!obj) {
-		struct commit *ret = malloc(sizeof(struct commit));
+		struct commit *ret = xmalloc(sizeof(struct commit));
 		memset(ret, 0, sizeof(struct commit));
 		created_object(sha1, &ret->object);
+		ret->object.type = commit_type;
 		return ret;
 	}
-	if (obj->parsed && obj->type != commit_type) {
-		error("Object %s is a %s, not a commit", 
-		      sha1_to_hex(sha1), obj->type);
-		return NULL;
-	}
-	return (struct commit *) obj;
+	if (!obj->type)
+		obj->type = commit_type;
+	return check_commit(obj, sha1);
 }
 
 static unsigned long parse_commit_date(const char *buf)
@@ -39,42 +59,68 @@ static unsigned long parse_commit_date(const char *buf)
 	return date;
 }
 
-int parse_commit(struct commit *item)
+int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 {
-	char type[20];
-	void * buffer, *bufptr;
-	unsigned long size;
+	void *bufptr = buffer;
 	unsigned char parent[20];
+
 	if (item->object.parsed)
 		return 0;
 	item->object.parsed = 1;
-	buffer = bufptr = read_sha1_file(item->object.sha1, type, &size);
-	if (!buffer)
-		return error("Could not read %s",
-			     sha1_to_hex(item->object.sha1));
-	if (strcmp(type, commit_type))
-		return error("Object %s not a commit",
-			     sha1_to_hex(item->object.sha1));
-	item->object.type = commit_type;
 	get_sha1_hex(bufptr + 5, parent);
 	item->tree = lookup_tree(parent);
-	add_ref(&item->object, &item->tree->object);
+	if (item->tree)
+		add_ref(&item->object, &item->tree->object);
 	bufptr += 46; /* "tree " + "hex sha1" + "\n" */
 	while (!memcmp(bufptr, "parent ", 7) &&
 	       !get_sha1_hex(bufptr + 7, parent)) {
-		struct commit_list *new_parent = 
-			malloc(sizeof(struct commit_list));
-		new_parent->next = item->parents;
-		new_parent->item = lookup_commit(parent);
-		add_ref(&item->object, &new_parent->item->object);
-		item->parents = new_parent;
+		struct commit *new_parent = lookup_commit(parent);
+		if (new_parent) {
+			commit_list_insert(new_parent, &item->parents);
+			add_ref(&item->object, &new_parent->object);
+		}
 		bufptr += 48;
 	}
 	item->date = parse_commit_date(bufptr);
-	free(buffer);
 	return 0;
 }
 
+int parse_commit(struct commit *item)
+{
+	char type[20];
+	void *buffer;
+	unsigned long size;
+	int ret;
+
+	if (item->object.parsed)
+		return 0;
+	buffer = read_sha1_file(item->object.sha1, type, &size);
+	if (!buffer)
+		return error("Could not read %s",
+			     sha1_to_hex(item->object.sha1));
+	if (strcmp(type, commit_type)) {
+		free(buffer);
+		return error("Object %s not a commit",
+			     sha1_to_hex(item->object.sha1));
+	}
+	ret = parse_commit_buffer(item, buffer, size);
+	if (!ret) {
+		item->buffer = buffer;
+		return 0;
+	}
+	free(buffer);
+	return ret;
+}
+
+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)
 {
 	while (list) {
@@ -83,3 +129,176 @@ void free_commit_list(struct commit_list *list)
 		free(temp);
 	}
 }
+
+void insert_by_date(struct commit_list **list, struct commit *item)
+{
+	struct commit_list **pp = list;
+	struct commit_list *p;
+	while ((p = *pp) != NULL) {
+		if (p->item->date < item->date) {
+			break;
+		}
+		pp = &p->next;
+	}
+	commit_list_insert(item, pp);
+}
+
+	
+void sort_by_date(struct commit_list **list)
+{
+	struct commit_list *ret = NULL;
+	while (*list) {
+		insert_by_date(&ret, (*list)->item);
+		*list = (*list)->next;
+	}
+	*list = ret;
+}
+
+struct commit *pop_most_recent_commit(struct commit_list **list,
+				      unsigned int mark)
+{
+	struct commit *ret = (*list)->item;
+	struct commit_list *parents = ret->parents;
+	struct commit_list *old = *list;
+
+	*list = (*list)->next;
+	free(old);
+
+	while (parents) {
+		struct commit *commit = parents->item;
+		parse_commit(commit);
+		if (!(commit->object.flags & mark)) {
+			commit->object.flags |= mark;
+			insert_by_date(list, commit);
+		}
+		parents = parents->next;
+	}
+	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;
+}
+