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