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