🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.1.1 / . / revision.h
blob: a6205307cf3bb2364b8642b0a4857c5b0ae9b5a9 [file] [log] [blame]
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]1#ifndef REVISION_H
2#define REVISION_H
3
Pierre Habouzit6b61ec02008-07-09 21:38:34[diff] [blame]4#include "parse-options.h"
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]5#include "grep.h"
Thomas Rast894a9d32010-03-12 17:04:26[diff] [blame]6#include "notes.h"
Junio C Hamano08f704f2013-06-06 23:07:14[diff] [blame]7#include "commit.h"
Felipe Contreras19ecb562013-10-31 09:25:36[diff] [blame]8#include "diff.h"
Pierre Habouzit6b61ec02008-07-09 21:38:34[diff] [blame]9
Nguyễn Thái Ngọc Duy208acbf2014-03-25 13:23:26[diff] [blame]10/* Remember to update object flag allocation in object.h */
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]11#define SEEN (1u<<0)
12#define UNINTERESTING (1u<<1)
Linus Torvalds7dc0fe32007-11-13 07:16:08[diff] [blame]13#define TREESAME (1u<<2)
Linus Torvalds765ac8e2006-02-28 23:07:20[diff] [blame]14#define SHOWN (1u<<3)
Junio C Hamano7ae0b0c2006-03-01 08:58:56[diff] [blame]15#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
Junio C Hamano384e99a2006-03-28 07:58:34[diff] [blame]16#define BOUNDARY (1u<<5)
Junio C Hamano2b064692007-03-06 00:10:28[diff] [blame]17#define CHILD_SHOWN (1u<<6)
Junio C Hamano1b65a5a2006-04-17 01:12:49[diff] [blame]18#define ADDED (1u<<7) /* Parents already parsed and added? */
Junio C Hamano577ed5c2006-10-23 00:32:47[diff] [blame]19#define SYMMETRIC_LEFT (1u<<8)
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]20#define PATCHSAME (1u<<9)
Kevin Bracey7f34a462013-05-16 15:32:38[diff] [blame]21#define BOTTOM (1u<<10)
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]22#define TRACK_LINEAR (1u<<26)
23#define ALL_REV_FLAGS (((1u<<11)-1) | TRACK_LINEAR)
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]24
Lars Hjemli33e70182009-08-15 14:23:12[diff] [blame]25#define DECORATE_SHORT_REFS 1
26#define DECORATE_FULL_REFS 2
27
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]28struct rev_info;
Linus Torvalds91539832006-04-17 18:59:32[diff] [blame]29struct log_info;
Thomas Rast894a9d32010-03-12 17:04:26[diff] [blame]30struct string_list;
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]31struct saved_parents;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]32
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]33struct rev_cmdline_info {
34 unsigned int nr;
35 unsigned int alloc;
36 struct rev_cmdline_entry {
37 struct object *item;
38 const char *name;
39 enum {
40 REV_CMD_REF,
41 REV_CMD_PARENTS_ONLY,
42 REV_CMD_LEFT,
43 REV_CMD_RIGHT,
Kevin Braceya7654992013-05-13 15:00:47[diff] [blame]44 REV_CMD_MERGE_BASE,
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]45 REV_CMD_REV
46 } whence;
47 unsigned flags;
48 } *rev;
49};
50
Martin von Zweigbergkca92e592012-08-29 06:15:54[diff] [blame]51#define REVISION_WALK_WALK 0
52#define REVISION_WALK_NO_WALK_SORTED 1
53#define REVISION_WALK_NO_WALK_UNSORTED 2
54
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]55struct rev_info {
56 /* Starting list */
57 struct commit_list *commits;
Linus Torvalds1f1e8952006-06-20 00:42:35[diff] [blame]58 struct object_array pending;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]59
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]60 /* Parents of shown commits */
61 struct object_array boundary_commits;
62
Junio C Hamano281eee42011-08-26 00:35:39[diff] [blame]63 /* The end-points specified by the end user */
64 struct rev_cmdline_info cmdline;
65
Junio C Hamanoe7b432c2013-08-30 23:37:55[diff] [blame]66 /* excluding from --branches, --refs, etc. expansion */
67 struct string_list *ref_excludes;
68
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]69 /* Basic information */
70 const char *prefix;
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]71 const char *def;
Nguyễn Thái Ngọc Duyafe069d2010-12-17 12:43:06[diff] [blame]72 struct pathspec prune_data;
Junio C Hamano08f704f2013-06-06 23:07:14[diff] [blame]73
74 /* topo-sort */
75 enum rev_sort_order sort_order;
76
Junio C Hamanocc243c32011-05-19 01:08:09[diff] [blame]77 unsigned int early_output:1,
Vicent Marti2db1a432014-03-28 10:00:43[diff] [blame]78 ignore_missing:1,
79 ignore_missing_links:1;
Linus Torvaldscdcefbc2007-11-03 18:11:10[diff] [blame]80
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]81 /* Traversal flags */
82 unsigned int dense:1,
Linus Torvalds53b2c822007-11-05 21:22:34[diff] [blame]83 prune:1,
Martin von Zweigbergkca92e592012-08-29 06:15:54[diff] [blame]84 no_walk:2,
Linus Torvalds3131b712008-02-09 22:02:07[diff] [blame]85 show_all:1,
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]86 remove_empty_trees:1,
Linus Torvalds92024342006-06-11 17:57:35[diff] [blame]87 simplify_history:1,
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]88 topo_order:1,
Junio C Hamano6546b592008-07-31 08:17:41[diff] [blame]89 simplify_merges:1,
Linus Torvalds78892e32008-11-03 19:25:46[diff] [blame]90 simplify_by_decoration:1,
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]91 tag_objects:1,
92 tree_objects:1,
93 blob_objects:1,
Junio C Hamano5a48d242011-09-01 22:43:34[diff] [blame]94 verify_objects:1,
Linus Torvaldsd9a83682006-02-27 16:54:36[diff] [blame]95 edge_hint:1,
96 limited:1,
Junio C Hamano03a96832009-02-28 08:00:21[diff] [blame]97 unpacked:1,
Junio C Hamano86ab4902007-03-05 21:10:06[diff] [blame]98 boundary:2,
Thomas Rastf69c5012010-06-10 11:47:23[diff] [blame]99 count:1,
Junio C Hamano74bd9022006-12-16 23:31:25[diff] [blame]100 left_right:1,
Michael J Gruber60adf7d2011-02-21 16:09:11[diff] [blame]101 left_only:1,
102 right_only:1,
Adam Simpkins885cf802008-05-04 10:36:52[diff] [blame]103 rewrite_parents:1,
104 print_parents:1,
Linus Torvalds0f3a2902008-10-27 19:51:59[diff] [blame]105 show_source:1,
Linus Torvaldsd467a522008-11-03 19:23:57[diff] [blame]106 show_decorations:1,
Junio C Hamano0053e902007-03-13 08:57:22[diff] [blame]107 reverse:1,
Thomas Rast498bcd32008-08-29 19:18:38[diff] [blame]108 reverse_output_stage:1,
Junio C Hamanod7a17ca2007-04-09 10:40:38[diff] [blame]109 cherry_pick:1,
Michael J Gruberadbbb312011-03-07 12:31:40[diff] [blame]110 cherry_mark:1,
Linus Torvaldsad3f9a72009-10-27 18:28:07[diff] [blame]111 bisect:1,
Junio C Hamanoebdc94f2010-04-20 20:48:39[diff] [blame]112 ancestry_path:1,
Thomas Rast12da1d12013-03-28 16:47:32[diff] [blame]113 first_parent_only:1,
114 line_level_traverse:1;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]115
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]116 /* Diff flags */
117 unsigned int diff:1,
118 full_diff:1,
119 show_root_diff:1,
120 no_commit_id:1,
121 verbose_header:1,
122 ignore_merges:1,
123 combine_merges:1,
124 dense_combined_merges:1,
125 always_show_header:1;
126
127 /* Format info */
Linus Torvalds91539832006-04-17 18:59:32[diff] [blame]128 unsigned int shown_one:1,
Junio C Hamanobd1470b2012-10-18 04:27:22[diff] [blame]129 shown_dashes:1,
Pierre Habouzit02e54222008-07-08 13:19:33[diff] [blame]130 show_merge:1,
Junio C Hamano66b2ed02010-01-20 21:59:36[diff] [blame]131 show_notes:1,
132 show_notes_given:1,
Junio C Hamano0c37f1f2011-10-18 22:53:23[diff] [blame]133 show_signature:1,
Junio C Hamano66b2ed02010-01-20 21:59:36[diff] [blame]134 pretty_given:1,
Junio C Hamano4da45be2008-04-08 00:11:34[diff] [blame]135 abbrev_commit:1,
Jay Soffian0c476952011-05-18 17:56:04[diff] [blame]136 abbrev_commit_given:1,
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]137 use_terminator:1,
Jeff Kingf4ea32f2009-09-24 08:28:15[diff] [blame]138 missing_newline:1,
Jeff King9553d2b2011-05-26 22:28:17[diff] [blame]139 date_mode_explicit:1,
140 preserve_subject:1;
Junio C Hamano8b3dce52009-11-03 14:59:18[diff] [blame]141 unsigned int disable_stdin:1;
René Scharfe4a43d372011-10-01 15:56:08[diff] [blame]142 unsigned int leak_pending:1;
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]143 /* --show-linear-break */
144 unsigned int track_linear:1,
145 track_first_time:1,
146 linear:1;
Junio C Hamano8b3dce52009-11-03 14:59:18[diff] [blame]147
Junio C Hamanoa7b02cc2007-04-25 06:36:22[diff] [blame]148 enum date_mode date_mode;
Junio C Hamano106d7102006-09-06 09:12:09[diff] [blame]149
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]150 unsigned int abbrev;
151 enum cmit_fmt commit_format;
Linus Torvalds91539832006-04-17 18:59:32[diff] [blame]152 struct log_info *loginfo;
Johannes Schindelin596524b2006-05-05 02:30:52[diff] [blame]153 int nr, total;
Johannes Schindelin698ce6f2006-05-20 13:40:29[diff] [blame]154 const char *mime_boundary;
Stephen Boyd108dab22009-03-23 02:14:05[diff] [blame]155 const char *patch_suffix;
156 int numbered_files;
Junio C Hamano5fe10fe2012-12-22 08:21:23[diff] [blame]157 int reroll_count;
Daniel Barkalowe1a37342008-02-19 03:56:06[diff] [blame]158 char *message_id;
Jeff Kinga9080472013-07-03 07:08:22[diff] [blame]159 struct ident_split from_ident;
Thomas Rastb079c502009-02-19 21:26:31[diff] [blame]160 struct string_list *ref_message_ids;
Nguyễn Thái Ngọc Duy5289c562013-02-12 10:17:38[diff] [blame]161 int add_signoff;
Johannes Schindelin20ff0682006-06-02 13:21:17[diff] [blame]162 const char *extra_headers;
Junio C Hamano52883fb2006-12-25 19:48:35[diff] [blame]163 const char *log_reencode;
Robin H. Johnson2d9e4a42007-04-11 23:58:07[diff] [blame]164 const char *subject_prefix;
Johannes Schindelinc112f682007-03-03 23:12:06[diff] [blame]165 int no_inline;
Marco Costalba9fa34652007-07-20 18:15:13[diff] [blame]166 int show_log_size;
Antoine Pelisse0e2913b2013-01-05 21:26:41[diff] [blame]167 struct string_list *mailmap;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]168
Junio C Hamano8ecae9b2006-09-17 22:43:40[diff] [blame]169 /* Filter by commit log message */
Jeff King0843acf2008-08-25 06:15:05[diff] [blame]170 struct grep_opt grep_filter;
Junio C Hamano8ecae9b2006-09-17 22:43:40[diff] [blame]171
Adam Simpkins7fefda52008-05-04 10:36:54[diff] [blame]172 /* Display history graph */
173 struct git_graph *graph;
174
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]175 /* special limits */
Junio C Hamanod5db6c92006-12-20 02:25:32[diff] [blame]176 int skip_count;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]177 int max_count;
178 unsigned long max_age;
179 unsigned long min_age;
Michael J Gruberad5aeed2011-03-21 10:14:06[diff] [blame]180 int min_parents;
181 int max_parents;
Vicent Martia330de32013-10-24 18:01:41[diff] [blame]182 int (*include_check)(struct commit *, void *);
183 void *include_check_data;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]184
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]185 /* diff info for patches and for paths limiting */
Junio C Hamanoc4e05b12006-04-11 01:14:54[diff] [blame]186 struct diff_options diffopt;
Linus Torvaldscd2bdc52006-04-14 23:52:13[diff] [blame]187 struct diff_options pruning;
Junio C Hamanoc4e05b12006-04-11 01:14:54[diff] [blame]188
Johannes Schindelin8860fd42007-01-11 10:47:48[diff] [blame]189 struct reflog_walk_info *reflog_info;
Junio C Hamanof35f5602008-04-03 09:12:06[diff] [blame]190 struct decoration children;
Junio C Hamanofaf01562008-08-14 17:59:44[diff] [blame]191 struct decoration merge_simplification;
Kevin Braceyd0af6632013-05-16 15:32:34[diff] [blame]192 struct decoration treesame;
Thomas Rast894a9d32010-03-12 17:04:26[diff] [blame]193
194 /* notes-specific options: which refs to show */
195 struct display_notes_opt notes_opt;
Thomas Rastf69c5012010-06-10 11:47:23[diff] [blame]196
197 /* commit counts */
198 int count_left;
199 int count_right;
Michael J Gruberb388e142011-04-26 08:24:29[diff] [blame]200 int count_same;
Thomas Rast12da1d12013-03-28 16:47:32[diff] [blame]201
202 /* line level range that we are chasing */
203 struct decoration line_log_data;
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]204
205 /* copies of the parent lists, for --full-diff display */
206 struct saved_parents *saved_parents_slab;
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 13:23:27[diff] [blame]207
208 struct commit_list *previous_parents;
209 const char *break_bar;
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]210};
211
Junio C Hamanoff32d342013-11-01 19:02:45[diff] [blame]212extern int ref_excluded(struct string_list *, const char *path);
213void clear_ref_exclusion(struct string_list **);
214void add_ref_exclusion(struct string_list **, const char *exclude);
215
216
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]217#define REV_TREE_SAME 0
Linus Torvaldsceff8e72009-06-03 01:34:01[diff] [blame]218#define REV_TREE_NEW 1 /* Only new files */
219#define REV_TREE_OLD 2 /* Only files removed */
220#define REV_TREE_DIFFERENT 3 /* Mixed changes */
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]221
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]222/* revision.c */
Linus Torvaldscdcefbc2007-11-03 18:11:10[diff] [blame]223typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
Brandon Casey4dc1db02008-08-21 00:34:30[diff] [blame]224extern volatile show_early_output_fn_t show_early_output;
Fredrik Kuivinen8efdc322006-03-10 09:21:39[diff] [blame]225
Junio C Hamano32962c92010-03-09 06:58:09[diff] [blame]226struct setup_revision_opt {
227 const char *def;
Junio C Hamanob4490052010-03-09 07:27:25[diff] [blame]228 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
Heiko Voigt9ef6aeb2010-07-07 13:39:12[diff] [blame]229 const char *submodule;
Clemens Buchacher6d5b93f2012-04-14 19:04:48[diff] [blame]230 int assume_dashdash;
Junio C Hamanod5f6b1d2012-07-02 19:43:05[diff] [blame]231 unsigned revarg_opt;
Junio C Hamano32962c92010-03-09 06:58:09[diff] [blame]232};
233
Linus Torvaldsdb6296a2006-07-29 04:21:48[diff] [blame]234extern void init_revisions(struct rev_info *revs, const char *prefix);
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]235extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
236 struct setup_revision_opt *);
Pierre Habouzit6b61ec02008-07-09 21:38:34[diff] [blame]237extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]238 const struct option *options,
239 const char * const usagestr[]);
Junio C Hamano8e676e82012-07-02 19:33:52[diff] [blame]240#define REVARG_CANNOT_BE_FILENAME 01
Junio C Hamanod5f6b1d2012-07-02 19:43:05[diff] [blame]241#define REVARG_COMMITTISH 02
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]242extern int handle_revision_arg(const char *arg, struct rev_info *revs,
243 int flags, unsigned revarg_opt);
Junio C Hamano5d6f0932006-09-06 04:28:36[diff] [blame]244
Heiko Voigtbcc0a3e2012-03-29 07:21:21[diff] [blame]245extern void reset_revision_walk(void);
Alex Riesencc0e6c52007-05-04 21:54:57[diff] [blame]246extern int prepare_revision_walk(struct rev_info *revs);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]247extern struct commit *get_revision(struct rev_info *revs);
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]248extern char *get_revision_mark(const struct rev_info *revs,
249 const struct commit *commit);
250extern void put_revision_mark(const struct rev_info *revs,
251 const struct commit *commit);
Linus Torvaldsa4a88b22006-02-28 19:24:00[diff] [blame]252
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]253extern void mark_parents_uninteresting(struct commit *commit);
254extern void mark_tree_uninteresting(struct tree *tree);
255
256struct name_path {
257 struct name_path *up;
258 int elem_len;
259 const char *elem;
260};
261
Linus Torvaldscf2ab912009-04-11 01:15:26[diff] [blame]262char *path_name(const struct name_path *path, const char *name);
Linus Torvalds8d2dfc42009-04-11 00:27:58[diff] [blame]263
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]264extern void show_object_with_name(FILE *, struct object *,
265 const struct name_path *, const char *);
Junio C Hamano91f17512011-08-17 21:30:34[diff] [blame]266
Linus Torvalds1f1e8952006-06-20 00:42:35[diff] [blame]267extern void add_object(struct object *obj,
268 struct object_array *p,
269 struct name_path *path,
270 const char *name);
271
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]272extern void add_pending_object(struct rev_info *revs,
273 struct object *obj, const char *name);
274extern void add_pending_sha1(struct rev_info *revs,
275 const char *name, const unsigned char *sha1,
276 unsigned int flags);
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]277
Junio C Hamano3384a2d2007-12-11 18:09:04[diff] [blame]278extern void add_head_to_pending(struct rev_info *);
279
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]280enum commit_action {
281 commit_ignore,
282 commit_show,
283 commit_error
284};
285
Michael Haggertyff5f5f22013-05-25 09:08:07[diff] [blame]286extern enum commit_action get_commit_action(struct rev_info *revs,
287 struct commit *commit);
288extern enum commit_action simplify_commit(struct rev_info *revs,
289 struct commit *commit);
Linus Torvalds252a7c02007-11-04 20:12:05[diff] [blame]290
Bo Yangc7edcae2013-03-28 16:47:31[diff] [blame]291enum rewrite_result {
292 rewrite_one_ok,
293 rewrite_one_noparents,
294 rewrite_one_error
295};
296
297typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
298
299extern int rewrite_parents(struct rev_info *revs, struct commit *commit,
300 rewrite_parent_fn_t rewrite_parent);
Thomas Rast53d00b32013-07-31 20:13:20[diff] [blame]301
302/*
303 * Save a copy of the parent list, and return the saved copy. This is
304 * used by the log machinery to retrieve the original parents when
305 * commit->parents has been modified by history simpification.
306 *
307 * You may only call save_parents() once per commit (this is checked
308 * for non-root commits).
309 *
310 * get_saved_parents() will transparently return commit->parents if
311 * history simplification is off.
312 */
313extern void save_parents(struct rev_info *revs, struct commit *commit);
314extern struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
315extern void free_saved_parents(struct rev_info *revs);
316
Linus Torvaldsae563542006-02-26 00:19:46[diff] [blame]317#endif