merge-recursive: introduce merge_options
[git/spearce.git] / revision.h
blob91f194478bb91d381ab2b2440215144d8bb8d18d
1 #ifndef REVISION_H
2 #define REVISION_H
4 #include "parse-options.h"
5 #include "grep.h"
7 #define SEEN (1u<<0)
8 #define UNINTERESTING (1u<<1)
9 #define TREESAME (1u<<2)
10 #define SHOWN (1u<<3)
11 #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
12 #define BOUNDARY (1u<<5)
13 #define CHILD_SHOWN (1u<<6)
14 #define ADDED (1u<<7) /* Parents already parsed and added? */
15 #define SYMMETRIC_LEFT (1u<<8)
16 #define ALL_REV_FLAGS ((1u<<9)-1)
18 struct rev_info;
19 struct log_info;
21 struct rev_info {
22 /* Starting list */
23 struct commit_list *commits;
24 struct object_array pending;
26 /* Parents of shown commits */
27 struct object_array boundary_commits;
29 /* Basic information */
30 const char *prefix;
31 const char *def;
32 void *prune_data;
33 unsigned int early_output;
35 /* Traversal flags */
36 unsigned int dense:1,
37 prune:1,
38 no_merges:1,
39 no_walk:1,
40 show_all:1,
41 remove_empty_trees:1,
42 simplify_history:1,
43 lifo:1,
44 topo_order:1,
45 tag_objects:1,
46 tree_objects:1,
47 blob_objects:1,
48 edge_hint:1,
49 limited:1,
50 unpacked:1, /* see also ignore_packed below */
51 boundary:2,
52 left_right:1,
53 rewrite_parents:1,
54 print_parents:1,
55 reverse:1,
56 cherry_pick:1,
57 first_parent_only:1;
59 /* Diff flags */
60 unsigned int diff:1,
61 full_diff:1,
62 show_root_diff:1,
63 no_commit_id:1,
64 verbose_header:1,
65 ignore_merges:1,
66 combine_merges:1,
67 dense_combined_merges:1,
68 always_show_header:1;
70 /* Format info */
71 unsigned int shown_one:1,
72 show_merge:1,
73 abbrev_commit:1,
74 use_terminator:1,
75 missing_newline:1;
76 enum date_mode date_mode;
78 const char **ignore_packed; /* pretend objects in these are unpacked */
79 int num_ignore_packed;
81 unsigned int abbrev;
82 enum cmit_fmt commit_format;
83 struct log_info *loginfo;
84 int nr, total;
85 const char *mime_boundary;
86 char *message_id;
87 const char *ref_message_id;
88 const char *add_signoff;
89 const char *extra_headers;
90 const char *log_reencode;
91 const char *subject_prefix;
92 int no_inline;
93 int show_log_size;
95 /* Filter by commit log message */
96 struct grep_opt grep_filter;
98 /* Display history graph */
99 struct git_graph *graph;
101 /* special limits */
102 int skip_count;
103 int max_count;
104 unsigned long max_age;
105 unsigned long min_age;
107 /* diff info for patches and for paths limiting */
108 struct diff_options diffopt;
109 struct diff_options pruning;
111 struct reflog_walk_info *reflog_info;
112 struct decoration children;
115 #define REV_TREE_SAME 0
116 #define REV_TREE_NEW 1
117 #define REV_TREE_DIFFERENT 2
119 /* revision.c */
120 void read_revisions_from_stdin(struct rev_info *revs);
122 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
123 extern volatile show_early_output_fn_t show_early_output;
125 extern void init_revisions(struct rev_info *revs, const char *prefix);
126 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
127 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
128 const struct option *options,
129 const char * const usagestr[]);
130 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
132 extern int prepare_revision_walk(struct rev_info *revs);
133 extern struct commit *get_revision(struct rev_info *revs);
135 extern void mark_parents_uninteresting(struct commit *commit);
136 extern void mark_tree_uninteresting(struct tree *tree);
138 struct name_path {
139 struct name_path *up;
140 int elem_len;
141 const char *elem;
144 extern void add_object(struct object *obj,
145 struct object_array *p,
146 struct name_path *path,
147 const char *name);
149 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
151 extern void add_head_to_pending(struct rev_info *);
153 enum commit_action {
154 commit_ignore,
155 commit_show,
156 commit_error
159 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
161 #endif