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