Merge branch 'maint'
[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)
e358f3c3 17#define ALL_REV_FLAGS ((1u<<9)-1)
ae563542 18
33e7018c
LH
19#define DECORATE_SHORT_REFS 1
20#define DECORATE_FULL_REFS 2
21
8efdc326 22struct rev_info;
91539833 23struct log_info;
894a9d33 24struct string_list;
8efdc326 25
ae563542
LT
26struct rev_info {
27 /* Starting list */
28 struct commit_list *commits;
1f1e895f 29 struct object_array pending;
ae563542 30
86ab4906
JH
31 /* Parents of shown commits */
32 struct object_array boundary_commits;
33
ae563542
LT
34 /* Basic information */
35 const char *prefix;
02e54220 36 const char *def;
8efdc326 37 void *prune_data;
cdcefbc9
LT
38 unsigned int early_output;
39
ae563542
LT
40 /* Traversal flags */
41 unsigned int dense:1,
53b2c823 42 prune:1,
765ac8ec 43 no_merges:1,
b8e8db28 44 merges_only:1,
ba1d4505 45 no_walk:1,
3131b713 46 show_all:1,
ae563542 47 remove_empty_trees:1,
9202434c 48 simplify_history:1,
ae563542
LT
49 lifo:1,
50 topo_order:1,
6546b593 51 simplify_merges:1,
78892e32 52 simplify_by_decoration:1,
ae563542
LT
53 tag_objects:1,
54 tree_objects:1,
55 blob_objects:1,
d9a83684
LT
56 edge_hint:1,
57 limited:1,
03a9683d 58 unpacked:1,
86ab4906 59 boundary:2,
74bd9029 60 left_right:1,
885cf808
AS
61 rewrite_parents:1,
62 print_parents:1,
0f3a290b 63 show_source:1,
d467a525 64 show_decorations:1,
0053e902 65 reverse:1,
498bcd31 66 reverse_output_stage:1,
d7a17cad 67 cherry_pick:1,
ad3f9a71 68 bisect:1,
0053e902 69 first_parent_only:1;
ae563542 70
cd2bdc53
LT
71 /* Diff flags */
72 unsigned int diff:1,
73 full_diff:1,
74 show_root_diff:1,
75 no_commit_id:1,
76 verbose_header:1,
77 ignore_merges:1,
78 combine_merges:1,
79 dense_combined_merges:1,
80 always_show_header:1;
81
82 /* Format info */
91539833 83 unsigned int shown_one:1,
02e54220 84 show_merge:1,
66b2ed09
JH
85 show_notes:1,
86 show_notes_given:1,
87 pretty_given:1,
4da45bef 88 abbrev_commit:1,
7fefda5c 89 use_terminator:1,
f4ea32f0
JK
90 missing_newline:1,
91 date_mode_explicit:1;
8b3dce56
JH
92 unsigned int disable_stdin:1;
93
a7b02ccf 94 enum date_mode date_mode;
106d710b 95
cd2bdc53
LT
96 unsigned int abbrev;
97 enum cmit_fmt commit_format;
91539833 98 struct log_info *loginfo;
596524b3 99 int nr, total;
698ce6f8 100 const char *mime_boundary;
108dab28
SB
101 const char *patch_suffix;
102 int numbered_files;
e1a37346 103 char *message_id;
b079c50e 104 struct string_list *ref_message_ids;
cf2251b6 105 const char *add_signoff;
20ff0680 106 const char *extra_headers;
52883fbd 107 const char *log_reencode;
2d9e4a47 108 const char *subject_prefix;
c112f689 109 int no_inline;
9fa3465d 110 int show_log_size;
cd2bdc53 111
8ecae9b0 112 /* Filter by commit log message */
0843acfd 113 struct grep_opt grep_filter;
8ecae9b0 114
7fefda5c
AS
115 /* Display history graph */
116 struct git_graph *graph;
117
ae563542 118 /* special limits */
d5db6c9e 119 int skip_count;
ae563542
LT
120 int max_count;
121 unsigned long max_age;
122 unsigned long min_age;
8efdc326 123
cd2bdc53 124 /* diff info for patches and for paths limiting */
c4e05b1a 125 struct diff_options diffopt;
cd2bdc53 126 struct diff_options pruning;
c4e05b1a 127
8860fd42 128 struct reflog_walk_info *reflog_info;
f35f5603 129 struct decoration children;
faf0156b 130 struct decoration merge_simplification;
894a9d33
TR
131
132 /* notes-specific options: which refs to show */
133 struct display_notes_opt notes_opt;
ae563542
LT
134};
135
8efdc326 136#define REV_TREE_SAME 0
ceff8e7a
LT
137#define REV_TREE_NEW 1 /* Only new files */
138#define REV_TREE_OLD 2 /* Only files removed */
139#define REV_TREE_DIFFERENT 3 /* Mixed changes */
8efdc326 140
ae563542 141/* revision.c */
cdcefbc9 142typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
4dc1db0b 143extern volatile show_early_output_fn_t show_early_output;
8efdc326 144
32962c9b
JH
145struct setup_revision_opt {
146 const char *def;
b4490059 147 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
32962c9b
JH
148};
149
db6296a5 150extern void init_revisions(struct rev_info *revs, const char *prefix);
32962c9b 151extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
6b61ec05
PH
152extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
153 const struct option *options,
154 const char * const usagestr[]);
5d6f0935
JH
155extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
156
cc0e6c5a 157extern int prepare_revision_walk(struct rev_info *revs);
a4a88b2b
LT
158extern struct commit *get_revision(struct rev_info *revs);
159
ae563542
LT
160extern void mark_parents_uninteresting(struct commit *commit);
161extern void mark_tree_uninteresting(struct tree *tree);
162
163struct name_path {
164 struct name_path *up;
165 int elem_len;
166 const char *elem;
167};
168
cf2ab916 169char *path_name(const struct name_path *path, const char *name);
8d2dfc49 170
1f1e895f
LT
171extern void add_object(struct object *obj,
172 struct object_array *p,
173 struct name_path *path,
174 const char *name);
175
176extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
ae563542 177
3384a2df
JH
178extern void add_head_to_pending(struct rev_info *);
179
252a7c02
LT
180enum commit_action {
181 commit_ignore,
182 commit_show,
183 commit_error
184};
185
beb5af43 186extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
252a7c02
LT
187extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
188
ae563542 189#endif