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