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