X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=commit.c;h=9fbcbd33c7530275a31c701207a34c4bc462da05;hb=65f0d0ee4627dd0f0468ceded38677076d78feb5;hp=eda45d7e15358ed6f2cd0502de2a08987307fc98;hpb=175785e5ff7395be8a458694a7df0511ac14e948;p=git.git

diff --git a/commit.c b/commit.c
index eda45d7e..9fbcbd33 100644
--- a/commit.c
+++ b/commit.c
@@ -1,6 +1,7 @@
 #include "commit.h"
 #include "cache.h"
 #include <string.h>
+#include <limits.h>
 
 const char *commit_type = "commit";
 
@@ -11,9 +12,10 @@ struct commit *lookup_commit(unsigned char *sha1)
 		struct commit *ret = malloc(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) {
+	if (obj->type != commit_type) {
 		error("Object %s is a %s, not a commit", 
 		      sha1_to_hex(sha1), obj->type);
 		return NULL;
@@ -55,19 +57,18 @@ int parse_commit(struct commit *item)
 	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);
@@ -75,6 +76,14 @@ int parse_commit(struct commit *item)
 	return 0;
 }
 
+void commit_list_insert(struct commit *item, struct commit_list **list_p)
+{
+	struct commit_list *new_list = malloc(sizeof(struct commit_list));
+	new_list->item = item;
+	new_list->next = *list_p;
+	*list_p = new_list;
+}
+
 void free_commit_list(struct commit_list *list)
 {
 	while (list) {
@@ -83,3 +92,49 @@ void free_commit_list(struct commit_list *list)
 		free(temp);
 	}
 }
+
+static 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;
+}