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