Merge branch 'ar/request-pull-phrasofix' into maint
[git.git] / revision.h
blobbc18487d6fff5e86dff60748c084995a77d2b588
1 #ifndef REVISION_H
2 #define REVISION_H
4 #include "parse-options.h"
5 #include "grep.h"
6 #include "notes.h"
7 #include "commit.h"
8 #include "diff.h"
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)
25 #define DECORATE_SHORT_REFS 1
26 #define DECORATE_FULL_REFS 2
28 struct rev_info;
29 struct log_info;
30 struct string_list;
31 struct saved_parents;
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;
51 #define REVISION_WALK_WALK 0
52 #define REVISION_WALK_NO_WALK_SORTED 1
53 #define REVISION_WALK_NO_WALK_UNSORTED 2
55 struct rev_info {
56 /* Starting list */
57 struct commit_list *commits;
58 struct object_array pending;
60 /* Parents of shown commits */
61 struct object_array boundary_commits;
63 /* The end-points specified by the end user */
64 struct rev_cmdline_info cmdline;
66 /* excluding from --branches, --refs, etc. expansion */
67 struct string_list *ref_excludes;
69 /* Basic information */
70 const char *prefix;
71 const char *def;
72 struct pathspec prune_data;
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").
79 int rev_input_given;
81 /* topo-sort */
82 enum rev_sort_order sort_order;
84 unsigned int early_output;
86 unsigned int ignore_missing:1,
87 ignore_missing_links:1;
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 tag_objects:1,
100 tree_objects:1,
101 blob_objects:1,
102 verify_objects:1,
103 edge_hint:1,
104 edge_hint_aggressive:1,
105 limited:1,
106 unpacked:1,
107 boundary:2,
108 count:1,
109 left_right:1,
110 left_only:1,
111 right_only:1,
112 rewrite_parents:1,
113 print_parents:1,
114 show_source:1,
115 show_decorations:1,
116 reverse:1,
117 reverse_output_stage:1,
118 cherry_pick:1,
119 cherry_mark:1,
120 bisect:1,
121 ancestry_path:1,
122 first_parent_only:1,
123 line_level_traverse:1;
125 /* Diff flags */
126 unsigned int diff:1,
127 full_diff:1,
128 show_root_diff:1,
129 no_commit_id:1,
130 verbose_header:1,
131 ignore_merges:1,
132 combine_merges:1,
133 dense_combined_merges:1,
134 always_show_header:1;
136 /* Format info */
137 unsigned int shown_one:1,
138 shown_dashes:1,
139 show_merge:1,
140 show_notes:1,
141 show_notes_given:1,
142 show_signature:1,
143 pretty_given:1,
144 abbrev_commit:1,
145 abbrev_commit_given:1,
146 zero_commit:1,
147 use_terminator:1,
148 missing_newline:1,
149 date_mode_explicit:1,
150 preserve_subject:1;
151 unsigned int disable_stdin:1;
152 unsigned int leak_pending:1;
153 /* --show-linear-break */
154 unsigned int track_linear:1,
155 track_first_time:1,
156 linear:1;
158 struct date_mode date_mode;
159 int expand_tabs_in_log; /* unset if negative */
160 int expand_tabs_in_log_default;
162 unsigned int abbrev;
163 enum cmit_fmt commit_format;
164 struct log_info *loginfo;
165 int nr, total;
166 const char *mime_boundary;
167 const char *patch_suffix;
168 int numbered_files;
169 int reroll_count;
170 char *message_id;
171 struct ident_split from_ident;
172 struct string_list *ref_message_ids;
173 int add_signoff;
174 const char *extra_headers;
175 const char *log_reencode;
176 const char *subject_prefix;
177 int no_inline;
178 int show_log_size;
179 struct string_list *mailmap;
181 /* Filter by commit log message */
182 struct grep_opt grep_filter;
183 /* Negate the match of grep_filter */
184 int invert_grep;
186 /* Display history graph */
187 struct git_graph *graph;
189 /* special limits */
190 int skip_count;
191 int max_count;
192 timestamp_t max_age;
193 timestamp_t min_age;
194 int min_parents;
195 int max_parents;
196 int (*include_check)(struct commit *, void *);
197 void *include_check_data;
199 /* diff info for patches and for paths limiting */
200 struct diff_options diffopt;
201 struct diff_options pruning;
203 struct reflog_walk_info *reflog_info;
204 struct decoration children;
205 struct decoration merge_simplification;
206 struct decoration treesame;
208 /* notes-specific options: which refs to show */
209 struct display_notes_opt notes_opt;
211 /* commit counts */
212 int count_left;
213 int count_right;
214 int count_same;
216 /* line level range that we are chasing */
217 struct decoration line_log_data;
219 /* copies of the parent lists, for --full-diff display */
220 struct saved_parents *saved_parents_slab;
222 struct commit_list *previous_parents;
223 const char *break_bar;
226 extern int ref_excluded(struct string_list *, const char *path);
227 void clear_ref_exclusion(struct string_list **);
228 void add_ref_exclusion(struct string_list **, const char *exclude);
231 #define REV_TREE_SAME 0
232 #define REV_TREE_NEW 1 /* Only new files */
233 #define REV_TREE_OLD 2 /* Only files removed */
234 #define REV_TREE_DIFFERENT 3 /* Mixed changes */
236 /* revision.c */
237 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
238 extern volatile show_early_output_fn_t show_early_output;
240 struct setup_revision_opt {
241 const char *def;
242 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
243 const char *submodule;
244 int assume_dashdash;
245 unsigned revarg_opt;
248 extern void init_revisions(struct rev_info *revs, const char *prefix);
249 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
250 struct setup_revision_opt *);
251 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
252 const struct option *options,
253 const char * const usagestr[]);
254 #define REVARG_CANNOT_BE_FILENAME 01
255 #define REVARG_COMMITTISH 02
256 extern int handle_revision_arg(const char *arg, struct rev_info *revs,
257 int flags, unsigned revarg_opt);
259 extern void reset_revision_walk(void);
260 extern int prepare_revision_walk(struct rev_info *revs);
261 extern struct commit *get_revision(struct rev_info *revs);
262 extern char *get_revision_mark(const struct rev_info *revs,
263 const struct commit *commit);
264 extern void put_revision_mark(const struct rev_info *revs,
265 const struct commit *commit);
267 extern void mark_parents_uninteresting(struct commit *commit);
268 extern void mark_tree_uninteresting(struct tree *tree);
270 extern void show_object_with_name(FILE *, struct object *, const char *);
272 extern void add_pending_object(struct rev_info *revs,
273 struct object *obj, const char *name);
274 extern void add_pending_oid(struct rev_info *revs,
275 const char *name, const struct object_id *oid,
276 unsigned int flags);
278 extern void add_head_to_pending(struct rev_info *);
279 extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags);
280 extern void add_index_objects_to_pending(struct rev_info *, unsigned int flags);
282 enum commit_action {
283 commit_ignore,
284 commit_show,
285 commit_error
288 extern enum commit_action get_commit_action(struct rev_info *revs,
289 struct commit *commit);
290 extern enum commit_action simplify_commit(struct rev_info *revs,
291 struct commit *commit);
293 enum rewrite_result {
294 rewrite_one_ok,
295 rewrite_one_noparents,
296 rewrite_one_error
299 typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
301 extern int rewrite_parents(struct rev_info *revs, struct commit *commit,
302 rewrite_parent_fn_t rewrite_parent);
305 * The log machinery saves the original parent list so that
306 * get_saved_parents() can later tell what the real parents of the
307 * commits are, when commit->parents has been modified by history
308 * simpification.
310 * get_saved_parents() will transparently return commit->parents if
311 * history simplification is off.
313 extern struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
315 #endif