X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-list.c;h=0dd45129e6678415f6578b4fc4a1234c6035fc77;hb=28346d2d3c6e609a618c6c429d865e9d5d50b998;hp=825006374a0b028b9a1980a2aee494132f3a4145;hpb=f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 82500637..0dd45129 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;
@@ -413,8 +410,10 @@ 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];
@@ -462,14 +461,20 @@ int main(int argc, char **argv)
 			limited = 1;
 			continue;
 		}
-		if (!strncmp(arg, "--merge-order", 13)) {
+		if (!strcmp(arg, "--merge-order")) {
 		        merge_order = 1;
+		        insert = commit_list_insert;
 			continue;
 		}
-		if (!strncmp(arg, "--show-breaks", 13)) {
+		if (!strcmp(arg, "--show-breaks")) {
 			show_breaks = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--topo-order")) {
+		        topo_order = 1;
+		        limited = 1;
+			continue;
+		}
 
 		flags = 0;
 		if (*arg == '^') {
@@ -482,12 +487,17 @@ int main(int argc, char **argv)
 		commit = get_commit_reference(arg, flags);
 		if (!commit)
 			continue;
-		insert_by_date(&list, commit);
+		if (commit->object.flags & SEEN)
+			continue;
+		commit->object.flags |= SEEN;
+		insert(commit, &list);
 	}
 
 	if (!merge_order) {		
 	        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)) {