merge-file --diff3: add a label for ancestor
[git/kirr.git] / revision.h
bloba14deefc252bd641fba5e16f7859b4a985a72578
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 #define DECORATE_SHORT_REFS 1
19 #define DECORATE_FULL_REFS 2
21 struct rev_info;
22 struct log_info;
24 struct rev_info {
25 /* Starting list */
26 struct commit_list *commits;
27 struct object_array pending;
29 /* Parents of shown commits */
30 struct object_array boundary_commits;
32 /* Basic information */
33 const char *prefix;
34 const char *def;
35 void *prune_data;
36 unsigned int early_output;
38 /* Traversal flags */
39 unsigned int dense:1,
40 prune:1,
41 no_merges:1,
42 merges_only:1,
43 no_walk:1,
44 show_all:1,
45 remove_empty_trees:1,
46 simplify_history:1,
47 lifo:1,
48 topo_order:1,
49 simplify_merges:1,
50 simplify_by_decoration:1,
51 tag_objects:1,
52 tree_objects:1,
53 blob_objects:1,
54 edge_hint:1,
55 limited:1,
56 unpacked:1,
57 boundary:2,
58 left_right:1,
59 rewrite_parents:1,
60 print_parents:1,
61 show_source:1,
62 show_decorations:1,
63 reverse:1,
64 reverse_output_stage:1,
65 cherry_pick:1,
66 bisect:1,
67 first_parent_only:1;
69 /* Diff flags */
70 unsigned int diff:1,
71 full_diff:1,
72 show_root_diff:1,
73 no_commit_id:1,
74 verbose_header:1,
75 ignore_merges:1,
76 combine_merges:1,
77 dense_combined_merges:1,
78 always_show_header:1;
80 /* Format info */
81 unsigned int shown_one:1,
82 show_merge:1,
83 show_notes:1,
84 show_notes_given:1,
85 pretty_given:1,
86 abbrev_commit:1,
87 use_terminator:1,
88 missing_newline:1,
89 date_mode_explicit:1;
90 unsigned int disable_stdin:1;
92 enum date_mode date_mode;
94 unsigned int abbrev;
95 enum cmit_fmt commit_format;
96 struct log_info *loginfo;
97 int nr, total;
98 const char *mime_boundary;
99 const char *patch_suffix;
100 int numbered_files;
101 char *message_id;
102 struct string_list *ref_message_ids;
103 const char *add_signoff;
104 const char *extra_headers;
105 const char *log_reencode;
106 const char *subject_prefix;
107 int no_inline;
108 int show_log_size;
110 /* Filter by commit log message */
111 struct grep_opt grep_filter;
113 /* Display history graph */
114 struct git_graph *graph;
116 /* special limits */
117 int skip_count;
118 int max_count;
119 unsigned long max_age;
120 unsigned long min_age;
122 /* diff info for patches and for paths limiting */
123 struct diff_options diffopt;
124 struct diff_options pruning;
126 struct reflog_walk_info *reflog_info;
127 struct decoration children;
128 struct decoration merge_simplification;
131 #define REV_TREE_SAME 0
132 #define REV_TREE_NEW 1 /* Only new files */
133 #define REV_TREE_OLD 2 /* Only files removed */
134 #define REV_TREE_DIFFERENT 3 /* Mixed changes */
136 /* revision.c */
137 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
138 extern volatile show_early_output_fn_t show_early_output;
140 extern void init_revisions(struct rev_info *revs, const char *prefix);
141 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
142 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
143 const struct option *options,
144 const char * const usagestr[]);
145 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
147 extern int prepare_revision_walk(struct rev_info *revs);
148 extern struct commit *get_revision(struct rev_info *revs);
150 extern void mark_parents_uninteresting(struct commit *commit);
151 extern void mark_tree_uninteresting(struct tree *tree);
153 struct name_path {
154 struct name_path *up;
155 int elem_len;
156 const char *elem;
159 char *path_name(const struct name_path *path, const char *name);
161 extern void add_object(struct object *obj,
162 struct object_array *p,
163 struct name_path *path,
164 const char *name);
166 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
168 extern void add_head_to_pending(struct rev_info *);
170 enum commit_action {
171 commit_ignore,
172 commit_show,
173 commit_error
176 extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
177 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
179 #endif