]> git.ipfire.org Git - thirdparty/git.git/blame - revision.h
Merge branch 'jl/commit-v-strip-marker' into maint
[thirdparty/git.git] / revision.h
CommitLineData
ae563542
LT
1#ifndef REVISION_H
2#define REVISION_H
3
6b61ec05 4#include "parse-options.h"
0843acfd 5#include "grep.h"
894a9d33 6#include "notes.h"
08f704f2 7#include "commit.h"
19ecb564 8#include "diff.h"
6b61ec05 9
ae563542
LT
10#define SEEN (1u<<0)
11#define UNINTERESTING (1u<<1)
7dc0fe3b 12#define TREESAME (1u<<2)
765ac8ec 13#define SHOWN (1u<<3)
7ae0b0cb 14#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
384e99a4 15#define BOUNDARY (1u<<5)
2b064697 16#define CHILD_SHOWN (1u<<6)
1b65a5aa 17#define ADDED (1u<<7) /* Parents already parsed and added? */
577ed5c2 18#define SYMMETRIC_LEFT (1u<<8)
adbbb31e 19#define PATCHSAME (1u<<9)
7f34a46f
KB
20#define BOTTOM (1u<<10)
21#define ALL_REV_FLAGS ((1u<<11)-1)
ae563542 22
33e7018c
LH
23#define DECORATE_SHORT_REFS 1
24#define DECORATE_FULL_REFS 2
25
8efdc326 26struct rev_info;
91539833 27struct log_info;
894a9d33 28struct string_list;
53d00b39 29struct saved_parents;
8efdc326 30
281eee47
JH
31struct rev_cmdline_info {
32 unsigned int nr;
33 unsigned int alloc;
34 struct rev_cmdline_entry {
35 struct object *item;
36 const char *name;
37 enum {
38 REV_CMD_REF,
39 REV_CMD_PARENTS_ONLY,
40 REV_CMD_LEFT,
41 REV_CMD_RIGHT,
a765499a 42 REV_CMD_MERGE_BASE,
281eee47
JH
43 REV_CMD_REV
44 } whence;
45 unsigned flags;
46 } *rev;
47};
48
ca92e59e
MZ
49#define REVISION_WALK_WALK 0
50#define REVISION_WALK_NO_WALK_SORTED 1
51#define REVISION_WALK_NO_WALK_UNSORTED 2
52
ae563542
LT
53struct rev_info {
54 /* Starting list */
55 struct commit_list *commits;
1f1e895f 56 struct object_array pending;
ae563542 57
86ab4906
JH
58 /* Parents of shown commits */
59 struct object_array boundary_commits;
60
281eee47
JH
61 /* The end-points specified by the end user */
62 struct rev_cmdline_info cmdline;
63
ae563542
LT
64 /* Basic information */
65 const char *prefix;
02e54220 66 const char *def;
afe069d1 67 struct pathspec prune_data;
08f704f2
JH
68
69 /* topo-sort */
70 enum rev_sort_order sort_order;
71
cc243c3c
JH
72 unsigned int early_output:1,
73 ignore_missing:1;
cdcefbc9 74
ae563542
LT
75 /* Traversal flags */
76 unsigned int dense:1,
53b2c823 77 prune:1,
ca92e59e 78 no_walk:2,
3131b713 79 show_all:1,
ae563542 80 remove_empty_trees:1,
9202434c 81 simplify_history:1,
ae563542 82 topo_order:1,
6546b593 83 simplify_merges:1,
78892e32 84 simplify_by_decoration:1,
ae563542
LT
85 tag_objects:1,
86 tree_objects:1,
87 blob_objects:1,
5a48d240 88 verify_objects:1,
d9a83684
LT
89 edge_hint:1,
90 limited:1,
03a9683d 91 unpacked:1,
86ab4906 92 boundary:2,
f69c5018 93 count:1,
74bd9029 94 left_right:1,
60adf7d7
MG
95 left_only:1,
96 right_only:1,
885cf808
AS
97 rewrite_parents:1,
98 print_parents:1,
0f3a290b 99 show_source:1,
d467a525 100 show_decorations:1,
0053e902 101 reverse:1,
498bcd31 102 reverse_output_stage:1,
d7a17cad 103 cherry_pick:1,
adbbb31e 104 cherry_mark:1,
ad3f9a71 105 bisect:1,
ebdc94f3 106 ancestry_path:1,
12da1d1f
TR
107 first_parent_only:1,
108 line_level_traverse:1;
ae563542 109
cd2bdc53
LT
110 /* Diff flags */
111 unsigned int diff:1,
112 full_diff:1,
113 show_root_diff:1,
114 no_commit_id:1,
115 verbose_header:1,
116 ignore_merges:1,
117 combine_merges:1,
118 dense_combined_merges:1,
119 always_show_header:1;
120
121 /* Format info */
91539833 122 unsigned int shown_one:1,
bd1470b8 123 shown_dashes:1,
02e54220 124 show_merge:1,
66b2ed09
JH
125 show_notes:1,
126 show_notes_given:1,
0c37f1fc 127 show_signature:1,
66b2ed09 128 pretty_given:1,
4da45bef 129 abbrev_commit:1,
0c47695a 130 abbrev_commit_given:1,
7fefda5c 131 use_terminator:1,
f4ea32f0 132 missing_newline:1,
9553d2b2
JK
133 date_mode_explicit:1,
134 preserve_subject:1;
8b3dce56 135 unsigned int disable_stdin:1;
4a43d374 136 unsigned int leak_pending:1;
8b3dce56 137
a7b02ccf 138 enum date_mode date_mode;
106d710b 139
cd2bdc53
LT
140 unsigned int abbrev;
141 enum cmit_fmt commit_format;
91539833 142 struct log_info *loginfo;
596524b3 143 int nr, total;
698ce6f8 144 const char *mime_boundary;
108dab28
SB
145 const char *patch_suffix;
146 int numbered_files;
5fe10fe8 147 int reroll_count;
e1a37346 148 char *message_id;
a9080475 149 struct ident_split from_ident;
b079c50e 150 struct string_list *ref_message_ids;
5289c56a 151 int add_signoff;
20ff0680 152 const char *extra_headers;
52883fbd 153 const char *log_reencode;
2d9e4a47 154 const char *subject_prefix;
c112f689 155 int no_inline;
9fa3465d 156 int show_log_size;
0e2913b0 157 struct string_list *mailmap;
cd2bdc53 158
8ecae9b0 159 /* Filter by commit log message */
0843acfd 160 struct grep_opt grep_filter;
8ecae9b0 161
7fefda5c
AS
162 /* Display history graph */
163 struct git_graph *graph;
164
ae563542 165 /* special limits */
d5db6c9e 166 int skip_count;
ae563542
LT
167 int max_count;
168 unsigned long max_age;
169 unsigned long min_age;
ad5aeede
MG
170 int min_parents;
171 int max_parents;
8efdc326 172
cd2bdc53 173 /* diff info for patches and for paths limiting */
c4e05b1a 174 struct diff_options diffopt;
cd2bdc53 175 struct diff_options pruning;
c4e05b1a 176
8860fd42 177 struct reflog_walk_info *reflog_info;
f35f5603 178 struct decoration children;
faf0156b 179 struct decoration merge_simplification;
d0af663e 180 struct decoration treesame;
894a9d33
TR
181
182 /* notes-specific options: which refs to show */
183 struct display_notes_opt notes_opt;
f69c5018
TR
184
185 /* commit counts */
186 int count_left;
187 int count_right;
b388e14b 188 int count_same;
12da1d1f
TR
189
190 /* line level range that we are chasing */
191 struct decoration line_log_data;
53d00b39
TR
192
193 /* copies of the parent lists, for --full-diff display */
194 struct saved_parents *saved_parents_slab;
ae563542
LT
195};
196
8efdc326 197#define REV_TREE_SAME 0
ceff8e7a
LT
198#define REV_TREE_NEW 1 /* Only new files */
199#define REV_TREE_OLD 2 /* Only files removed */
200#define REV_TREE_DIFFERENT 3 /* Mixed changes */
8efdc326 201
ae563542 202/* revision.c */
cdcefbc9 203typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
4dc1db0b 204extern volatile show_early_output_fn_t show_early_output;
8efdc326 205
32962c9b
JH
206struct setup_revision_opt {
207 const char *def;
b4490059 208 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
9ef6aeb0 209 const char *submodule;
6d5b93f2 210 int assume_dashdash;
d5f6b1d7 211 unsigned revarg_opt;
32962c9b
JH
212};
213
db6296a5 214extern void init_revisions(struct rev_info *revs, const char *prefix);
ff5f5f26
MH
215extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
216 struct setup_revision_opt *);
6b61ec05 217extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
ff5f5f26
MH
218 const struct option *options,
219 const char * const usagestr[]);
8e676e8b 220#define REVARG_CANNOT_BE_FILENAME 01
d5f6b1d7 221#define REVARG_COMMITTISH 02
ff5f5f26
MH
222extern int handle_revision_arg(const char *arg, struct rev_info *revs,
223 int flags, unsigned revarg_opt);
5d6f0935 224
bcc0a3ea 225extern void reset_revision_walk(void);
cc0e6c5a 226extern int prepare_revision_walk(struct rev_info *revs);
a4a88b2b 227extern struct commit *get_revision(struct rev_info *revs);
ff5f5f26
MH
228extern char *get_revision_mark(const struct rev_info *revs,
229 const struct commit *commit);
230extern void put_revision_mark(const struct rev_info *revs,
231 const struct commit *commit);
a4a88b2b 232
ae563542
LT
233extern void mark_parents_uninteresting(struct commit *commit);
234extern void mark_tree_uninteresting(struct tree *tree);
235
236struct name_path {
237 struct name_path *up;
238 int elem_len;
239 const char *elem;
240};
241
cf2ab916 242char *path_name(const struct name_path *path, const char *name);
8d2dfc49 243
ff5f5f26
MH
244extern void show_object_with_name(FILE *, struct object *,
245 const struct name_path *, const char *);
91f17516 246
1f1e895f
LT
247extern void add_object(struct object *obj,
248 struct object_array *p,
249 struct name_path *path,
250 const char *name);
251
ff5f5f26
MH
252extern void add_pending_object(struct rev_info *revs,
253 struct object *obj, const char *name);
254extern void add_pending_sha1(struct rev_info *revs,
255 const char *name, const unsigned char *sha1,
256 unsigned int flags);
ae563542 257
3384a2df
JH
258extern void add_head_to_pending(struct rev_info *);
259
252a7c02
LT
260enum commit_action {
261 commit_ignore,
262 commit_show,
263 commit_error
264};
265
ff5f5f26
MH
266extern enum commit_action get_commit_action(struct rev_info *revs,
267 struct commit *commit);
268extern enum commit_action simplify_commit(struct rev_info *revs,
269 struct commit *commit);
252a7c02 270
c7edcae0
BY
271enum rewrite_result {
272 rewrite_one_ok,
273 rewrite_one_noparents,
274 rewrite_one_error
275};
276
277typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
278
279extern int rewrite_parents(struct rev_info *revs, struct commit *commit,
280 rewrite_parent_fn_t rewrite_parent);
53d00b39
TR
281
282/*
283 * Save a copy of the parent list, and return the saved copy. This is
284 * used by the log machinery to retrieve the original parents when
285 * commit->parents has been modified by history simpification.
286 *
287 * You may only call save_parents() once per commit (this is checked
288 * for non-root commits).
289 *
290 * get_saved_parents() will transparently return commit->parents if
291 * history simplification is off.
292 */
293extern void save_parents(struct rev_info *revs, struct commit *commit);
294extern struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
295extern void free_saved_parents(struct rev_info *revs);
296
ae563542 297#endif