Git 1.7.10
[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"
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
ae563542
LT
44struct rev_info {
45 /* Starting list */
46 struct commit_list *commits;
1f1e895f 47 struct object_array pending;
ae563542 48
86ab4906
JH
49 /* Parents of shown commits */
50 struct object_array boundary_commits;
51
281eee47
JH
52 /* The end-points specified by the end user */
53 struct rev_cmdline_info cmdline;
54
ae563542
LT
55 /* Basic information */
56 const char *prefix;
02e54220 57 const char *def;
afe069d1 58 struct pathspec prune_data;
cc243c3c
JH
59 unsigned int early_output:1,
60 ignore_missing:1;
cdcefbc9 61
ae563542
LT
62 /* Traversal flags */
63 unsigned int dense:1,
53b2c823 64 prune:1,
ba1d4505 65 no_walk:1,
3131b713 66 show_all:1,
ae563542 67 remove_empty_trees:1,
9202434c 68 simplify_history:1,
ae563542
LT
69 lifo:1,
70 topo_order:1,
6546b593 71 simplify_merges:1,
78892e32 72 simplify_by_decoration:1,
ae563542
LT
73 tag_objects:1,
74 tree_objects:1,
75 blob_objects:1,
5a48d240 76 verify_objects:1,
d9a83684
LT
77 edge_hint:1,
78 limited:1,
03a9683d 79 unpacked:1,
86ab4906 80 boundary:2,
f69c5018 81 count:1,
74bd9029 82 left_right:1,
60adf7d7
MG
83 left_only:1,
84 right_only:1,
885cf808
AS
85 rewrite_parents:1,
86 print_parents:1,
0f3a290b 87 show_source:1,
d467a525 88 show_decorations:1,
0053e902 89 reverse:1,
498bcd31 90 reverse_output_stage:1,
d7a17cad 91 cherry_pick:1,
adbbb31e 92 cherry_mark:1,
ad3f9a71 93 bisect:1,
ebdc94f3 94 ancestry_path:1,
0053e902 95 first_parent_only:1;
ae563542 96
cd2bdc53
LT
97 /* Diff flags */
98 unsigned int diff:1,
99 full_diff:1,
100 show_root_diff:1,
101 no_commit_id:1,
102 verbose_header:1,
103 ignore_merges:1,
104 combine_merges:1,
105 dense_combined_merges:1,
106 always_show_header:1;
107
108 /* Format info */
91539833 109 unsigned int shown_one:1,
02e54220 110 show_merge:1,
66b2ed09
JH
111 show_notes:1,
112 show_notes_given:1,
0c37f1fc 113 show_signature:1,
66b2ed09 114 pretty_given:1,
4da45bef 115 abbrev_commit:1,
0c47695a 116 abbrev_commit_given:1,
7fefda5c 117 use_terminator:1,
f4ea32f0 118 missing_newline:1,
9553d2b2
JK
119 date_mode_explicit:1,
120 preserve_subject:1;
8b3dce56 121 unsigned int disable_stdin:1;
4a43d374 122 unsigned int leak_pending:1;
8b3dce56 123
a7b02ccf 124 enum date_mode date_mode;
106d710b 125
cd2bdc53
LT
126 unsigned int abbrev;
127 enum cmit_fmt commit_format;
91539833 128 struct log_info *loginfo;
596524b3 129 int nr, total;
698ce6f8 130 const char *mime_boundary;
108dab28
SB
131 const char *patch_suffix;
132 int numbered_files;
e1a37346 133 char *message_id;
b079c50e 134 struct string_list *ref_message_ids;
cf2251b6 135 const char *add_signoff;
20ff0680 136 const char *extra_headers;
52883fbd 137 const char *log_reencode;
2d9e4a47 138 const char *subject_prefix;
c112f689 139 int no_inline;
9fa3465d 140 int show_log_size;
cd2bdc53 141
8ecae9b0 142 /* Filter by commit log message */
0843acfd 143 struct grep_opt grep_filter;
8ecae9b0 144
7fefda5c
AS
145 /* Display history graph */
146 struct git_graph *graph;
147
ae563542 148 /* special limits */
d5db6c9e 149 int skip_count;
ae563542
LT
150 int max_count;
151 unsigned long max_age;
152 unsigned long min_age;
ad5aeede
MG
153 int min_parents;
154 int max_parents;
8efdc326 155
cd2bdc53 156 /* diff info for patches and for paths limiting */
c4e05b1a 157 struct diff_options diffopt;
cd2bdc53 158 struct diff_options pruning;
c4e05b1a 159
8860fd42 160 struct reflog_walk_info *reflog_info;
f35f5603 161 struct decoration children;
faf0156b 162 struct decoration merge_simplification;
894a9d33
TR
163
164 /* notes-specific options: which refs to show */
165 struct display_notes_opt notes_opt;
f69c5018
TR
166
167 /* commit counts */
168 int count_left;
169 int count_right;
b388e14b 170 int count_same;
ae563542
LT
171};
172
8efdc326 173#define REV_TREE_SAME 0
ceff8e7a
LT
174#define REV_TREE_NEW 1 /* Only new files */
175#define REV_TREE_OLD 2 /* Only files removed */
176#define REV_TREE_DIFFERENT 3 /* Mixed changes */
8efdc326 177
ae563542 178/* revision.c */
cdcefbc9 179typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
4dc1db0b 180extern volatile show_early_output_fn_t show_early_output;
8efdc326 181
32962c9b
JH
182struct setup_revision_opt {
183 const char *def;
b4490059 184 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
9ef6aeb0 185 const char *submodule;
32962c9b
JH
186};
187
db6296a5 188extern void init_revisions(struct rev_info *revs, const char *prefix);
32962c9b 189extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
6b61ec05
PH
190extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
191 const struct option *options,
192 const char * const usagestr[]);
5d6f0935
JH
193extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
194
cc0e6c5a 195extern int prepare_revision_walk(struct rev_info *revs);
a4a88b2b 196extern struct commit *get_revision(struct rev_info *revs);
1df2d656 197extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
b1b47554 198extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
a4a88b2b 199
ae563542
LT
200extern void mark_parents_uninteresting(struct commit *commit);
201extern void mark_tree_uninteresting(struct tree *tree);
202
203struct name_path {
204 struct name_path *up;
205 int elem_len;
206 const char *elem;
207};
208
cf2ab916 209char *path_name(const struct name_path *path, const char *name);
8d2dfc49 210
91f17516
JH
211extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
212
1f1e895f
LT
213extern void add_object(struct object *obj,
214 struct object_array *p,
215 struct name_path *path,
216 const char *name);
217
218extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
26c3177e 219extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
ae563542 220
3384a2df
JH
221extern void add_head_to_pending(struct rev_info *);
222
252a7c02
LT
223enum commit_action {
224 commit_ignore,
225 commit_show,
226 commit_error
227};
228
beb5af43 229extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
252a7c02
LT
230extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
231
ae563542 232#endif