Merge branch 'gs/rebase-allow-empty-message'
[git/git.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 "pretty.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 /*
75 * Whether the arguments parsed by setup_revisions() included any
76 * "input" revisions that might still have yielded an empty pending
77 * list (e.g., patterns like "--all" or "--glob").
78 */
79 int rev_input_given;
80
81 /* topo-sort */
82 enum rev_sort_order sort_order;
83
84 unsigned int early_output;
85
86 unsigned int ignore_missing:1,
87 ignore_missing_links:1;
88
89 /* Traversal flags */
90 unsigned int dense:1,
91 prune:1,
92 no_walk:2,
93 show_all:1,
94 remove_empty_trees:1,
95 simplify_history:1,
96 topo_order:1,
97 simplify_merges:1,
98 simplify_by_decoration:1,
99 single_worktree:1,
100 tag_objects:1,
101 tree_objects:1,
102 blob_objects:1,
103 verify_objects:1,
104 edge_hint:1,
105 edge_hint_aggressive:1,
106 limited:1,
107 unpacked:1,
108 boundary:2,
109 count:1,
110 left_right:1,
111 left_only:1,
112 right_only:1,
113 rewrite_parents:1,
114 print_parents:1,
115 show_source:1,
116 show_decorations:1,
117 reverse:1,
118 reverse_output_stage:1,
119 cherry_pick:1,
120 cherry_mark:1,
121 bisect:1,
122 ancestry_path:1,
123 first_parent_only:1,
124 line_level_traverse:1,
125 tree_blobs_in_commit_order:1,
126
127 /* for internal use only */
128 exclude_promisor_objects:1;
129
130 /* Diff flags */
131 unsigned int diff:1,
132 full_diff:1,
133 show_root_diff:1,
134 no_commit_id:1,
135 verbose_header:1,
136 ignore_merges:1,
137 combine_merges:1,
138 dense_combined_merges:1,
139 always_show_header:1;
140
141 /* Format info */
142 unsigned int shown_one:1,
143 shown_dashes:1,
144 show_merge:1,
145 show_notes:1,
146 show_notes_given:1,
147 show_signature:1,
148 pretty_given:1,
149 abbrev_commit:1,
150 abbrev_commit_given:1,
151 zero_commit:1,
152 use_terminator:1,
153 missing_newline:1,
154 date_mode_explicit:1,
155 preserve_subject:1;
156 unsigned int disable_stdin:1;
157 /* --show-linear-break */
158 unsigned int track_linear:1,
159 track_first_time:1,
160 linear:1;
161
162 struct date_mode date_mode;
163 int expand_tabs_in_log; /* unset if negative */
164 int expand_tabs_in_log_default;
165
166 unsigned int abbrev;
167 enum cmit_fmt commit_format;
168 struct log_info *loginfo;
169 int nr, total;
170 const char *mime_boundary;
171 const char *patch_suffix;
172 int numbered_files;
173 int reroll_count;
174 char *message_id;
175 struct ident_split from_ident;
176 struct string_list *ref_message_ids;
177 int add_signoff;
178 const char *extra_headers;
179 const char *log_reencode;
180 const char *subject_prefix;
181 int no_inline;
182 int show_log_size;
183 struct string_list *mailmap;
184
185 /* Filter by commit log message */
186 struct grep_opt grep_filter;
187 /* Negate the match of grep_filter */
188 int invert_grep;
189
190 /* Display history graph */
191 struct git_graph *graph;
192
193 /* special limits */
194 int skip_count;
195 int max_count;
196 timestamp_t max_age;
197 timestamp_t min_age;
198 int min_parents;
199 int max_parents;
200 int (*include_check)(struct commit *, void *);
201 void *include_check_data;
202
203 /* diff info for patches and for paths limiting */
204 struct diff_options diffopt;
205 struct diff_options pruning;
206
207 struct reflog_walk_info *reflog_info;
208 struct decoration children;
209 struct decoration merge_simplification;
210 struct decoration treesame;
211
212 /* notes-specific options: which refs to show */
213 struct display_notes_opt notes_opt;
214
215 /* commit counts */
216 int count_left;
217 int count_right;
218 int count_same;
219
220 /* line level range that we are chasing */
221 struct decoration line_log_data;
222
223 /* copies of the parent lists, for --full-diff display */
224 struct saved_parents *saved_parents_slab;
225
226 struct commit_list *previous_parents;
227 const char *break_bar;
228 };
229
230 extern int ref_excluded(struct string_list *, const char *path);
231 void clear_ref_exclusion(struct string_list **);
232 void add_ref_exclusion(struct string_list **, const char *exclude);
233
234
235 #define REV_TREE_SAME 0
236 #define REV_TREE_NEW 1 /* Only new files */
237 #define REV_TREE_OLD 2 /* Only files removed */
238 #define REV_TREE_DIFFERENT 3 /* Mixed changes */
239
240 /* revision.c */
241 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
242 extern volatile show_early_output_fn_t show_early_output;
243
244 struct setup_revision_opt {
245 const char *def;
246 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
247 const char *submodule;
248 int assume_dashdash;
249 unsigned revarg_opt;
250 };
251
252 extern void init_revisions(struct rev_info *revs, const char *prefix);
253 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
254 struct setup_revision_opt *);
255 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
256 const struct option *options,
257 const char * const usagestr[]);
258 #define REVARG_CANNOT_BE_FILENAME 01
259 #define REVARG_COMMITTISH 02
260 extern int handle_revision_arg(const char *arg, struct rev_info *revs,
261 int flags, unsigned revarg_opt);
262
263 extern void reset_revision_walk(void);
264 extern int prepare_revision_walk(struct rev_info *revs);
265 extern struct commit *get_revision(struct rev_info *revs);
266 extern char *get_revision_mark(const struct rev_info *revs,
267 const struct commit *commit);
268 extern void put_revision_mark(const struct rev_info *revs,
269 const struct commit *commit);
270
271 extern void mark_parents_uninteresting(struct commit *commit);
272 extern void mark_tree_uninteresting(struct tree *tree);
273
274 extern void show_object_with_name(FILE *, struct object *, const char *);
275
276 extern void add_pending_object(struct rev_info *revs,
277 struct object *obj, const char *name);
278 extern void add_pending_oid(struct rev_info *revs,
279 const char *name, const struct object_id *oid,
280 unsigned int flags);
281
282 extern void add_head_to_pending(struct rev_info *);
283 extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags);
284 extern void add_index_objects_to_pending(struct rev_info *, unsigned int flags);
285
286 enum commit_action {
287 commit_ignore,
288 commit_show,
289 commit_error
290 };
291
292 extern enum commit_action get_commit_action(struct rev_info *revs,
293 struct commit *commit);
294 extern enum commit_action simplify_commit(struct rev_info *revs,
295 struct commit *commit);
296
297 enum rewrite_result {
298 rewrite_one_ok,
299 rewrite_one_noparents,
300 rewrite_one_error
301 };
302
303 typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
304
305 extern int rewrite_parents(struct rev_info *revs, struct commit *commit,
306 rewrite_parent_fn_t rewrite_parent);
307
308 /*
309 * The log machinery saves the original parent list so that
310 * get_saved_parents() can later tell what the real parents of the
311 * commits are, when commit->parents has been modified by history
312 * simpification.
313 *
314 * get_saved_parents() will transparently return commit->parents if
315 * history simplification is off.
316 */
317 extern struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
318
319 #endif