Merge branch 'jc/boundary'

diff --git a/revision.h b/revision.h
index d289781051c523c7e1596c6e215625616d51f088..6ae39e6bec180769df0bccccdf652ad0ffd784f0 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -7,8 +7,9 @@
 #define SHOWN          (1u<<3)
 #define TMP_MARK       (1u<<4) /* for isolated cases; clean after use */
 #define BOUNDARY       (1u<<5)
-#define BOUNDARY_SHOW  (1u<<6)
+#define CHILD_SHOWN    (1u<<6)
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
+#define SYMMETRIC_LEFT (1u<<8)
 
 struct rev_info;
 struct log_info;
@@ -20,6 +21,9 @@ struct rev_info {
        struct commit_list *commits;
        struct object_array pending;
 
+       /* Parents of shown commits */
+       struct object_array boundary_commits;
+
        /* Basic information */
        const char *prefix;
        void *prune_data;
@@ -38,9 +42,11 @@ struct rev_info {
                        blob_objects:1,
                        edge_hint:1,
                        limited:1,
-                       unpacked:1,
-                       boundary:1,
-                       parents:1;
+                       unpacked:1, /* see also ignore_packed below */
+                       boundary:2,
+                       left_right:1,
+                       parents:1,
+                       reverse:1;
 
        /* Diff flags */
        unsigned int    diff:1,
@@ -57,6 +63,10 @@ struct rev_info {
        unsigned int    shown_one:1,
                        abbrev_commit:1,
                        relative_date:1;
+
+       const char **ignore_packed; /* pretend objects in these are unpacked */
+       int num_ignore_packed;
+
        unsigned int    abbrev;
        enum cmit_fmt   commit_format;
        struct log_info *loginfo;
@@ -66,8 +76,14 @@ struct rev_info {
        const char      *ref_message_id;
        const char      *add_signoff;
        const char      *extra_headers;
+       const char      *log_reencode;
+       int             no_inline;
+
+       /* Filter by commit log message */
+       struct grep_opt *grep_filter;
 
        /* special limits */
+       int skip_count;
        int max_count;
        unsigned long max_age;
        unsigned long min_age;
@@ -78,6 +94,8 @@ struct rev_info {
 
        topo_sort_set_fn_t topo_setter;
        topo_sort_get_fn_t topo_getter;
+
+       struct reflog_walk_info *reflog_info;
 };
 
 #define REV_TREE_SAME          0
@@ -90,6 +108,8 @@ extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2)
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);
 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
+extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
+
 extern void prepare_revision_walk(struct rev_info *revs);
 extern struct commit *get_revision(struct rev_info *revs);