Code

Merge branch 'maint-1.7.6' into maint-1.7.7
[git.git] / revision.h
1 #ifndef REVISION_H
2 #define REVISION_H
4 #include "parse-options.h"
5 #include "grep.h"
6 #include "notes.h"
8 #define SEEN            (1u<<0)
9 #define UNINTERESTING   (1u<<1)
10 #define TREESAME        (1u<<2)
11 #define SHOWN           (1u<<3)
12 #define TMP_MARK        (1u<<4) /* for isolated cases; clean after use */
13 #define BOUNDARY        (1u<<5)
14 #define CHILD_SHOWN     (1u<<6)
15 #define ADDED           (1u<<7) /* Parents already parsed and added? */
16 #define SYMMETRIC_LEFT  (1u<<8)
17 #define PATCHSAME       (1u<<9)
18 #define ALL_REV_FLAGS   ((1u<<10)-1)
20 #define DECORATE_SHORT_REFS     1
21 #define DECORATE_FULL_REFS      2
23 struct rev_info;
24 struct log_info;
25 struct string_list;
27 struct rev_cmdline_info {
28         unsigned int nr;
29         unsigned int alloc;
30         struct rev_cmdline_entry {
31                 struct object *item;
32                 const char *name;
33                 enum {
34                         REV_CMD_REF,
35                         REV_CMD_PARENTS_ONLY,
36                         REV_CMD_LEFT,
37                         REV_CMD_RIGHT,
38                         REV_CMD_REV
39                 } whence;
40                 unsigned flags;
41         } *rev;
42 };
44 struct rev_info {
45         /* Starting list */
46         struct commit_list *commits;
47         struct object_array pending;
49         /* Parents of shown commits */
50         struct object_array boundary_commits;
52         /* The end-points specified by the end user */
53         struct rev_cmdline_info cmdline;
55         /* Basic information */
56         const char *prefix;
57         const char *def;
58         struct pathspec prune_data;
59         unsigned int    early_output:1,
60                         ignore_missing:1;
62         /* Traversal flags */
63         unsigned int    dense:1,
64                         prune:1,
65                         no_walk:1,
66                         show_all:1,
67                         remove_empty_trees:1,
68                         simplify_history:1,
69                         lifo:1,
70                         topo_order:1,
71                         simplify_merges:1,
72                         simplify_by_decoration:1,
73                         tag_objects:1,
74                         tree_objects:1,
75                         blob_objects:1,
76                         edge_hint:1,
77                         limited:1,
78                         unpacked:1,
79                         boundary:2,
80                         count:1,
81                         left_right:1,
82                         left_only:1,
83                         right_only:1,
84                         rewrite_parents:1,
85                         print_parents:1,
86                         show_source:1,
87                         show_decorations:1,
88                         reverse:1,
89                         reverse_output_stage:1,
90                         cherry_pick:1,
91                         cherry_mark:1,
92                         bisect:1,
93                         ancestry_path:1,
94                         first_parent_only:1;
96         /* Diff flags */
97         unsigned int    diff:1,
98                         full_diff:1,
99                         show_root_diff:1,
100                         no_commit_id:1,
101                         verbose_header:1,
102                         ignore_merges:1,
103                         combine_merges:1,
104                         dense_combined_merges:1,
105                         always_show_header:1;
107         /* Format info */
108         unsigned int    shown_one:1,
109                         show_merge:1,
110                         show_notes:1,
111                         show_notes_given:1,
112                         pretty_given:1,
113                         abbrev_commit:1,
114                         abbrev_commit_given:1,
115                         use_terminator:1,
116                         missing_newline:1,
117                         date_mode_explicit:1,
118                         preserve_subject:1;
119         unsigned int    disable_stdin:1;
121         enum date_mode date_mode;
123         unsigned int    abbrev;
124         enum cmit_fmt   commit_format;
125         struct log_info *loginfo;
126         int             nr, total;
127         const char      *mime_boundary;
128         const char      *patch_suffix;
129         int             numbered_files;
130         char            *message_id;
131         struct string_list *ref_message_ids;
132         const char      *add_signoff;
133         const char      *extra_headers;
134         const char      *log_reencode;
135         const char      *subject_prefix;
136         int             no_inline;
137         int             show_log_size;
139         /* Filter by commit log message */
140         struct grep_opt grep_filter;
142         /* Display history graph */
143         struct git_graph *graph;
145         /* special limits */
146         int skip_count;
147         int max_count;
148         unsigned long max_age;
149         unsigned long min_age;
150         int min_parents;
151         int max_parents;
153         /* diff info for patches and for paths limiting */
154         struct diff_options diffopt;
155         struct diff_options pruning;
157         struct reflog_walk_info *reflog_info;
158         struct decoration children;
159         struct decoration merge_simplification;
161         /* notes-specific options: which refs to show */
162         struct display_notes_opt notes_opt;
164         /* commit counts */
165         int count_left;
166         int count_right;
167         int count_same;
168 };
170 #define REV_TREE_SAME           0
171 #define REV_TREE_NEW            1       /* Only new files */
172 #define REV_TREE_OLD            2       /* Only files removed */
173 #define REV_TREE_DIFFERENT      3       /* Mixed changes */
175 /* revision.c */
176 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
177 extern volatile show_early_output_fn_t show_early_output;
179 struct setup_revision_opt {
180         const char *def;
181         void (*tweak)(struct rev_info *, struct setup_revision_opt *);
182         const char *submodule;
183 };
185 extern void init_revisions(struct rev_info *revs, const char *prefix);
186 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
187 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
188                                  const struct option *options,
189                                  const char * const usagestr[]);
190 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
192 extern int prepare_revision_walk(struct rev_info *revs);
193 extern struct commit *get_revision(struct rev_info *revs);
194 extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
195 extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
197 extern void mark_parents_uninteresting(struct commit *commit);
198 extern void mark_tree_uninteresting(struct tree *tree);
200 struct name_path {
201         struct name_path *up;
202         int elem_len;
203         const char *elem;
204 };
206 char *path_name(const struct name_path *path, const char *name);
208 extern void add_object(struct object *obj,
209                        struct object_array *p,
210                        struct name_path *path,
211                        const char *name);
213 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
215 extern void add_head_to_pending(struct rev_info *);
217 enum commit_action {
218         commit_ignore,
219         commit_show,
220         commit_error
221 };
223 extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
224 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
226 #endif