Custom low-level merge driver support.

diff --git a/revision.h b/revision.h
index a5c35d05cbd6bceb12248dff0b1e5c3f3433aeae..8a026184287479272ececf5cf3d5000c52007553 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;
@@ -39,8 +43,12 @@ struct rev_info {
                        edge_hint:1,
                        limited:1,
                        unpacked:1, /* see also ignore_packed below */
-                       boundary:1,
-                       parents:1;
+                       boundary:2,
+                       left_right:1,
+                       parents:1,
+                       reverse:1,
+                       cherry_pick:1,
+                       first_parent_only:1;
 
        /* Diff flags */
        unsigned int    diff:1,
@@ -70,8 +78,15 @@ struct rev_info {
        const char      *ref_message_id;
        const char      *add_signoff;
        const char      *extra_headers;
+       const char      *log_reencode;
+       const char      *subject_prefix;
+       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;
@@ -82,6 +97,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