Merge branch 'kb/ancestry-path-threedots' into maint
[git/mjg.git] / revision.h
blob878a5556fd5e1c82f0fc35e1669e33623397ceeb
1 #ifndef REVISION_H
2 #define REVISION_H
4 #include "parse-options.h"
5 #include "grep.h"
6 #include "notes.h"
8 #define SEEN (1u<<0)
9 #define UNINTERESTING (1u<<1)
10 #define TREESAME (1u<<2)
11 #define SHOWN (1u<<3)
12 #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
13 #define BOUNDARY (1u<<5)
14 #define CHILD_SHOWN (1u<<6)
15 #define ADDED (1u<<7) /* Parents already parsed and added? */
16 #define SYMMETRIC_LEFT (1u<<8)
17 #define PATCHSAME (1u<<9)
18 #define ALL_REV_FLAGS ((1u<<10)-1)
20 #define DECORATE_SHORT_REFS 1
21 #define DECORATE_FULL_REFS 2
23 struct rev_info;
24 struct log_info;
25 struct string_list;
27 struct 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_MERGE_BASE,
39 REV_CMD_REV
40 } whence;
41 unsigned flags;
42 } *rev;
45 #define REVISION_WALK_WALK 0
46 #define REVISION_WALK_NO_WALK_SORTED 1
47 #define REVISION_WALK_NO_WALK_UNSORTED 2
49 struct rev_info {
50 /* Starting list */
51 struct commit_list *commits;
52 struct object_array pending;
54 /* Parents of shown commits */
55 struct object_array boundary_commits;
57 /* The end-points specified by the end user */
58 struct rev_cmdline_info cmdline;
60 /* Basic information */
61 const char *prefix;
62 const char *def;
63 struct pathspec prune_data;
64 unsigned int early_output:1,
65 ignore_missing:1;
67 /* Traversal flags */
68 unsigned int dense:1,
69 prune:1,
70 no_walk:2,
71 show_all:1,
72 remove_empty_trees:1,
73 simplify_history:1,
74 lifo:1,
75 topo_order:1,
76 simplify_merges:1,
77 simplify_by_decoration:1,
78 tag_objects:1,
79 tree_objects:1,
80 blob_objects:1,
81 verify_objects:1,
82 edge_hint:1,
83 limited:1,
84 unpacked:1,
85 boundary:2,
86 count:1,
87 left_right:1,
88 left_only:1,
89 right_only:1,
90 rewrite_parents:1,
91 print_parents:1,
92 show_source:1,
93 show_decorations:1,
94 reverse:1,
95 reverse_output_stage:1,
96 cherry_pick:1,
97 cherry_mark:1,
98 bisect:1,
99 ancestry_path:1,
100 first_parent_only:1;
102 /* Diff flags */
103 unsigned int diff:1,
104 full_diff:1,
105 show_root_diff:1,
106 no_commit_id:1,
107 verbose_header:1,
108 ignore_merges:1,
109 combine_merges:1,
110 dense_combined_merges:1,
111 always_show_header:1;
113 /* Format info */
114 unsigned int shown_one:1,
115 shown_dashes:1,
116 show_merge:1,
117 show_notes:1,
118 show_notes_given:1,
119 show_signature:1,
120 pretty_given:1,
121 abbrev_commit:1,
122 abbrev_commit_given:1,
123 use_terminator:1,
124 missing_newline:1,
125 date_mode_explicit:1,
126 preserve_subject:1;
127 unsigned int disable_stdin:1;
128 unsigned int leak_pending:1;
130 enum date_mode date_mode;
132 unsigned int abbrev;
133 enum cmit_fmt commit_format;
134 struct log_info *loginfo;
135 int nr, total;
136 const char *mime_boundary;
137 const char *patch_suffix;
138 int numbered_files;
139 int reroll_count;
140 char *message_id;
141 struct string_list *ref_message_ids;
142 int add_signoff;
143 const char *extra_headers;
144 const char *log_reencode;
145 const char *subject_prefix;
146 int no_inline;
147 int show_log_size;
148 struct string_list *mailmap;
150 /* Filter by commit log message */
151 struct grep_opt grep_filter;
153 /* Display history graph */
154 struct git_graph *graph;
156 /* special limits */
157 int skip_count;
158 int max_count;
159 unsigned long max_age;
160 unsigned long min_age;
161 int min_parents;
162 int max_parents;
164 /* diff info for patches and for paths limiting */
165 struct diff_options diffopt;
166 struct diff_options pruning;
168 struct reflog_walk_info *reflog_info;
169 struct decoration children;
170 struct decoration merge_simplification;
172 /* notes-specific options: which refs to show */
173 struct display_notes_opt notes_opt;
175 /* commit counts */
176 int count_left;
177 int count_right;
178 int count_same;
181 #define REV_TREE_SAME 0
182 #define REV_TREE_NEW 1 /* Only new files */
183 #define REV_TREE_OLD 2 /* Only files removed */
184 #define REV_TREE_DIFFERENT 3 /* Mixed changes */
186 /* revision.c */
187 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
188 extern volatile show_early_output_fn_t show_early_output;
190 struct setup_revision_opt {
191 const char *def;
192 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
193 const char *submodule;
194 int assume_dashdash;
195 unsigned revarg_opt;
198 extern void init_revisions(struct rev_info *revs, const char *prefix);
199 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
200 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
201 const struct option *options,
202 const char * const usagestr[]);
203 #define REVARG_CANNOT_BE_FILENAME 01
204 #define REVARG_COMMITTISH 02
205 extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
207 extern void reset_revision_walk(void);
208 extern int prepare_revision_walk(struct rev_info *revs);
209 extern struct commit *get_revision(struct rev_info *revs);
210 extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
211 extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
213 extern void mark_parents_uninteresting(struct commit *commit);
214 extern void mark_tree_uninteresting(struct tree *tree);
216 struct name_path {
217 struct name_path *up;
218 int elem_len;
219 const char *elem;
222 char *path_name(const struct name_path *path, const char *name);
224 extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
226 extern void add_object(struct object *obj,
227 struct object_array *p,
228 struct name_path *path,
229 const char *name);
231 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
232 extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
234 extern void add_head_to_pending(struct rev_info *);
236 enum commit_action {
237 commit_ignore,
238 commit_show,
239 commit_error
242 extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
243 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
245 #endif