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