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