Extract helper bits from c-merge-recursive work
[git/jnareb-git/bp-gitweb.git] / revision.h
blobe23ec8f45a3b635d83f662e4de5d671e41f37919
1 #ifndef REVISION_H
2 #define REVISION_H
4 #define SEEN (1u<<0)
5 #define UNINTERESTING (1u<<1)
6 #define TREECHANGE (1u<<2)
7 #define SHOWN (1u<<3)
8 #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
9 #define BOUNDARY (1u<<5)
10 #define BOUNDARY_SHOW (1u<<6)
11 #define ADDED (1u<<7) /* Parents already parsed and added? */
13 struct rev_info;
14 struct log_info;
16 typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
18 struct rev_info {
19 /* Starting list */
20 struct commit_list *commits;
21 struct object_array pending;
23 /* Basic information */
24 const char *prefix;
25 void *prune_data;
26 prune_fn_t *prune_fn;
28 /* Traversal flags */
29 unsigned int dense:1,
30 no_merges:1,
31 no_walk:1,
32 remove_empty_trees:1,
33 simplify_history:1,
34 lifo:1,
35 topo_order:1,
36 tag_objects:1,
37 tree_objects:1,
38 blob_objects:1,
39 edge_hint:1,
40 limited:1,
41 unpacked:1,
42 boundary:1,
43 parents:1;
45 /* Diff flags */
46 unsigned int diff:1,
47 full_diff:1,
48 show_root_diff:1,
49 no_commit_id:1,
50 verbose_header:1,
51 ignore_merges:1,
52 combine_merges:1,
53 dense_combined_merges:1,
54 always_show_header:1;
56 /* Format info */
57 unsigned int shown_one:1,
58 abbrev_commit:1;
59 unsigned int abbrev;
60 enum cmit_fmt commit_format;
61 struct log_info *loginfo;
62 int nr, total;
63 const char *mime_boundary;
64 const char *message_id;
65 const char *ref_message_id;
66 const char *add_signoff;
67 const char *extra_headers;
69 /* special limits */
70 int max_count;
71 unsigned long max_age;
72 unsigned long min_age;
74 /* diff info for patches and for paths limiting */
75 struct diff_options diffopt;
76 struct diff_options pruning;
78 topo_sort_set_fn_t topo_setter;
79 topo_sort_get_fn_t topo_getter;
82 #define REV_TREE_SAME 0
83 #define REV_TREE_NEW 1
84 #define REV_TREE_DIFFERENT 2
86 /* revision.c */
87 extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1);
88 extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2);
90 extern void init_revisions(struct rev_info *revs);
91 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
92 extern void prepare_revision_walk(struct rev_info *revs);
93 extern struct commit *get_revision(struct rev_info *revs);
95 extern void mark_parents_uninteresting(struct commit *commit);
96 extern void mark_tree_uninteresting(struct tree *tree);
98 struct name_path {
99 struct name_path *up;
100 int elem_len;
101 const char *elem;
104 extern void add_object(struct object *obj,
105 struct object_array *p,
106 struct name_path *path,
107 const char *name);
109 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
111 #endif