log: add --show-linear-break to help see non-linear history
[git] / revision.h
1 #ifndef REVISION_H
2 #define REVISION_H
3
4 #include "parse-options.h"
5 #include "grep.h"
6 #include "notes.h"
7 #include "commit.h"
8 #include "diff.h"
9
10 /* Remember to update object flag allocation in object.h */
11 #define SEEN            (1u<<0)
12 #define UNINTERESTING   (1u<<1)
13 #define TREESAME        (1u<<2)
14 #define SHOWN           (1u<<3)
15 #define TMP_MARK        (1u<<4) /* for isolated cases; clean after use */
16 #define BOUNDARY        (1u<<5)
17 #define CHILD_SHOWN     (1u<<6)
18 #define ADDED           (1u<<7) /* Parents already parsed and added? */
19 #define SYMMETRIC_LEFT  (1u<<8)
20 #define PATCHSAME       (1u<<9)
21 #define BOTTOM          (1u<<10)
22 #define TRACK_LINEAR    (1u<<26)
23 #define ALL_REV_FLAGS   (((1u<<11)-1) | TRACK_LINEAR)
24
25 #define DECORATE_SHORT_REFS     1
26 #define DECORATE_FULL_REFS      2
27
28 struct rev_info;
29 struct log_info;
30 struct string_list;
31 struct saved_parents;
32
33 struct rev_cmdline_info {
34         unsigned int nr;
35         unsigned int alloc;
36         struct rev_cmdline_entry {
37                 struct object *item;
38                 const char *name;
39                 enum {
40                         REV_CMD_REF,
41                         REV_CMD_PARENTS_ONLY,
42                         REV_CMD_LEFT,
43                         REV_CMD_RIGHT,
44                         REV_CMD_MERGE_BASE,
45                         REV_CMD_REV
46                 } whence;
47                 unsigned flags;
48         } *rev;
49 };
50
51 #define REVISION_WALK_WALK 0
52 #define REVISION_WALK_NO_WALK_SORTED 1
53 #define REVISION_WALK_NO_WALK_UNSORTED 2
54
55 struct rev_info {
56         /* Starting list */
57         struct commit_list *commits;
58         struct object_array pending;
59
60         /* Parents of shown commits */
61         struct object_array boundary_commits;
62
63         /* The end-points specified by the end user */
64         struct rev_cmdline_info cmdline;
65
66         /* excluding from --branches, --refs, etc. expansion */
67         struct string_list *ref_excludes;
68
69         /* Basic information */
70         const char *prefix;
71         const char *def;
72         struct pathspec prune_data;
73
74         /* topo-sort */
75         enum rev_sort_order sort_order;
76
77         unsigned int    early_output:1,
78                         ignore_missing:1;
79
80         /* Traversal flags */
81         unsigned int    dense:1,
82                         prune:1,
83                         no_walk:2,
84                         show_all:1,
85                         remove_empty_trees:1,
86                         simplify_history:1,
87                         topo_order:1,
88                         simplify_merges:1,
89                         simplify_by_decoration:1,
90                         tag_objects:1,
91                         tree_objects:1,
92                         blob_objects:1,
93                         verify_objects:1,
94                         edge_hint:1,
95                         limited:1,
96                         unpacked:1,
97                         boundary:2,
98                         count:1,
99                         left_right:1,
100                         left_only:1,
101                         right_only:1,
102                         rewrite_parents:1,
103                         print_parents:1,
104                         show_source:1,
105                         show_decorations:1,
106                         reverse:1,
107                         reverse_output_stage:1,
108                         cherry_pick:1,
109                         cherry_mark:1,
110                         bisect:1,
111                         ancestry_path:1,
112                         first_parent_only:1,
113                         line_level_traverse:1;
114
115         /* Diff flags */
116         unsigned int    diff:1,
117                         full_diff:1,
118                         show_root_diff:1,
119                         no_commit_id:1,
120                         verbose_header:1,
121                         ignore_merges:1,
122                         combine_merges:1,
123                         dense_combined_merges:1,
124                         always_show_header:1;
125
126         /* Format info */
127         unsigned int    shown_one:1,
128                         shown_dashes:1,
129                         show_merge:1,
130                         show_notes:1,
131                         show_notes_given:1,
132                         show_signature:1,
133                         pretty_given:1,
134                         abbrev_commit:1,
135                         abbrev_commit_given:1,
136                         use_terminator:1,
137                         missing_newline:1,
138                         date_mode_explicit:1,
139                         preserve_subject:1;
140         unsigned int    disable_stdin:1;
141         unsigned int    leak_pending:1;
142         /* --show-linear-break */
143         unsigned int    track_linear:1,
144                         track_first_time:1,
145                         linear:1;
146
147         enum date_mode date_mode;
148
149         unsigned int    abbrev;
150         enum cmit_fmt   commit_format;
151         struct log_info *loginfo;
152         int             nr, total;
153         const char      *mime_boundary;
154         const char      *patch_suffix;
155         int             numbered_files;
156         int             reroll_count;
157         char            *message_id;
158         struct ident_split from_ident;
159         struct string_list *ref_message_ids;
160         int             add_signoff;
161         const char      *extra_headers;
162         const char      *log_reencode;
163         const char      *subject_prefix;
164         int             no_inline;
165         int             show_log_size;
166         struct string_list *mailmap;
167
168         /* Filter by commit log message */
169         struct grep_opt grep_filter;
170
171         /* Display history graph */
172         struct git_graph *graph;
173
174         /* special limits */
175         int skip_count;
176         int max_count;
177         unsigned long max_age;
178         unsigned long min_age;
179         int min_parents;
180         int max_parents;
181
182         /* diff info for patches and for paths limiting */
183         struct diff_options diffopt;
184         struct diff_options pruning;
185
186         struct reflog_walk_info *reflog_info;
187         struct decoration children;
188         struct decoration merge_simplification;
189         struct decoration treesame;
190
191         /* notes-specific options: which refs to show */
192         struct display_notes_opt notes_opt;
193
194         /* commit counts */
195         int count_left;
196         int count_right;
197         int count_same;
198
199         /* line level range that we are chasing */
200         struct decoration line_log_data;
201
202         /* copies of the parent lists, for --full-diff display */
203         struct saved_parents *saved_parents_slab;
204
205         struct commit_list *previous_parents;
206         const char *break_bar;
207 };
208
209 extern int ref_excluded(struct string_list *, const char *path);
210 void clear_ref_exclusion(struct string_list **);
211 void add_ref_exclusion(struct string_list **, const char *exclude);
212
213
214 #define REV_TREE_SAME           0
215 #define REV_TREE_NEW            1       /* Only new files */
216 #define REV_TREE_OLD            2       /* Only files removed */
217 #define REV_TREE_DIFFERENT      3       /* Mixed changes */
218
219 /* revision.c */
220 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
221 extern volatile show_early_output_fn_t show_early_output;
222
223 struct setup_revision_opt {
224         const char *def;
225         void (*tweak)(struct rev_info *, struct setup_revision_opt *);
226         const char *submodule;
227         int assume_dashdash;
228         unsigned revarg_opt;
229 };
230
231 extern void init_revisions(struct rev_info *revs, const char *prefix);
232 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
233                            struct setup_revision_opt *);
234 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
235                                const struct option *options,
236                                const char * const usagestr[]);
237 #define REVARG_CANNOT_BE_FILENAME 01
238 #define REVARG_COMMITTISH 02
239 extern int handle_revision_arg(const char *arg, struct rev_info *revs,
240                                int flags, unsigned revarg_opt);
241
242 extern void reset_revision_walk(void);
243 extern int prepare_revision_walk(struct rev_info *revs);
244 extern struct commit *get_revision(struct rev_info *revs);
245 extern char *get_revision_mark(const struct rev_info *revs,
246                                const struct commit *commit);
247 extern void put_revision_mark(const struct rev_info *revs,
248                               const struct commit *commit);
249
250 extern void mark_parents_uninteresting(struct commit *commit);
251 extern void mark_tree_uninteresting(struct tree *tree);
252
253 struct name_path {
254         struct name_path *up;
255         int elem_len;
256         const char *elem;
257 };
258
259 char *path_name(const struct name_path *path, const char *name);
260
261 extern void show_object_with_name(FILE *, struct object *,
262                                   const struct name_path *, const char *);
263
264 extern void add_object(struct object *obj,
265                        struct object_array *p,
266                        struct name_path *path,
267                        const char *name);
268
269 extern void add_pending_object(struct rev_info *revs,
270                                struct object *obj, const char *name);
271 extern void add_pending_sha1(struct rev_info *revs,
272                              const char *name, const unsigned char *sha1,
273                              unsigned int flags);
274
275 extern void add_head_to_pending(struct rev_info *);
276
277 enum commit_action {
278         commit_ignore,
279         commit_show,
280         commit_error
281 };
282
283 extern enum commit_action get_commit_action(struct rev_info *revs,
284                                             struct commit *commit);
285 extern enum commit_action simplify_commit(struct rev_info *revs,
286                                           struct commit *commit);
287
288 enum rewrite_result {
289         rewrite_one_ok,
290         rewrite_one_noparents,
291         rewrite_one_error
292 };
293
294 typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
295
296 extern int rewrite_parents(struct rev_info *revs, struct commit *commit,
297         rewrite_parent_fn_t rewrite_parent);
298
299 /*
300  * Save a copy of the parent list, and return the saved copy.  This is
301  * used by the log machinery to retrieve the original parents when
302  * commit->parents has been modified by history simpification.
303  *
304  * You may only call save_parents() once per commit (this is checked
305  * for non-root commits).
306  *
307  * get_saved_parents() will transparently return commit->parents if
308  * history simplification is off.
309  */
310 extern void save_parents(struct rev_info *revs, struct commit *commit);
311 extern struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
312 extern void free_saved_parents(struct rev_info *revs);
313
314 #endif