Improve language in git-merge.txt and related docs
[git/mingw.git] / revision.h
blob7cf848771b5be811f7741ce988b860760202f6f3
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 simplify_merges:1,
46 simplify_by_decoration:1,
47 tag_objects:1,
48 tree_objects:1,
49 blob_objects:1,
50 edge_hint:1,
51 limited:1,
52 unpacked:1, /* see also ignore_packed below */
53 boundary:2,
54 left_right:1,
55 rewrite_parents:1,
56 print_parents:1,
57 show_source:1,
58 show_decorations:1,
59 reverse:1,
60 reverse_output_stage:1,
61 cherry_pick:1,
62 first_parent_only:1;
64 /* Diff flags */
65 unsigned int diff:1,
66 full_diff:1,
67 show_root_diff:1,
68 no_commit_id:1,
69 verbose_header:1,
70 ignore_merges:1,
71 combine_merges:1,
72 dense_combined_merges:1,
73 always_show_header:1;
75 /* Format info */
76 unsigned int shown_one:1,
77 show_merge:1,
78 abbrev_commit:1,
79 use_terminator:1,
80 missing_newline:1;
81 enum date_mode date_mode;
83 const char **ignore_packed; /* pretend objects in these are unpacked */
84 int num_ignore_packed;
86 unsigned int abbrev;
87 enum cmit_fmt commit_format;
88 struct log_info *loginfo;
89 int nr, total;
90 const char *mime_boundary;
91 char *message_id;
92 const char *ref_message_id;
93 const char *add_signoff;
94 const char *extra_headers;
95 const char *log_reencode;
96 const char *subject_prefix;
97 int no_inline;
98 int show_log_size;
100 /* Filter by commit log message */
101 struct grep_opt grep_filter;
103 /* Display history graph */
104 struct git_graph *graph;
106 /* special limits */
107 int skip_count;
108 int max_count;
109 unsigned long max_age;
110 unsigned long min_age;
112 /* diff info for patches and for paths limiting */
113 struct diff_options diffopt;
114 struct diff_options pruning;
116 struct reflog_walk_info *reflog_info;
117 struct decoration children;
118 struct decoration merge_simplification;
121 #define REV_TREE_SAME 0
122 #define REV_TREE_NEW 1
123 #define REV_TREE_DIFFERENT 2
125 /* revision.c */
126 void read_revisions_from_stdin(struct rev_info *revs);
128 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
129 extern volatile show_early_output_fn_t show_early_output;
131 extern void init_revisions(struct rev_info *revs, const char *prefix);
132 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
133 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
134 const struct option *options,
135 const char * const usagestr[]);
136 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
138 extern int prepare_revision_walk(struct rev_info *revs);
139 extern struct commit *get_revision(struct rev_info *revs);
141 extern void mark_parents_uninteresting(struct commit *commit);
142 extern void mark_tree_uninteresting(struct tree *tree);
144 struct name_path {
145 struct name_path *up;
146 int elem_len;
147 const char *elem;
150 extern void add_object(struct object *obj,
151 struct object_array *p,
152 struct name_path *path,
153 const char *name);
155 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
157 extern void add_head_to_pending(struct rev_info *);
159 enum commit_action {
160 commit_ignore,
161 commit_show,
162 commit_error
165 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
167 #endif