revision: Turn off history simplification in --ancestry-path mode
[git/jrn.git] / revision.h
blob855464f1441654c1938135d6a99b247c70826146
1 #ifndef REVISION_H
2 #define REVISION_H
4 #include "parse-options.h"
5 #include "grep.h"
6 #include "notes.h"
8 #define SEEN (1u<<0)
9 #define UNINTERESTING (1u<<1)
10 #define TREESAME (1u<<2)
11 #define SHOWN (1u<<3)
12 #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
13 #define BOUNDARY (1u<<5)
14 #define CHILD_SHOWN (1u<<6)
15 #define ADDED (1u<<7) /* Parents already parsed and added? */
16 #define SYMMETRIC_LEFT (1u<<8)
17 #define ALL_REV_FLAGS ((1u<<9)-1)
19 #define DECORATE_SHORT_REFS 1
20 #define DECORATE_FULL_REFS 2
22 struct rev_info;
23 struct log_info;
24 struct string_list;
26 struct rev_info {
27 /* Starting list */
28 struct commit_list *commits;
29 struct object_array pending;
31 /* Parents of shown commits */
32 struct object_array boundary_commits;
34 /* Basic information */
35 const char *prefix;
36 const char *def;
37 void *prune_data;
38 unsigned int early_output;
40 /* Traversal flags */
41 unsigned int dense:1,
42 prune:1,
43 no_merges:1,
44 merges_only:1,
45 no_walk:1,
46 show_all:1,
47 remove_empty_trees:1,
48 simplify_history:1,
49 lifo:1,
50 topo_order:1,
51 simplify_merges:1,
52 simplify_by_decoration:1,
53 tag_objects:1,
54 tree_objects:1,
55 blob_objects:1,
56 edge_hint:1,
57 limited:1,
58 unpacked:1,
59 boundary:2,
60 left_right:1,
61 rewrite_parents:1,
62 print_parents:1,
63 show_source:1,
64 show_decorations:1,
65 reverse:1,
66 reverse_output_stage:1,
67 cherry_pick:1,
68 bisect:1,
69 ancestry_path:1,
70 first_parent_only:1;
72 /* Diff flags */
73 unsigned int diff:1,
74 full_diff:1,
75 show_root_diff:1,
76 no_commit_id:1,
77 verbose_header:1,
78 ignore_merges:1,
79 combine_merges:1,
80 dense_combined_merges:1,
81 always_show_header:1;
83 /* Format info */
84 unsigned int shown_one:1,
85 show_merge:1,
86 show_notes:1,
87 show_notes_given:1,
88 pretty_given:1,
89 abbrev_commit:1,
90 use_terminator:1,
91 missing_newline:1,
92 date_mode_explicit:1;
93 unsigned int disable_stdin:1;
95 enum date_mode date_mode;
97 unsigned int abbrev;
98 enum cmit_fmt commit_format;
99 struct log_info *loginfo;
100 int nr, total;
101 const char *mime_boundary;
102 const char *patch_suffix;
103 int numbered_files;
104 char *message_id;
105 struct string_list *ref_message_ids;
106 const char *add_signoff;
107 const char *extra_headers;
108 const char *log_reencode;
109 const char *subject_prefix;
110 int no_inline;
111 int show_log_size;
113 /* Filter by commit log message */
114 struct grep_opt grep_filter;
116 /* Display history graph */
117 struct git_graph *graph;
119 /* special limits */
120 int skip_count;
121 int max_count;
122 unsigned long max_age;
123 unsigned long min_age;
125 /* diff info for patches and for paths limiting */
126 struct diff_options diffopt;
127 struct diff_options pruning;
129 struct reflog_walk_info *reflog_info;
130 struct decoration children;
131 struct decoration merge_simplification;
133 /* notes-specific options: which refs to show */
134 struct display_notes_opt notes_opt;
137 #define REV_TREE_SAME 0
138 #define REV_TREE_NEW 1 /* Only new files */
139 #define REV_TREE_OLD 2 /* Only files removed */
140 #define REV_TREE_DIFFERENT 3 /* Mixed changes */
142 /* revision.c */
143 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
144 extern volatile show_early_output_fn_t show_early_output;
146 struct setup_revision_opt {
147 const char *def;
148 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
151 extern void init_revisions(struct rev_info *revs, const char *prefix);
152 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
153 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
154 const struct option *options,
155 const char * const usagestr[]);
156 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
158 extern int prepare_revision_walk(struct rev_info *revs);
159 extern struct commit *get_revision(struct rev_info *revs);
161 extern void mark_parents_uninteresting(struct commit *commit);
162 extern void mark_tree_uninteresting(struct tree *tree);
164 struct name_path {
165 struct name_path *up;
166 int elem_len;
167 const char *elem;
170 char *path_name(const struct name_path *path, const char *name);
172 extern void add_object(struct object *obj,
173 struct object_array *p,
174 struct name_path *path,
175 const char *name);
177 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
179 extern void add_head_to_pending(struct rev_info *);
181 enum commit_action {
182 commit_ignore,
183 commit_show,
184 commit_error
187 extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
188 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
190 #endif