]> git.ipfire.org Git - thirdparty/git.git/blame - revision.h
Merge GIT 1.5.0.4
[thirdparty/git.git] / revision.h
CommitLineData
ae563542
LT
1#ifndef REVISION_H
2#define REVISION_H
3
4#define SEEN (1u<<0)
5#define UNINTERESTING (1u<<1)
a4a88b2b 6#define TREECHANGE (1u<<2)
765ac8ec 7#define SHOWN (1u<<3)
7ae0b0cb 8#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
384e99a4 9#define BOUNDARY (1u<<5)
2b064697 10#define CHILD_SHOWN (1u<<6)
1b65a5aa 11#define ADDED (1u<<7) /* Parents already parsed and added? */
577ed5c2 12#define SYMMETRIC_LEFT (1u<<8)
ae563542 13
8efdc326 14struct rev_info;
91539833 15struct log_info;
8efdc326
FK
16
17typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
18
ae563542
LT
19struct rev_info {
20 /* Starting list */
21 struct commit_list *commits;
1f1e895f 22 struct object_array pending;
ae563542 23
86ab4906
JH
24 /* Parents of shown commits */
25 struct object_array boundary_commits;
26
ae563542
LT
27 /* Basic information */
28 const char *prefix;
8efdc326
FK
29 void *prune_data;
30 prune_fn_t *prune_fn;
ae563542
LT
31
32 /* Traversal flags */
33 unsigned int dense:1,
765ac8ec 34 no_merges:1,
ba1d4505 35 no_walk:1,
ae563542 36 remove_empty_trees:1,
9202434c 37 simplify_history:1,
ae563542
LT
38 lifo:1,
39 topo_order:1,
40 tag_objects:1,
41 tree_objects:1,
42 blob_objects:1,
d9a83684
LT
43 edge_hint:1,
44 limited:1,
106d710b 45 unpacked:1, /* see also ignore_packed below */
86ab4906 46 boundary:2,
74bd9029 47 left_right:1,
9c5e66e9 48 parents:1,
86ab4906 49 reverse:1;
ae563542 50
cd2bdc53
LT
51 /* Diff flags */
52 unsigned int diff:1,
53 full_diff:1,
54 show_root_diff:1,
55 no_commit_id:1,
56 verbose_header:1,
57 ignore_merges:1,
58 combine_merges:1,
59 dense_combined_merges:1,
60 always_show_header:1;
61
62 /* Format info */
91539833 63 unsigned int shown_one:1,
3dfb9278
JF
64 abbrev_commit:1,
65 relative_date:1;
106d710b
JH
66
67 const char **ignore_packed; /* pretend objects in these are unpacked */
68 int num_ignore_packed;
69
cd2bdc53
LT
70 unsigned int abbrev;
71 enum cmit_fmt commit_format;
91539833 72 struct log_info *loginfo;
596524b3 73 int nr, total;
698ce6f8 74 const char *mime_boundary;
d1566f78
JT
75 const char *message_id;
76 const char *ref_message_id;
cf2251b6 77 const char *add_signoff;
20ff0680 78 const char *extra_headers;
52883fbd 79 const char *log_reencode;
c112f689 80 int no_inline;
cd2bdc53 81
8ecae9b0 82 /* Filter by commit log message */
2d10c555 83 struct grep_opt *grep_filter;
8ecae9b0 84
ae563542 85 /* special limits */
d5db6c9e 86 int skip_count;
ae563542
LT
87 int max_count;
88 unsigned long max_age;
89 unsigned long min_age;
8efdc326 90
cd2bdc53 91 /* diff info for patches and for paths limiting */
c4e05b1a 92 struct diff_options diffopt;
cd2bdc53 93 struct diff_options pruning;
c4e05b1a 94
8efdc326
FK
95 topo_sort_set_fn_t topo_setter;
96 topo_sort_get_fn_t topo_getter;
8860fd42
JS
97
98 struct reflog_walk_info *reflog_info;
ae563542
LT
99};
100
8efdc326
FK
101#define REV_TREE_SAME 0
102#define REV_TREE_NEW 1
103#define REV_TREE_DIFFERENT 2
104
ae563542 105/* revision.c */
c4e05b1a
JH
106extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1);
107extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2);
8efdc326 108
db6296a5 109extern void init_revisions(struct rev_info *revs, const char *prefix);
a4a88b2b 110extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
5d6f0935
JH
111extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
112
a4a88b2b
LT
113extern void prepare_revision_walk(struct rev_info *revs);
114extern struct commit *get_revision(struct rev_info *revs);
115
ae563542
LT
116extern void mark_parents_uninteresting(struct commit *commit);
117extern void mark_tree_uninteresting(struct tree *tree);
118
119struct name_path {
120 struct name_path *up;
121 int elem_len;
122 const char *elem;
123};
124
1f1e895f
LT
125extern void add_object(struct object *obj,
126 struct object_array *p,
127 struct name_path *path,
128 const char *name);
129
130extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
ae563542
LT
131
132#endif