X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit.c;h=06d5439152cd835e4de11552ef09438ce14b4d1d;hb=d5dddccaa0c61c67340efca36237dfa06eccef1c;hp=e867b86e6a10d64354226b04f71df98d7448e072;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git

diff --git a/commit.c b/commit.c
index e867b86e..06d54391 100644
--- a/commit.c
+++ b/commit.c
@@ -1,6 +1,6 @@
+#include "cache.h"
 #include "tag.h"
 #include "commit.h"
-#include "cache.h"
 
 int save_commit_buffer = 1;
 
@@ -212,7 +212,8 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 	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));
+		return error("bad tree pointer in commit %s",
+			     sha1_to_hex(item->object.sha1));
 	item->tree = lookup_tree(parent);
 	if (item->tree)
 		n_refs++;
@@ -352,6 +353,21 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
 	return ret;
 }
 
+void clear_commit_marks(struct commit *commit, unsigned int mark)
+{
+	struct commit_list *parents;
+
+	parents = commit->parents;
+	commit->object.flags &= ~mark;
+	while (parents) {
+		struct commit *parent = parents->item;
+		if (parent && parent->object.parsed &&
+		    (parent->object.flags & mark))
+			clear_commit_marks(parent, mark);
+		parents = parents->next;
+	}
+}
+
 /*
  * Generic support for pretty-printing the header
  */
@@ -411,33 +427,37 @@ 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)
+static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
 {
-	int offset = 0;
+	struct commit_list *parent = commit->parents;
+	int offset;
 
-	if (fmt == CMIT_FMT_ONELINE)
-		return offset;
-	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);
+	if ((fmt == CMIT_FMT_ONELINE) || !parent || !parent->next)
+		return 0;
+
+	offset = sprintf(buf, "Merge:");
+
+	while (parent) {
+		struct commit *p = parent->item;
+		const char *hex = abbrev
+			? find_unique_abbrev(p->object.sha1, abbrev)
+			: sha1_to_hex(p->object.sha1);
+		char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
+		parent = parent->next;
+
+		offset += sprintf(buf + offset, " %s%s", hex, dots);
 	}
+	buf[offset++] = '\n';
 	return offset;
 }
 
-unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev)
 {
 	int hdr = 1, body = 0;
 	unsigned long offset = 0;
-	int parents = 0;
 	int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4;
+	int parents_shown = 0;
+	const char *msg = commit->buffer;
 
 	for (;;) {
 		const char *line = msg;
@@ -473,9 +493,15 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
 			if (!memcmp(line, "parent ", 7)) {
 				if (linelen != 48)
 					die("bad parent line in commit");
-				offset += add_parent_info(fmt, buf + offset, line, ++parents);
+				continue;
 			}
 
+			if (!parents_shown) {
+				offset += add_merge_info(fmt, buf + offset,
+							 commit, abbrev);
+				parents_shown = 1;
+				continue;
+			}
 			/*
 			 * MEDIUM == DEFAULT shows only author with dates.
 			 * FULL shows both authors but not dates.
@@ -546,7 +572,7 @@ int count_parents(struct commit * commit)
 /*
  * Performs an in-place topological sort on the list supplied.
  */
-void sort_in_topological_order(struct commit_list ** list)
+void sort_in_topological_order(struct commit_list ** list, int lifo)
 {
 	struct commit_list * next = *list;
 	struct commit_list * work = NULL, **insert;
@@ -560,6 +586,9 @@ void sort_in_topological_order(struct commit_list ** list)
 		next = next->next;
 		count++;
 	}
+	
+	if (!count)
+		return;
 	/* allocate an array to help sort the list */
 	nodes = xcalloc(count, sizeof(*nodes));
 	/* link the list to the array */
@@ -602,7 +631,10 @@ void sort_in_topological_order(struct commit_list ** list)
 		}
 		next=next->next;
 	}
+
 	/* process the list in topological order */
+	if (!lifo)
+		sort_by_date(&work);
 	while (work) {
 		struct commit * work_item = pop_commit(&work);
 		struct sort_node * work_node = (struct sort_node *)work_item->object.util;
@@ -619,8 +651,12 @@ void sort_in_topological_order(struct commit_list ** list)
                                  * guaranteeing topological order.
                                  */
 				pn->indegree--;
-				if (!pn->indegree) 
-					commit_list_insert(parent, &work);
+				if (!pn->indegree) {
+					if (!lifo)
+						insert_by_date(parent, &work);
+					else
+						commit_list_insert(parent, &work);
+				}
 			}
 			parents=parents->next;
 		}