]> git.ipfire.org Git - thirdparty/git.git/blame - revision.h
Update draft release notes to 1.6.1
[thirdparty/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,
ae563542
LT
46 tag_objects:1,
47 tree_objects:1,
48 blob_objects:1,
d9a83684
LT
49 edge_hint:1,
50 limited:1,
106d710b 51 unpacked:1, /* see also ignore_packed below */
86ab4906 52 boundary:2,
74bd9029 53 left_right:1,
885cf808
AS
54 rewrite_parents:1,
55 print_parents:1,
0053e902 56 reverse:1,
498bcd31 57 reverse_output_stage:1,
d7a17cad 58 cherry_pick:1,
0053e902 59 first_parent_only:1;
ae563542 60
cd2bdc53
LT
61 /* Diff flags */
62 unsigned int diff:1,
63 full_diff:1,
64 show_root_diff:1,
65 no_commit_id:1,
66 verbose_header:1,
67 ignore_merges:1,
68 combine_merges:1,
69 dense_combined_merges:1,
70 always_show_header:1;
71
72 /* Format info */
91539833 73 unsigned int shown_one:1,
02e54220 74 show_merge:1,
4da45bef 75 abbrev_commit:1,
7fefda5c
AS
76 use_terminator:1,
77 missing_newline:1;
a7b02ccf 78 enum date_mode date_mode;
106d710b
JH
79
80 const char **ignore_packed; /* pretend objects in these are unpacked */
81 int num_ignore_packed;
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;
e1a37346 88 char *message_id;
d1566f78 89 const char *ref_message_id;
cf2251b6 90 const char *add_signoff;
20ff0680 91 const char *extra_headers;
52883fbd 92 const char *log_reencode;
2d9e4a47 93 const char *subject_prefix;
c112f689 94 int no_inline;
9fa3465d 95 int show_log_size;
cd2bdc53 96
8ecae9b0 97 /* Filter by commit log message */
0843acfd 98 struct grep_opt grep_filter;
8ecae9b0 99
7fefda5c
AS
100 /* Display history graph */
101 struct git_graph *graph;
102
ae563542 103 /* special limits */
d5db6c9e 104 int skip_count;
ae563542
LT
105 int max_count;
106 unsigned long max_age;
107 unsigned long min_age;
8efdc326 108
cd2bdc53 109 /* diff info for patches and for paths limiting */
c4e05b1a 110 struct diff_options diffopt;
cd2bdc53 111 struct diff_options pruning;
c4e05b1a 112
8860fd42 113 struct reflog_walk_info *reflog_info;
f35f5603 114 struct decoration children;
faf0156b 115 struct decoration merge_simplification;
ae563542
LT
116};
117
8efdc326
FK
118#define REV_TREE_SAME 0
119#define REV_TREE_NEW 1
120#define REV_TREE_DIFFERENT 2
121
ae563542 122/* revision.c */
1fc561d1
AB
123void read_revisions_from_stdin(struct rev_info *revs);
124
cdcefbc9 125typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
4dc1db0b 126extern volatile show_early_output_fn_t show_early_output;
8efdc326 127
db6296a5 128extern void init_revisions(struct rev_info *revs, const char *prefix);
a4a88b2b 129extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
6b61ec05
PH
130extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
131 const struct option *options,
132 const char * const usagestr[]);
5d6f0935
JH
133extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
134
cc0e6c5a 135extern int prepare_revision_walk(struct rev_info *revs);
a4a88b2b
LT
136extern struct commit *get_revision(struct rev_info *revs);
137
ae563542
LT
138extern void mark_parents_uninteresting(struct commit *commit);
139extern void mark_tree_uninteresting(struct tree *tree);
140
141struct name_path {
142 struct name_path *up;
143 int elem_len;
144 const char *elem;
145};
146
1f1e895f
LT
147extern void add_object(struct object *obj,
148 struct object_array *p,
149 struct name_path *path,
150 const char *name);
151
152extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
ae563542 153
3384a2df
JH
154extern void add_head_to_pending(struct rev_info *);
155
252a7c02
LT
156enum commit_action {
157 commit_ignore,
158 commit_show,
159 commit_error
160};
161
162extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
163
ae563542 164#endif