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