blob: 9fac1a607de6470ab0c9b7e5079e8d36c8d68c75 [file] [log] [blame]
Linus Torvaldsae563542006-02-25 16:19:46 -08001#ifndef REVISION_H
2#define REVISION_H
3
Pierre Habouzit6b61ec02008-07-09 23:38:34 +02004#include "parse-options.h"
Jeff King0843acf2008-08-25 02:15:05 -04005#include "grep.h"
Thomas Rast894a9d32010-03-12 18:04:26 +01006#include "notes.h"
Junio C Hamano08f704f2013-06-06 16:07:14 -07007#include "commit.h"
Felipe Contreras19ecb562013-10-31 03:25:36 -06008#include "diff.h"
Pierre Habouzit6b61ec02008-07-09 23:38:34 +02009
Nguyễn Thái Ngọc Duy208acbf2014-03-25 20:23:26 +070010/* Remember to update object flag allocation in object.h */
Linus Torvaldsae563542006-02-25 16:19:46 -080011#define SEEN (1u<<0)
12#define UNINTERESTING (1u<<1)
Linus Torvalds7dc0fe32007-11-12 23:16:08 -080013#define TREESAME (1u<<2)
Linus Torvalds765ac8e2006-02-28 15:07:20 -080014#define SHOWN (1u<<3)
Junio C Hamano7ae0b0c2006-03-01 00:58:56 -080015#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
Junio C Hamano384e99a2006-03-27 23:58:34 -080016#define BOUNDARY (1u<<5)
Junio C Hamano2b064692007-03-05 16:10:28 -080017#define CHILD_SHOWN (1u<<6)
Junio C Hamano1b65a5a2006-04-16 18:12:49 -070018#define ADDED (1u<<7) /* Parents already parsed and added? */
Junio C Hamano577ed5c2006-10-22 17:32:47 -070019#define SYMMETRIC_LEFT (1u<<8)
Michael J Gruberadbbb312011-03-07 13:31:40 +010020#define PATCHSAME (1u<<9)
Kevin Bracey7f34a462013-05-16 18:32:38 +030021#define BOTTOM (1u<<10)
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +070022#define TRACK_LINEAR (1u<<26)
23#define ALL_REV_FLAGS (((1u<<11)-1) | TRACK_LINEAR)
Linus Torvaldsae563542006-02-25 16:19:46 -080024
Lars Hjemli33e70182009-08-15 16:23:12 +020025#define DECORATE_SHORT_REFS 1
26#define DECORATE_FULL_REFS 2
27
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +010028struct rev_info;
Linus Torvalds91539832006-04-17 11:59:32 -070029struct log_info;
Thomas Rast894a9d32010-03-12 18:04:26 +010030struct string_list;
Thomas Rast53d00b32013-07-31 22:13:20 +020031struct saved_parents;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +010032
Junio C Hamano281eee42011-08-25 17:35:39 -070033struct 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 18:00:47 +030044 REV_CMD_MERGE_BASE,
Junio C Hamano281eee42011-08-25 17:35:39 -070045 REV_CMD_REV
46 } whence;
47 unsigned flags;
48 } *rev;
49};
50
Martin von Zweigbergkca92e592012-08-28 23:15:54 -070051#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-25 16:19:46 -080055struct rev_info {
56 /* Starting list */
57 struct commit_list *commits;
Linus Torvalds1f1e8952006-06-19 17:42:35 -070058 struct object_array pending;
Linus Torvaldsae563542006-02-25 16:19:46 -080059
Junio C Hamano86ab4902007-03-05 13:10:06 -080060 /* Parents of shown commits */
61 struct object_array boundary_commits;
62
Junio C Hamano281eee42011-08-25 17:35:39 -070063 /* The end-points specified by the end user */
64 struct rev_cmdline_info cmdline;
65
Junio C Hamanoe7b432c2013-08-30 16:37:55 -070066 /* excluding from --branches, --refs, etc. expansion */
67 struct string_list *ref_excludes;
68
Linus Torvaldsae563542006-02-25 16:19:46 -080069 /* Basic information */
70 const char *prefix;
Pierre Habouzit02e54222008-07-08 15:19:33 +020071 const char *def;
Nguyễn Thái Ngọc Duyafe069d2010-12-17 19:43:06 +070072 struct pathspec prune_data;
Junio C Hamano08f704f2013-06-06 16:07:14 -070073
74 /* topo-sort */
75 enum rev_sort_order sort_order;
76
Junio C Hamanocc243c32011-05-18 18:08:09 -070077 unsigned int early_output:1,
Vicent Marti2db1a432014-03-28 06:00:43 -040078 ignore_missing:1,
79 ignore_missing_links:1;
Linus Torvaldscdcefbc2007-11-03 11:11:10 -070080
Linus Torvaldsae563542006-02-25 16:19:46 -080081 /* Traversal flags */
82 unsigned int dense:1,
Linus Torvalds53b2c822007-11-05 13:22:34 -080083 prune:1,
Martin von Zweigbergkca92e592012-08-28 23:15:54 -070084 no_walk:2,
Linus Torvalds3131b712008-02-09 14:02:07 -080085 show_all:1,
Linus Torvaldsae563542006-02-25 16:19:46 -080086 remove_empty_trees:1,
Linus Torvalds92024342006-06-11 10:57:35 -070087 simplify_history:1,
Linus Torvaldsae563542006-02-25 16:19:46 -080088 topo_order:1,
Junio C Hamano6546b592008-07-31 01:17:41 -070089 simplify_merges:1,
Linus Torvalds78892e32008-11-03 11:25:46 -080090 simplify_by_decoration:1,
Linus Torvaldsae563542006-02-25 16:19:46 -080091 tag_objects:1,
92 tree_objects:1,
93 blob_objects:1,
Junio C Hamano5a48d242011-09-01 15:43:34 -070094 verify_objects:1,
Linus Torvaldsd9a83682006-02-27 08:54:36 -080095 edge_hint:1,
brian m. carlson1684c1b2014-12-24 23:05:39 +000096 edge_hint_aggressive:1,
Linus Torvaldsd9a83682006-02-27 08:54:36 -080097 limited:1,
Junio C Hamano03a96832009-02-28 00:00:21 -080098 unpacked:1,
Junio C Hamano86ab4902007-03-05 13:10:06 -080099 boundary:2,
Thomas Rastf69c5012010-06-10 13:47:23 +0200100 count:1,
Junio C Hamano74bd9022006-12-16 15:31:25 -0800101 left_right:1,
Michael J Gruber60adf7d2011-02-21 17:09:11 +0100102 left_only:1,
103 right_only:1,
Adam Simpkins885cf802008-05-04 03:36:52 -0700104 rewrite_parents:1,
105 print_parents:1,
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700106 show_source:1,
Linus Torvaldsd467a522008-11-03 11:23:57 -0800107 show_decorations:1,
Junio C Hamano0053e902007-03-13 01:57:22 -0700108 reverse:1,
Thomas Rast498bcd32008-08-29 21:18:38 +0200109 reverse_output_stage:1,
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700110 cherry_pick:1,
Michael J Gruberadbbb312011-03-07 13:31:40 +0100111 cherry_mark:1,
Linus Torvaldsad3f9a72009-10-27 11:28:07 -0700112 bisect:1,
Junio C Hamanoebdc94f2010-04-20 13:48:39 -0700113 ancestry_path:1,
Thomas Rast12da1d12013-03-28 17:47:32 +0100114 first_parent_only:1,
115 line_level_traverse:1;
Linus Torvaldsae563542006-02-25 16:19:46 -0800116
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700117 /* Diff flags */
118 unsigned int diff:1,
119 full_diff:1,
120 show_root_diff:1,
121 no_commit_id:1,
122 verbose_header:1,
123 ignore_merges:1,
124 combine_merges:1,
125 dense_combined_merges:1,
126 always_show_header:1;
127
128 /* Format info */
Linus Torvalds91539832006-04-17 11:59:32 -0700129 unsigned int shown_one:1,
Junio C Hamanobd1470b2012-10-17 21:27:22 -0700130 shown_dashes:1,
Pierre Habouzit02e54222008-07-08 15:19:33 +0200131 show_merge:1,
Junio C Hamano66b2ed02010-01-20 13:59:36 -0800132 show_notes:1,
133 show_notes_given:1,
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700134 show_signature:1,
Junio C Hamano66b2ed02010-01-20 13:59:36 -0800135 pretty_given:1,
Junio C Hamano4da45be2008-04-07 17:11:34 -0700136 abbrev_commit:1,
Jay Soffian0c476952011-05-18 13:56:04 -0400137 abbrev_commit_given:1,
brian m. carlson3a30aa12015-12-15 01:52:04 +0000138 zero_commit:1,
Adam Simpkins7fefda52008-05-04 03:36:54 -0700139 use_terminator:1,
Jeff Kingf4ea32f2009-09-24 04:28:15 -0400140 missing_newline:1,
Jeff King9553d2b2011-05-26 18:28:17 -0400141 date_mode_explicit:1,
142 preserve_subject:1;
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800143 unsigned int disable_stdin:1;
René Scharfe4a43d372011-10-01 17:56:08 +0200144 unsigned int leak_pending:1;
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +0700145 /* --show-linear-break */
146 unsigned int track_linear:1,
147 track_first_time:1,
148 linear:1;
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800149
Jeff Kinga5481a62015-06-25 12:55:02 -0400150 struct date_mode date_mode;
Junio C Hamano0893eec2016-03-29 15:49:24 -0700151 int expand_tabs_in_log; /* unset if negative */
152 int expand_tabs_in_log_default;
Junio C Hamano106d7102006-09-06 02:12:09 -0700153
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700154 unsigned int abbrev;
155 enum cmit_fmt commit_format;
Linus Torvalds91539832006-04-17 11:59:32 -0700156 struct log_info *loginfo;
Johannes Schindelin596524b2006-05-05 04:30:52 +0200157 int nr, total;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200158 const char *mime_boundary;
Stephen Boyd108dab22009-03-22 19:14:05 -0700159 const char *patch_suffix;
160 int numbered_files;
Junio C Hamano5fe10fe2012-12-22 00:21:23 -0800161 int reroll_count;
Daniel Barkalowe1a37342008-02-18 22:56:06 -0500162 char *message_id;
Jeff Kinga9080472013-07-03 03:08:22 -0400163 struct ident_split from_ident;
Thomas Rastb079c502009-02-19 22:26:31 +0100164 struct string_list *ref_message_ids;
Nguyễn Thái Ngọc Duy5289c562013-02-12 02:17:38 -0800165 int add_signoff;
Johannes Schindelin20ff0682006-06-02 15:21:17 +0200166 const char *extra_headers;
Junio C Hamano52883fb2006-12-25 11:48:35 -0800167 const char *log_reencode;
Robin H. Johnson2d9e4a42007-04-11 16:58:07 -0700168 const char *subject_prefix;
Johannes Schindelinc112f682007-03-04 00:12:06 +0100169 int no_inline;
Marco Costalba9fa34652007-07-20 20:15:13 +0200170 int show_log_size;
Antoine Pelisse0e2913b2013-01-05 22:26:41 +0100171 struct string_list *mailmap;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700172
Junio C Hamano8ecae9b2006-09-17 15:43:40 -0700173 /* Filter by commit log message */
Jeff King0843acf2008-08-25 02:15:05 -0400174 struct grep_opt grep_filter;
Christoph Junghans22dfa8a2015-01-12 18:33:32 -0700175 /* Negate the match of grep_filter */
176 int invert_grep;
Junio C Hamano8ecae9b2006-09-17 15:43:40 -0700177
Adam Simpkins7fefda52008-05-04 03:36:54 -0700178 /* Display history graph */
179 struct git_graph *graph;
180
Linus Torvaldsae563542006-02-25 16:19:46 -0800181 /* special limits */
Junio C Hamanod5db6c92006-12-19 18:25:32 -0800182 int skip_count;
Linus Torvaldsae563542006-02-25 16:19:46 -0800183 int max_count;
184 unsigned long max_age;
185 unsigned long min_age;
Michael J Gruberad5aeed2011-03-21 11:14:06 +0100186 int min_parents;
187 int max_parents;
Vicent Martia330de32013-10-24 14:01:41 -0400188 int (*include_check)(struct commit *, void *);
189 void *include_check_data;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100190
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700191 /* diff info for patches and for paths limiting */
Junio C Hamanoc4e05b12006-04-10 18:14:54 -0700192 struct diff_options diffopt;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700193 struct diff_options pruning;
Junio C Hamanoc4e05b12006-04-10 18:14:54 -0700194
Johannes Schindelin8860fd42007-01-11 11:47:48 +0100195 struct reflog_walk_info *reflog_info;
Junio C Hamanof35f5602008-04-03 02:12:06 -0700196 struct decoration children;
Junio C Hamanofaf01562008-08-14 10:59:44 -0700197 struct decoration merge_simplification;
Kevin Braceyd0af6632013-05-16 18:32:34 +0300198 struct decoration treesame;
Thomas Rast894a9d32010-03-12 18:04:26 +0100199
200 /* notes-specific options: which refs to show */
201 struct display_notes_opt notes_opt;
Thomas Rastf69c5012010-06-10 13:47:23 +0200202
203 /* commit counts */
204 int count_left;
205 int count_right;
Michael J Gruberb388e142011-04-26 10:24:29 +0200206 int count_same;
Thomas Rast12da1d12013-03-28 17:47:32 +0100207
208 /* line level range that we are chasing */
209 struct decoration line_log_data;
Thomas Rast53d00b32013-07-31 22:13:20 +0200210
211 /* copies of the parent lists, for --full-diff display */
212 struct saved_parents *saved_parents_slab;
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +0700213
214 struct commit_list *previous_parents;
215 const char *break_bar;
Linus Torvaldsae563542006-02-25 16:19:46 -0800216};
217
Junio C Hamanoff32d342013-11-01 12:02:45 -0700218extern int ref_excluded(struct string_list *, const char *path);
219void clear_ref_exclusion(struct string_list **);
220void add_ref_exclusion(struct string_list **, const char *exclude);
221
222
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100223#define REV_TREE_SAME 0
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700224#define REV_TREE_NEW 1 /* Only new files */
225#define REV_TREE_OLD 2 /* Only files removed */
226#define REV_TREE_DIFFERENT 3 /* Mixed changes */
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100227
Linus Torvaldsae563542006-02-25 16:19:46 -0800228/* revision.c */
Linus Torvaldscdcefbc2007-11-03 11:11:10 -0700229typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
Brandon Casey4dc1db02008-08-20 19:34:30 -0500230extern volatile show_early_output_fn_t show_early_output;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100231
Junio C Hamano32962c92010-03-08 22:58:09 -0800232struct setup_revision_opt {
233 const char *def;
Junio C Hamanob4490052010-03-08 23:27:25 -0800234 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +0200235 const char *submodule;
Clemens Buchacher6d5b93f2012-04-14 21:04:48 +0200236 int assume_dashdash;
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -0700237 unsigned revarg_opt;
Junio C Hamano32962c92010-03-08 22:58:09 -0800238};
239
Linus Torvaldsdb6296a2006-07-28 21:21:48 -0700240extern void init_revisions(struct rev_info *revs, const char *prefix);
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200241extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
242 struct setup_revision_opt *);
Pierre Habouzit6b61ec02008-07-09 23:38:34 +0200243extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200244 const struct option *options,
245 const char * const usagestr[]);
Junio C Hamano8e676e82012-07-02 12:33:52 -0700246#define REVARG_CANNOT_BE_FILENAME 01
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -0700247#define REVARG_COMMITTISH 02
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200248extern int handle_revision_arg(const char *arg, struct rev_info *revs,
249 int flags, unsigned revarg_opt);
Junio C Hamano5d6f0932006-09-05 21:28:36 -0700250
Heiko Voigtbcc0a3e2012-03-29 09:21:21 +0200251extern void reset_revision_walk(void);
Alex Riesencc0e6c52007-05-04 23:54:57 +0200252extern int prepare_revision_walk(struct rev_info *revs);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800253extern struct commit *get_revision(struct rev_info *revs);
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200254extern char *get_revision_mark(const struct rev_info *revs,
255 const struct commit *commit);
256extern void put_revision_mark(const struct rev_info *revs,
257 const struct commit *commit);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800258
Linus Torvaldsae563542006-02-25 16:19:46 -0800259extern void mark_parents_uninteresting(struct commit *commit);
260extern void mark_tree_uninteresting(struct tree *tree);
261
Jeff Kingbd645162016-02-11 17:26:44 -0500262char *path_name(struct strbuf *path, const char *name);
Linus Torvalds8d2dfc42009-04-10 17:27:58 -0700263
Jeff Kingde1e67d2016-02-11 17:28:36 -0500264extern void show_object_with_name(FILE *, struct object *, const char *);
Junio C Hamano91f17512011-08-17 14:30:34 -0700265
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200266extern void add_pending_object(struct rev_info *revs,
267 struct object *obj, const char *name);
268extern void add_pending_sha1(struct rev_info *revs,
269 const char *name, const unsigned char *sha1,
270 unsigned int flags);
Linus Torvaldsae563542006-02-25 16:19:46 -0800271
Junio C Hamano3384a2d2007-12-11 10:09:04 -0800272extern void add_head_to_pending(struct rev_info *);
Jeff King718ccc92014-10-15 18:38:31 -0400273extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags);
Jeff King4fe10212014-10-16 20:44:23 -0400274extern void add_index_objects_to_pending(struct rev_info *, unsigned int flags);
Junio C Hamano3384a2d2007-12-11 10:09:04 -0800275
Linus Torvalds252a7c02007-11-04 12:12:05 -0800276enum commit_action {
277 commit_ignore,
278 commit_show,
279 commit_error
280};
281
Michael Haggertyff5f5f22013-05-25 11:08:07 +0200282extern enum commit_action get_commit_action(struct rev_info *revs,
283 struct commit *commit);
284extern enum commit_action simplify_commit(struct rev_info *revs,
285 struct commit *commit);
Linus Torvalds252a7c02007-11-04 12:12:05 -0800286
Bo Yangc7edcae2013-03-28 17:47:31 +0100287enum rewrite_result {
288 rewrite_one_ok,
289 rewrite_one_noparents,
290 rewrite_one_error
291};
292
293typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
294
295extern int rewrite_parents(struct rev_info *revs, struct commit *commit,
296 rewrite_parent_fn_t rewrite_parent);
Thomas Rast53d00b32013-07-31 22:13:20 +0200297
298/*
Junio C Hamano0131c492015-01-14 14:49:24 -0800299 * The log machinery saves the original parent list so that
300 * get_saved_parents() can later tell what the real parents of the
301 * commits are, when commit->parents has been modified by history
302 * simpification.
Thomas Rast53d00b32013-07-31 22:13:20 +0200303 *
304 * get_saved_parents() will transparently return commit->parents if
305 * history simplification is off.
306 */
Thomas Rast53d00b32013-07-31 22:13:20 +0200307extern struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
Thomas Rast53d00b32013-07-31 22:13:20 +0200308
Linus Torvaldsae563542006-02-25 16:19:46 -0800309#endif