[PATCH] Tidy up - slight simplification of rev-list.c

[git.git] / rev-list.c

diff --git a/rev-list.c b/rev-list.c
index 0d3c7741a59254f62a135a3bd749e38e1b8dfe71..c4a61513438b707c097815b7e0acbcea400f6d79 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -8,7 +8,8 @@
 #define SEEN           (1u << 0)
 #define INTERESTING    (1u << 1)
 #define COUNTED                (1u << 2)
-#define SHOWN          (LAST_EPOCH_FLAG << 2)
+#define SHOWN          (1u << 3)
+#define DUPCHECK       (1u << 4)
 
 static const char rev_list_usage[] =
        "usage: git-rev-list [OPTION] commit-id <commit-id>\n"
@@ -38,6 +39,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 +71,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 +411,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];
@@ -464,12 +464,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;
+                       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 & DUPCHECK)
+                       continue;
+               commit->object.flags |= DUPCHECK;
+               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)) {