]> git.ipfire.org Git - thirdparty/git.git/blame - revision.h
Fourth batch after 2.20
[thirdparty/git.git] / revision.h
CommitLineData
ae563542
LT
1#ifndef REVISION_H
2#define REVISION_H
3
ef3ca954 4#include "commit.h"
6b61ec05 5#include "parse-options.h"
0843acfd 6#include "grep.h"
894a9d33 7#include "notes.h"
cf394719 8#include "pretty.h"
19ecb564 9#include "diff.h"
87be2523 10#include "commit-slab-decl.h"
6b61ec05 11
208acbfb 12/* Remember to update object flag allocation in object.h */
ae563542
LT
13#define SEEN (1u<<0)
14#define UNINTERESTING (1u<<1)
7dc0fe3b 15#define TREESAME (1u<<2)
765ac8ec 16#define SHOWN (1u<<3)
7ae0b0cb 17#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
384e99a4 18#define BOUNDARY (1u<<5)
2b064697 19#define CHILD_SHOWN (1u<<6)
1b65a5aa 20#define ADDED (1u<<7) /* Parents already parsed and added? */
577ed5c2 21#define SYMMETRIC_LEFT (1u<<8)
adbbb31e 22#define PATCHSAME (1u<<9)
7f34a46f 23#define BOTTOM (1u<<10)
99c9aa95
MD
24/*
25 * Indicates object was reached by traversal. i.e. not given by user on
26 * command-line or stdin.
27 * NEEDSWORK: NOT_USER_GIVEN doesn't apply to commits because we only support
28 * filtering trees and blobs, but it may be useful to support filtering commits
29 * in the future.
30 */
31#define NOT_USER_GIVEN (1u<<25)
1b32dece 32#define TRACK_LINEAR (1u<<26)
99c9aa95 33#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR)
ae563542 34
b4542418
DS
35#define TOPO_WALK_EXPLORED (1u<<27)
36#define TOPO_WALK_INDEGREE (1u<<28)
ae563542 37
33e7018c
LH
38#define DECORATE_SHORT_REFS 1
39#define DECORATE_FULL_REFS 2
40
91539833 41struct log_info;
2abf3503
NTND
42struct repository;
43struct rev_info;
894a9d33 44struct string_list;
53d00b39 45struct saved_parents;
87be2523 46define_shared_commit_slab(revision_sources, char *);
8efdc326 47
281eee47
JH
48struct rev_cmdline_info {
49 unsigned int nr;
50 unsigned int alloc;
51 struct rev_cmdline_entry {
52 struct object *item;
53 const char *name;
54 enum {
55 REV_CMD_REF,
56 REV_CMD_PARENTS_ONLY,
57 REV_CMD_LEFT,
58 REV_CMD_RIGHT,
a765499a 59 REV_CMD_MERGE_BASE,
281eee47
JH
60 REV_CMD_REV
61 } whence;
62 unsigned flags;
63 } *rev;
64};
65
ca92e59e
MZ
66#define REVISION_WALK_WALK 0
67#define REVISION_WALK_NO_WALK_SORTED 1
68#define REVISION_WALK_NO_WALK_UNSORTED 2
69
f0d9cc41
DS
70struct topo_walk_info;
71
ae563542
LT
72struct rev_info {
73 /* Starting list */
74 struct commit_list *commits;
1f1e895f 75 struct object_array pending;
2abf3503 76 struct repository *repo;
ae563542 77
86ab4906
JH
78 /* Parents of shown commits */
79 struct object_array boundary_commits;
80
281eee47
JH
81 /* The end-points specified by the end user */
82 struct rev_cmdline_info cmdline;
83
e7b432c5
JH
84 /* excluding from --branches, --refs, etc. expansion */
85 struct string_list *ref_excludes;
86
ae563542
LT
87 /* Basic information */
88 const char *prefix;
02e54220 89 const char *def;
afe069d1 90 struct pathspec prune_data;
08f704f2 91
7ba82629
JK
92 /*
93 * Whether the arguments parsed by setup_revisions() included any
94 * "input" revisions that might still have yielded an empty pending
95 * list (e.g., patterns like "--all" or "--glob").
96 */
97 int rev_input_given;
98
a12cbe23
JK
99 /*
100 * Whether we read from stdin due to the --stdin option.
101 */
102 int read_from_stdin;
103
08f704f2
JH
104 /* topo-sort */
105 enum rev_sort_order sort_order;
106
e35b6ac5
SG
107 unsigned int early_output;
108
109 unsigned int ignore_missing:1,
2db1a43f 110 ignore_missing_links:1;
cdcefbc9 111
ae563542
LT
112 /* Traversal flags */
113 unsigned int dense:1,
53b2c823 114 prune:1,
ca92e59e 115 no_walk:2,
ae563542 116 remove_empty_trees:1,
9202434c 117 simplify_history:1,
ae563542 118 topo_order:1,
6546b593 119 simplify_merges:1,
78892e32 120 simplify_by_decoration:1,
ff9445be 121 single_worktree:1,
ae563542
LT
122 tag_objects:1,
123 tree_objects:1,
124 blob_objects:1,
5a48d240 125 verify_objects:1,
d9a83684 126 edge_hint:1,
1684c1b2 127 edge_hint_aggressive:1,
d9a83684 128 limited:1,
03a9683d 129 unpacked:1,
86ab4906 130 boundary:2,
f69c5018 131 count:1,
74bd9029 132 left_right:1,
60adf7d7
MG
133 left_only:1,
134 right_only:1,
885cf808
AS
135 rewrite_parents:1,
136 print_parents:1,
d467a525 137 show_decorations:1,
0053e902 138 reverse:1,
498bcd31 139 reverse_output_stage:1,
d7a17cad 140 cherry_pick:1,
adbbb31e 141 cherry_mark:1,
ad3f9a71 142 bisect:1,
ebdc94f3 143 ancestry_path:1,
12da1d1f 144 first_parent_only:1,
ce5b6f9b 145 line_level_traverse:1,
f3d618d2 146 tree_blobs_in_commit_order:1,
df11e196 147
7c0fe330
MD
148 /*
149 * Blobs are shown without regard for their existence.
150 * But not so for trees: unless exclude_promisor_objects
151 * is set and the tree in question is a promisor object;
152 * OR ignore_missing_links is set, the revision walker
153 * dies with a "bad tree object HASH" message when
154 * encountering a missing tree. For callers that can
155 * handle missing trees and want them to be filterable
156 * and showable, set this to true. The revision walker
157 * will filter and show such a missing tree as usual,
158 * but will not attempt to recurse into this tree
159 * object.
160 */
161 do_not_die_on_missing_tree:1,
162
df11e196
JT
163 /* for internal use only */
164 exclude_promisor_objects:1;
ae563542 165
cd2bdc53
LT
166 /* Diff flags */
167 unsigned int diff:1,
168 full_diff:1,
169 show_root_diff:1,
170 no_commit_id:1,
171 verbose_header:1,
172 ignore_merges:1,
173 combine_merges:1,
174 dense_combined_merges:1,
175 always_show_header:1;
176
177 /* Format info */
91539833 178 unsigned int shown_one:1,
bd1470b8 179 shown_dashes:1,
02e54220 180 show_merge:1,
66b2ed09
JH
181 show_notes:1,
182 show_notes_given:1,
0c37f1fc 183 show_signature:1,
66b2ed09 184 pretty_given:1,
4da45bef 185 abbrev_commit:1,
0c47695a 186 abbrev_commit_given:1,
3a30aa17 187 zero_commit:1,
7fefda5c 188 use_terminator:1,
f4ea32f0 189 missing_newline:1,
9553d2b2
JK
190 date_mode_explicit:1,
191 preserve_subject:1;
8b3dce56 192 unsigned int disable_stdin:1;
1b32dece
NTND
193 /* --show-linear-break */
194 unsigned int track_linear:1,
195 track_first_time:1,
196 linear:1;
8b3dce56 197
a5481a6c 198 struct date_mode date_mode;
0893eec8
JH
199 int expand_tabs_in_log; /* unset if negative */
200 int expand_tabs_in_log_default;
106d710b 201
cd2bdc53
LT
202 unsigned int abbrev;
203 enum cmit_fmt commit_format;
91539833 204 struct log_info *loginfo;
596524b3 205 int nr, total;
698ce6f8 206 const char *mime_boundary;
108dab28
SB
207 const char *patch_suffix;
208 int numbered_files;
5fe10fe8 209 int reroll_count;
e1a37346 210 char *message_id;
a9080475 211 struct ident_split from_ident;
b079c50e 212 struct string_list *ref_message_ids;
5289c56a 213 int add_signoff;
20ff0680 214 const char *extra_headers;
52883fbd 215 const char *log_reencode;
2d9e4a47 216 const char *subject_prefix;
c112f689 217 int no_inline;
9fa3465d 218 int show_log_size;
0e2913b0 219 struct string_list *mailmap;
cd2bdc53 220
8ecae9b0 221 /* Filter by commit log message */
0843acfd 222 struct grep_opt grep_filter;
22dfa8a2
CJ
223 /* Negate the match of grep_filter */
224 int invert_grep;
8ecae9b0 225
7fefda5c
AS
226 /* Display history graph */
227 struct git_graph *graph;
228
ae563542 229 /* special limits */
d5db6c9e 230 int skip_count;
ae563542 231 int max_count;
dddbad72
JS
232 timestamp_t max_age;
233 timestamp_t min_age;
ad5aeede
MG
234 int min_parents;
235 int max_parents;
a330de31
VM
236 int (*include_check)(struct commit *, void *);
237 void *include_check_data;
8efdc326 238
cd2bdc53 239 /* diff info for patches and for paths limiting */
c4e05b1a 240 struct diff_options diffopt;
cd2bdc53 241 struct diff_options pruning;
c4e05b1a 242
8860fd42 243 struct reflog_walk_info *reflog_info;
f35f5603 244 struct decoration children;
faf0156b 245 struct decoration merge_simplification;
d0af663e 246 struct decoration treesame;
894a9d33
TR
247
248 /* notes-specific options: which refs to show */
249 struct display_notes_opt notes_opt;
f69c5018 250
126facf8
ES
251 /* interdiff */
252 const struct object_id *idiff_oid1;
253 const struct object_id *idiff_oid2;
5ac290f9 254 const char *idiff_title;
126facf8 255
31e2617a
ES
256 /* range-diff */
257 const char *rdiff1;
258 const char *rdiff2;
259 int creation_factor;
4ee99689 260 const char *rdiff_title;
31e2617a 261
f69c5018
TR
262 /* commit counts */
263 int count_left;
264 int count_right;
b388e14b 265 int count_same;
12da1d1f
TR
266
267 /* line level range that we are chasing */
268 struct decoration line_log_data;
53d00b39
TR
269
270 /* copies of the parent lists, for --full-diff display */
271 struct saved_parents *saved_parents_slab;
1b32dece
NTND
272
273 struct commit_list *previous_parents;
274 const char *break_bar;
87be2523
NTND
275
276 struct revision_sources *sources;
f0d9cc41
DS
277
278 struct topo_walk_info *topo_walk_info;
ae563542
LT
279};
280
d16ec9cd 281int ref_excluded(struct string_list *, const char *path);
ff32d342
JH
282void clear_ref_exclusion(struct string_list **);
283void add_ref_exclusion(struct string_list **, const char *exclude);
284
285
8efdc326 286#define REV_TREE_SAME 0
ceff8e7a
LT
287#define REV_TREE_NEW 1 /* Only new files */
288#define REV_TREE_OLD 2 /* Only files removed */
289#define REV_TREE_DIFFERENT 3 /* Mixed changes */
8efdc326 290
ae563542 291/* revision.c */
cdcefbc9 292typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
4dc1db0b 293extern volatile show_early_output_fn_t show_early_output;
8efdc326 294
32962c9b
JH
295struct setup_revision_opt {
296 const char *def;
b4490059 297 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
2abf3503 298 const char *submodule; /* TODO: drop this and use rev_info->repo */
bbcde41a
MD
299 unsigned int assume_dashdash:1,
300 allow_exclude_promisor_objects:1;
d5f6b1d7 301 unsigned revarg_opt;
32962c9b
JH
302};
303
2abf3503
NTND
304#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
305#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
306#endif
307void repo_init_revisions(struct repository *r,
308 struct rev_info *revs,
309 const char *prefix);
d16ec9cd
NTND
310int setup_revisions(int argc, const char **argv, struct rev_info *revs,
311 struct setup_revision_opt *);
312void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
313 const struct option *options,
314 const char * const usagestr[]);
8e676e8b 315#define REVARG_CANNOT_BE_FILENAME 01
d5f6b1d7 316#define REVARG_COMMITTISH 02
d16ec9cd
NTND
317int handle_revision_arg(const char *arg, struct rev_info *revs,
318 int flags, unsigned revarg_opt);
5d6f0935 319
d16ec9cd
NTND
320void reset_revision_walk(void);
321int prepare_revision_walk(struct rev_info *revs);
322struct commit *get_revision(struct rev_info *revs);
323char *get_revision_mark(const struct rev_info *revs,
324 const struct commit *commit);
325void put_revision_mark(const struct rev_info *revs,
326 const struct commit *commit);
a4a88b2b 327
d16ec9cd 328void mark_parents_uninteresting(struct commit *commit);
b3c7eef9 329void mark_tree_uninteresting(struct repository *r, struct tree *tree);
ae563542 330
d16ec9cd 331void show_object_with_name(FILE *, struct object *, const char *);
91f17516 332
d16ec9cd
NTND
333void add_pending_object(struct rev_info *revs,
334 struct object *obj, const char *name);
335void add_pending_oid(struct rev_info *revs,
336 const char *name, const struct object_id *oid,
337 unsigned int flags);
ae563542 338
d16ec9cd
NTND
339void add_head_to_pending(struct rev_info *);
340void add_reflogs_to_pending(struct rev_info *, unsigned int flags);
341void add_index_objects_to_pending(struct rev_info *, unsigned int flags);
3384a2df 342
252a7c02
LT
343enum commit_action {
344 commit_ignore,
345 commit_show,
346 commit_error
347};
348
d16ec9cd
NTND
349enum commit_action get_commit_action(struct rev_info *revs,
350 struct commit *commit);
351enum commit_action simplify_commit(struct rev_info *revs,
352 struct commit *commit);
252a7c02 353
c7edcae0
BY
354enum rewrite_result {
355 rewrite_one_ok,
356 rewrite_one_noparents,
357 rewrite_one_error
358};
359
360typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
361
d16ec9cd
NTND
362int rewrite_parents(struct rev_info *revs,
363 struct commit *commit,
364 rewrite_parent_fn_t rewrite_parent);
53d00b39
TR
365
366/*
0131c490
JH
367 * The log machinery saves the original parent list so that
368 * get_saved_parents() can later tell what the real parents of the
369 * commits are, when commit->parents has been modified by history
370 * simpification.
53d00b39
TR
371 *
372 * get_saved_parents() will transparently return commit->parents if
373 * history simplification is off.
374 */
d16ec9cd 375struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
53d00b39 376
ae563542 377#endif