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