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