Update the tutorial a bit

diff --git a/rev-list.c b/rev-list.c
index fb75c22bc7c88741758069977afb706f44758cdc..dfa0933825c5afdcb35e15ee739ba12530fcc9ff 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -8,17 +8,21 @@
 #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"
                      "  --max-count=nr\n"
                      "  --max-age=epoch\n"
                      "  --min-age=epoch\n"
+                     "  --bisect\n"
+                     "  --objects\n"
+                     "  --unpacked\n"
                      "  --header\n"
                      "  --pretty\n"
                      "  --merge-order [ --show-breaks ]";
 
+static int unpacked = 0;
 static int bisect_list = 0;
 static int tag_objects = 0;
 static int tree_objects = 0;
@@ -34,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)
 {
@@ -59,24 +64,21 @@ static void show_commit(struct commit *commit)
                static char pretty_header[16384];
                pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header));
                printf("%s%c", pretty_header, hdr_termination);
-       }       
+       }
+       fflush(stdout);
 }
 
 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;
@@ -318,6 +320,8 @@ static struct commit_list *limit_list(struct commit_list *list)
                struct commit *commit = pop_most_recent_commit(&list, SEEN);
                struct object *obj = &commit->object;
 
+               if (unpacked && has_sha1_pack(obj->sha1))
+                       obj->flags |= UNINTERESTING;
                if (obj->flags & UNINTERESTING) {
                        mark_parents_uninteresting(commit);
                        if (everybody_uninteresting(list))
@@ -377,7 +381,7 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
        if (object->type == tree_type) {
                struct tree *tree = (struct tree *)object;
                if (!tree_objects)
-                       die("%s is a tree object, not a commit", name);
+                       return NULL;
                if (flags & UNINTERESTING) {
                        mark_tree_uninteresting(tree);
                        return NULL;
@@ -392,7 +396,7 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
        if (object->type == blob_type) {
                struct blob *blob = (struct blob *)object;
                if (!blob_objects)
-                       die("%s is a blob object, not a commit", name);
+                       return NULL;
                if (flags & UNINTERESTING) {
                        mark_blob_uninteresting(blob);
                        return NULL;
@@ -450,14 +454,24 @@ int main(int argc, char **argv)
                        blob_objects = 1;
                        continue;
                }
-               if (!strncmp(arg, "--merge-order", 13)) {
+               if (!strcmp(arg, "--unpacked")) {
+                       unpacked = 1;
+                       limited = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "--merge-order")) {
                        merge_order = 1;
                        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 == '^') {
@@ -470,12 +484,18 @@ int main(int argc, char **argv)
                commit = get_commit_reference(arg, flags);
                if (!commit)
                        continue;
+               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)) {