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