Code

mergetool: Clean up description of files and prompts for merge resolutions
[git.git] / revision.h
1 #ifndef REVISION_H
2 #define REVISION_H
4 #define SEEN            (1u<<0)
5 #define UNINTERESTING   (1u<<1)
6 #define TREECHANGE      (1u<<2)
7 #define SHOWN           (1u<<3)
8 #define TMP_MARK        (1u<<4) /* for isolated cases; clean after use */
9 #define BOUNDARY        (1u<<5)
10 #define CHILD_SHOWN     (1u<<6)
11 #define ADDED           (1u<<7) /* Parents already parsed and added? */
12 #define SYMMETRIC_LEFT  (1u<<8)
14 struct rev_info;
15 struct log_info;
17 typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
19 struct rev_info {
20         /* Starting list */
21         struct commit_list *commits;
22         struct object_array pending;
24         /* Parents of shown commits */
25         struct object_array boundary_commits;
27         /* Basic information */
28         const char *prefix;
29         void *prune_data;
30         prune_fn_t *prune_fn;
32         /* Traversal flags */
33         unsigned int    dense:1,
34                         no_merges:1,
35                         no_walk:1,
36                         remove_empty_trees:1,
37                         simplify_history:1,
38                         lifo:1,
39                         topo_order:1,
40                         tag_objects:1,
41                         tree_objects:1,
42                         blob_objects:1,
43                         edge_hint:1,
44                         limited:1,
45                         unpacked:1, /* see also ignore_packed below */
46                         boundary:2,
47                         left_right:1,
48                         parents:1,
49                         reverse:1,
50                         first_parent_only:1;
52         /* Diff flags */
53         unsigned int    diff:1,
54                         full_diff:1,
55                         show_root_diff:1,
56                         no_commit_id:1,
57                         verbose_header:1,
58                         ignore_merges:1,
59                         combine_merges:1,
60                         dense_combined_merges:1,
61                         always_show_header:1;
63         /* Format info */
64         unsigned int    shown_one:1,
65                         abbrev_commit:1,
66                         relative_date:1;
68         const char **ignore_packed; /* pretend objects in these are unpacked */
69         int num_ignore_packed;
71         unsigned int    abbrev;
72         enum cmit_fmt   commit_format;
73         struct log_info *loginfo;
74         int             nr, total;
75         const char      *mime_boundary;
76         const char      *message_id;
77         const char      *ref_message_id;
78         const char      *add_signoff;
79         const char      *extra_headers;
80         const char      *log_reencode;
81         int             no_inline;
83         /* Filter by commit log message */
84         struct grep_opt *grep_filter;
86         /* special limits */
87         int skip_count;
88         int max_count;
89         unsigned long max_age;
90         unsigned long min_age;
92         /* diff info for patches and for paths limiting */
93         struct diff_options diffopt;
94         struct diff_options pruning;
96         topo_sort_set_fn_t topo_setter;
97         topo_sort_get_fn_t topo_getter;
99         struct reflog_walk_info *reflog_info;
100 };
102 #define REV_TREE_SAME           0
103 #define REV_TREE_NEW            1
104 #define REV_TREE_DIFFERENT      2
106 /* revision.c */
107 extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1);
108 extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2);
110 extern void init_revisions(struct rev_info *revs, const char *prefix);
111 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
112 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
114 extern void prepare_revision_walk(struct rev_info *revs);
115 extern struct commit *get_revision(struct rev_info *revs);
117 extern void mark_parents_uninteresting(struct commit *commit);
118 extern void mark_tree_uninteresting(struct tree *tree);
120 struct name_path {
121         struct name_path *up;
122         int elem_len;
123         const char *elem;
124 };
126 extern void add_object(struct object *obj,
127                        struct object_array *p,
128                        struct name_path *path,
129                        const char *name);
131 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
133 #endif