X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-list.c;h=46a35d30e154d493d9f5c7b16af067023cdf01d5;hb=71fb3de0eed70bba1c7e28c8a0a2968efc48b9f3;hp=c20fec804e1fd4f88ee03647d5e86bb1e6e06e0c;hpb=7e21c29b56f80e8fd24613207b4e0116659ad5f8;p=git.git

diff --git a/rev-list.c b/rev-list.c
index c20fec80..46a35d30 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -8,7 +8,7 @@
 #define SEEN		(1u << 0)
 #define INTERESTING	(1u << 1)
 #define COUNTED		(1u << 2)
-#define SHOWN		(LAST_EPOCH_FLAG << 2)
+#define SHOWN		(1u << 3)
 
 static const char rev_list_usage[] =
 	"usage: git-rev-list [OPTION] commit-id <commit-id>\n"
@@ -38,6 +38,7 @@ static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 static int merge_order = 0;
 static int show_breaks = 0;
 static int stop_traversal = 0;
+static int topo_order = 0;
 
 static void show_commit(struct commit *commit)
 {
@@ -69,19 +70,15 @@ static void show_commit(struct commit *commit)
 
 static int filter_commit(struct commit * commit)
 {
-	if (merge_order && stop_traversal && commit->object.flags & BOUNDARY)
+	if (stop_traversal && (commit->object.flags & BOUNDARY))
 		return STOP;
 	if (commit->object.flags & (UNINTERESTING|SHOWN))
 		return CONTINUE;
 	if (min_age != -1 && (commit->date > min_age))
 		return CONTINUE;
 	if (max_age != -1 && (commit->date < max_age)) {
-		if (!merge_order)
-			return STOP;
-		else {
-			stop_traversal = 1;
-			return CONTINUE;
-		}
+		stop_traversal=1;
+		return merge_order?CONTINUE:STOP;
 	}
 	if (max_count != -1 && !max_count--)
 		return STOP;
@@ -206,6 +203,8 @@ static void mark_tree_uninteresting(struct tree *tree)
 	if (obj->flags & UNINTERESTING)
 		return;
 	obj->flags |= UNINTERESTING;
+	if (!has_sha1_file(obj->sha1))
+		return;
 	if (parse_tree(tree) < 0)
 		die("bad tree %s", sha1_to_hex(obj->sha1));
 	entry = tree->entries;
@@ -227,12 +226,24 @@ static void mark_parents_uninteresting(struct commit *commit)
 	while (parents) {
 		struct commit *commit = parents->item;
 		commit->object.flags |= UNINTERESTING;
+
+		/*
+		 * A missing commit is ok iff its parent is marked 
+		 * uninteresting.
+		 *
+		 * We just mark such a thing parsed, so that when
+		 * it is popped next time around, we won't be trying
+		 * to parse it and get an error.
+		 */
+		if (!has_sha1_file(commit->object.sha1))
+			commit->object.parsed = 1;
 		parents = parents->next;
 	}
 }
 
-static int everybody_uninteresting(struct commit_list *list)
+static int everybody_uninteresting(struct commit_list *orig)
 {
+	struct commit_list *list = orig;
 	while (list) {
 		struct commit *commit = list->item;
 		list = list->next;
@@ -240,6 +251,29 @@ static int everybody_uninteresting(struct commit_list *list)
 			continue;
 		return 0;
 	}
+
+	/*
+	 * Ok, go back and mark all the edge trees uninteresting,
+	 * since otherwise we can have situations where a parent
+	 * that was marked uninteresting (and we never even had
+	 * to look at) had lots of objects that we don't want to
+	 * include.
+	 *
+	 * NOTE! This still doesn't mean that the object list is
+	 * "correct", since we may end up listing objects that
+	 * even older commits (that we don't list) do actually
+	 * reference, but it gets us to a minimal list (or very
+	 * close) in practice.
+	 */
+	if (!tree_objects)
+		return 1;
+
+	while (orig) {
+		struct commit *commit = orig->item;
+		if (!parse_commit(commit) && commit->tree)
+			mark_tree_uninteresting(commit->tree);
+		orig = orig->next;
+	}
 	return 1;
 }
 
@@ -357,12 +391,12 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
 	/*
 	 * Tag object? Look what it points to..
 	 */
-	if (object->type == tag_type) {
+	while (object->type == tag_type) {
 		struct tag *tag = (struct tag *) object;
 		object->flags |= flags;
 		if (tag_objects && !(object->flags & UNINTERESTING))
 			add_pending_object(object, tag->tag);
-		object = tag->tagged;
+		object = parse_object(tag->tagged->sha1);
 	}
 
 	/*
@@ -374,6 +408,8 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
 		object->flags |= flags;
 		if (parse_commit(commit) < 0)
 			die("unable to parse commit %s", name);
+		if (flags & UNINTERESTING)
+			mark_parents_uninteresting(commit);
 		return commit;
 	}
 
@@ -413,10 +449,8 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
 int main(int argc, char **argv)
 {
 	struct commit_list *list = NULL;
-	struct commit_list *(*insert)(struct commit *, struct commit_list **);
 	int i, limited = 0;
 
-	insert = insert_by_date;
 	for (i = 1 ; i < argc; i++) {
 		int flags;
 		char *arg = argv[i];
@@ -466,13 +500,17 @@ int main(int argc, char **argv)
 		}
 		if (!strcmp(arg, "--merge-order")) {
 		        merge_order = 1;
-		        insert = commit_list_insert;
 			continue;
 		}
 		if (!strcmp(arg, "--show-breaks")) {
 			show_breaks = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--topo-order")) {
+		        topo_order = 1;
+		        limited = 1;
+			continue;
+		}
 
 		flags = 0;
 		if (*arg == '^') {
@@ -485,12 +523,18 @@ int main(int argc, char **argv)
 		commit = get_commit_reference(arg, flags);
 		if (!commit)
 			continue;
-		insert(commit, &list);
+		if (commit->object.flags & SEEN)
+			continue;
+		commit->object.flags |= SEEN;
+		commit_list_insert(commit, &list);
 	}
 
 	if (!merge_order) {		
+		sort_by_date(&list);
 	        if (limited)
 			list = limit_list(list);
+		if (topo_order)
+			sort_in_topological_order(&list);
 		show_commit_list(list);
 	} else {
 		if (sort_list_in_merge_order(list, &process_commit)) {