X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit.c;h=d4cd45580def5ed2e0528d95c2a2fa45cb190f23;hb=0b124bb4bf8eafae8a4eae9c1fc44bf63da2e62e;hp=21ac2fe9d71832896c21cae6528a2355068e654a;hpb=a3437b8c26a63d971437c8b6ac6f6d4f632be548;p=git.git

diff --git a/commit.c b/commit.c
index 21ac2fe9..d4cd4558 100644
--- a/commit.c
+++ b/commit.c
@@ -3,9 +3,40 @@
 #include "commit.h"
 #include "cache.h"
 
+struct sort_node
+{
+	/*
+         * the number of children of the associated commit
+         * that also occur in the list being sorted.
+         */
+	unsigned int indegree;
+
+	/*
+         * reference to original list item that we will re-use
+         * on output.
+         */
+	struct commit_list * list_item;
+
+};
+
 const char *commit_type = "commit";
 
-static struct commit *check_commit(struct object *obj, unsigned char *sha1)
+enum cmit_fmt get_commit_format(const char *arg)
+{
+	if (!*arg)
+		return CMIT_FMT_DEFAULT;
+	if (!strcmp(arg, "=raw"))
+		return CMIT_FMT_RAW;
+	if (!strcmp(arg, "=medium"))
+		return CMIT_FMT_MEDIUM;
+	if (!strcmp(arg, "=short"))
+		return CMIT_FMT_SHORT;
+	if (!strcmp(arg, "=full"))
+		return CMIT_FMT_FULL;
+	die("invalid --pretty format");
+}
+
+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", 
@@ -15,18 +46,19 @@ 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);
 
 	if (!obj)
 		return NULL;
-	if (obj->type == tag_type)
-		obj = ((struct tag *)obj)->tagged;
+	while (obj->type == tag_type)
+		obj = parse_object(((struct tag *)obj)->tagged->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) {
@@ -61,22 +93,30 @@ static unsigned long parse_commit_date(const char *buf)
 
 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 {
-	void *bufptr = buffer;
+	char *bufptr = buffer;
 	unsigned char parent[20];
+	struct commit_list **pptr;
 
 	if (item->object.parsed)
 		return 0;
 	item->object.parsed = 1;
-	get_sha1_hex(bufptr + 5, parent);
+	if (memcmp(bufptr, "tree ", 5))
+		return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
+	if (get_sha1_hex(bufptr + 5, parent) < 0)
+		return error("bad tree pointer in commit %s\n", sha1_to_hex(item->object.sha1));
 	item->tree = lookup_tree(parent);
 	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 *new_parent = lookup_commit(parent);
+	pptr = &item->parents;
+	while (!memcmp(bufptr, "parent ", 7)) {
+		struct commit *new_parent;
+
+		if (get_sha1_hex(bufptr + 7, parent) || bufptr[47] != '\n')
+			return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
+		new_parent = lookup_commit(parent);
 		if (new_parent) {
-			commit_list_insert(new_parent, &item->parents);
+			pptr = &commit_list_insert(new_parent, pptr)->next;
 			add_ref(&item->object, &new_parent->object);
 		}
 		bufptr += 48;
@@ -130,7 +170,7 @@ void free_commit_list(struct commit_list *list)
 	}
 }
 
-void insert_by_date(struct commit_list **list, struct commit *item)
+struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
 {
 	struct commit_list **pp = list;
 	struct commit_list *p;
@@ -140,7 +180,7 @@ void insert_by_date(struct commit_list **list, struct commit *item)
 		}
 		pp = &p->next;
 	}
-	commit_list_insert(item, pp);
+	return commit_list_insert(item, pp);
 }
 
 	
@@ -148,7 +188,7 @@ void sort_by_date(struct commit_list **list)
 {
 	struct commit_list *ret = NULL;
 	while (*list) {
-		insert_by_date(&ret, (*list)->item);
+		insert_by_date((*list)->item, &ret);
 		*list = (*list)->next;
 	}
 	*list = ret;
@@ -169,7 +209,7 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
 		parse_commit(commit);
 		if (!(commit->object.flags & mark)) {
 			commit->object.flags |= mark;
-			insert_by_date(list, commit);
+			insert_by_date(commit, list);
 		}
 		parents = parents->next;
 	}
@@ -194,14 +234,13 @@ static int get_one_line(const char *msg, unsigned long len)
 	return ret;
 }
 
-static int add_author_info(enum cmit_fmt fmt, char *buf, const char *line, int len)
+static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
 {
 	char *date;
 	unsigned int namelen;
 	unsigned long time;
 	int tz, ret;
 
-	line += strlen("author ");
 	date = strchr(line, '>');
 	if (!date)
 		return 0;
@@ -209,7 +248,7 @@ static int add_author_info(enum cmit_fmt fmt, char *buf, const char *line, int l
 	time = strtoul(date, &date, 10);
 	tz = strtol(date, NULL, 10);
 
-	ret = sprintf(buf, "Author: %.*s\n", namelen, line);
+	ret = sprintf(buf, "%s: %.*s\n", what, namelen, line);
 	if (fmt == CMIT_FMT_MEDIUM)
 		ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
 	return ret;
@@ -222,10 +261,29 @@ static int is_empty_line(const char *line, int len)
 	return !len;
 }
 
+static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents)
+{
+	int offset = 0;
+	switch (parents) {
+	case 1:
+		break;
+	case 2:
+		/* Go back to the previous line: 40 characters of previous parent, and one '\n' */
+		offset = sprintf(buf, "Merge: %.40s\n", line-41);
+		/* Fallthrough */
+	default:
+		/* Replace the previous '\n' with a space */
+		buf[offset-1] = ' ';
+		offset += sprintf(buf + offset, "%.40s\n", line+7);
+	}
+	return offset;
+}
+
 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;
+	int parents = 0;
 
 	for (;;) {
 		const char *line = msg;
@@ -257,8 +315,17 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
 				offset += linelen;
 				continue;
 			}
+			if (!memcmp(line, "parent ", 7)) {
+				if (linelen != 48)
+					die("bad parent line in commit");
+				offset += add_parent_info(fmt, buf + offset, line, ++parents);
+			}
 			if (!memcmp(line, "author ", 7))
-				offset += add_author_info(fmt, buf + offset, line, linelen);
+				offset += add_user_info("Author", fmt, buf + offset, line + 7);
+			if (fmt == CMIT_FMT_FULL) {
+				if (!memcmp(line, "committer ", 10))
+					offset += add_user_info("Commit", fmt, buf + offset, line + 10);
+			}
 			continue;
 		}
 
@@ -302,3 +369,94 @@ int count_parents(struct commit * commit)
         return count;
 }
 
+/*
+ * Performs an in-place topological sort on the list supplied.
+ */
+void sort_in_topological_order(struct commit_list ** list)
+{
+	struct commit_list * next = *list;
+	struct commit_list * work = NULL;
+	struct commit_list ** pptr = list;
+	struct sort_node * nodes;
+	struct sort_node * next_nodes;
+	int count = 0;
+
+	/* determine the size of the list */
+	while (next) {
+		next = next->next;
+		count++;
+	}
+	/* allocate an array to help sort the list */
+	nodes = xcalloc(count, sizeof(*nodes));
+	/* link the list to the array */
+	next_nodes = nodes;
+	next=*list;
+	while (next) {
+		next_nodes->list_item = next;
+		next->item->object.util = next_nodes;
+		next_nodes++;
+		next = next->next;
+	}
+	/* update the indegree */
+	next=*list;
+	while (next) {
+		struct commit_list * parents = next->item->parents;
+		while (parents) {
+			struct commit * parent=parents->item;
+			struct sort_node * pn = (struct sort_node *)parent->object.util;
+			
+			if (pn)
+				pn->indegree++;
+			parents=parents->next;
+		}
+		next=next->next;
+	}
+	/* 
+         * find the tips
+         *
+         * tips are nodes not reachable from any other node in the list 
+         * 
+         * the tips serve as a starting set for the work queue.
+         */
+	next=*list;
+	while (next) {
+		struct sort_node * node = (struct sort_node *)next->item->object.util;
+
+		if (node->indegree == 0) {
+			commit_list_insert(next->item, &work);
+		}
+		next=next->next;
+	}
+	/* process the list in topological order */
+	while (work) {
+		struct commit * work_item = pop_commit(&work);
+		struct sort_node * work_node = (struct sort_node *)work_item->object.util;
+		struct commit_list * parents = work_item->parents;
+
+		while (parents) {
+			struct commit * parent=parents->item;
+			struct sort_node * pn = (struct sort_node *)parent->object.util;
+			
+			if (pn) {
+				/* 
+				 * parents are only enqueued for emission 
+                                 * when all their children have been emitted thereby
+                                 * guaranteeing topological order.
+                                 */
+				pn->indegree--;
+				if (!pn->indegree) 
+					commit_list_insert(parent, &work);
+			}
+			parents=parents->next;
+		}
+		/*
+                 * work_item is a commit all of whose children
+                 * have already been emitted. we can emit it now.
+                 */
+		*pptr = work_node->list_item;
+		pptr = &(*pptr)->next;
+		*pptr = NULL;
+		work_item->object.util = NULL;
+	}
+	free(nodes);
+}