blob: 4134dc6029c40f39659b39927ba239aed845673b [file] [log] [blame]
Linus Torvaldsae563542006-02-25 16:19:46 -08001#ifndef REVISION_H
2#define REVISION_H
3
Elijah Newrenef3ca952018-08-15 10:54:05 -07004#include "commit.h"
Pierre Habouzit6b61ec02008-07-09 23:38:34 +02005#include "parse-options.h"
Jeff King0843acf2008-08-25 02:15:05 -04006#include "grep.h"
Thomas Rast894a9d32010-03-12 18:04:26 +01007#include "notes.h"
Olga Telezhnayacf394712017-12-12 08:55:35 +00008#include "pretty.h"
Felipe Contreras19ecb562013-10-31 03:25:36 -06009#include "diff.h"
Nguyễn Thái Ngọc Duy87be2522018-05-19 07:28:24 +020010#include "commit-slab-decl.h"
Pierre Habouzit6b61ec02008-07-09 23:38:34 +020011
Nguyễn Thái Ngọc Duy208acbf2014-03-25 20:23:26 +070012/* Remember to update object flag allocation in object.h */
Linus Torvaldsae563542006-02-25 16:19:46 -080013#define SEEN (1u<<0)
14#define UNINTERESTING (1u<<1)
Linus Torvalds7dc0fe32007-11-12 23:16:08 -080015#define TREESAME (1u<<2)
Linus Torvalds765ac8e2006-02-28 15:07:20 -080016#define SHOWN (1u<<3)
Junio C Hamano7ae0b0c2006-03-01 00:58:56 -080017#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
Junio C Hamano384e99a2006-03-27 23:58:34 -080018#define BOUNDARY (1u<<5)
Junio C Hamano2b064692007-03-05 16:10:28 -080019#define CHILD_SHOWN (1u<<6)
Junio C Hamano1b65a5a2006-04-16 18:12:49 -070020#define ADDED (1u<<7) /* Parents already parsed and added? */
Junio C Hamano577ed5c2006-10-22 17:32:47 -070021#define SYMMETRIC_LEFT (1u<<8)
Michael J Gruberadbbb312011-03-07 13:31:40 +010022#define PATCHSAME (1u<<9)
Kevin Bracey7f34a462013-05-16 18:32:38 +030023#define BOTTOM (1u<<10)
Matthew DeVore99c9aa92018-10-05 14:31:24 -070024/*
25 * Indicates object was reached by traversal. i.e. not given by user on
26 * command-line or stdin.
27 * NEEDSWORK: NOT_USER_GIVEN doesn't apply to commits because we only support
28 * filtering trees and blobs, but it may be useful to support filtering commits
29 * in the future.
30 */
31#define NOT_USER_GIVEN (1u<<25)
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +070032#define TRACK_LINEAR (1u<<26)
Matthew DeVore99c9aa92018-10-05 14:31:24 -070033#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR)
Linus Torvaldsae563542006-02-25 16:19:46 -080034
Derrick Stoleeb4542412018-11-01 13:46:22 +000035#define TOPO_WALK_EXPLORED (1u<<27)
36#define TOPO_WALK_INDEGREE (1u<<28)
Linus Torvaldsae563542006-02-25 16:19:46 -080037
Lars Hjemli33e70182009-08-15 16:23:12 +020038#define DECORATE_SHORT_REFS 1
39#define DECORATE_FULL_REFS 2
40
Linus Torvalds91539832006-04-17 11:59:32 -070041struct log_info;
Nguyễn Thái Ngọc Duy2abf3502018-09-21 17:57:38 +020042struct repository;
43struct rev_info;
Thomas Rast894a9d32010-03-12 18:04:26 +010044struct string_list;
Thomas Rast53d00b32013-07-31 22:13:20 +020045struct saved_parents;
Nguyễn Thái Ngọc Duy87be2522018-05-19 07:28:24 +020046define_shared_commit_slab(revision_sources, char *);
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +010047
Junio C Hamano281eee42011-08-25 17:35:39 -070048struct rev_cmdline_info {
49 unsigned int nr;
50 unsigned int alloc;
51 struct rev_cmdline_entry {
52 struct object *item;
53 const char *name;
54 enum {
55 REV_CMD_REF,
56 REV_CMD_PARENTS_ONLY,
57 REV_CMD_LEFT,
58 REV_CMD_RIGHT,
Kevin Braceya7654992013-05-13 18:00:47 +030059 REV_CMD_MERGE_BASE,
Junio C Hamano281eee42011-08-25 17:35:39 -070060 REV_CMD_REV
61 } whence;
62 unsigned flags;
63 } *rev;
64};
65
Martin von Zweigbergkca92e592012-08-28 23:15:54 -070066#define REVISION_WALK_WALK 0
67#define REVISION_WALK_NO_WALK_SORTED 1
68#define REVISION_WALK_NO_WALK_UNSORTED 2
69
Derrick Stoleef1f5de42019-01-16 10:25:58 -080070struct oidset;
Derrick Stoleef0d9cc42018-11-01 13:46:20 +000071struct topo_walk_info;
72
Linus Torvaldsae563542006-02-25 16:19:46 -080073struct rev_info {
74 /* Starting list */
75 struct commit_list *commits;
Linus Torvalds1f1e8952006-06-19 17:42:35 -070076 struct object_array pending;
Nguyễn Thái Ngọc Duy2abf3502018-09-21 17:57:38 +020077 struct repository *repo;
Linus Torvaldsae563542006-02-25 16:19:46 -080078
Junio C Hamano86ab4902007-03-05 13:10:06 -080079 /* Parents of shown commits */
80 struct object_array boundary_commits;
81
Junio C Hamano281eee42011-08-25 17:35:39 -070082 /* The end-points specified by the end user */
83 struct rev_cmdline_info cmdline;
84
Junio C Hamanoe7b432c2013-08-30 16:37:55 -070085 /* excluding from --branches, --refs, etc. expansion */
86 struct string_list *ref_excludes;
87
Linus Torvaldsae563542006-02-25 16:19:46 -080088 /* Basic information */
89 const char *prefix;
Pierre Habouzit02e54222008-07-08 15:19:33 +020090 const char *def;
Nguyễn Thái Ngọc Duyafe069d2010-12-17 19:43:06 +070091 struct pathspec prune_data;
Junio C Hamano08f704f2013-06-06 16:07:14 -070092
Jeff King7ba82622017-08-02 18:25:27 -040093 /*
94 * Whether the arguments parsed by setup_revisions() included any
95 * "input" revisions that might still have yielded an empty pending
96 * list (e.g., patterns like "--all" or "--glob").
97 */
98 int rev_input_given;
99
Jeff Kinga12cbe22018-08-22 17:37:23 -0400100 /*
101 * Whether we read from stdin due to the --stdin option.
102 */
103 int read_from_stdin;
104
Junio C Hamano08f704f2013-06-06 16:07:14 -0700105 /* topo-sort */
106 enum rev_sort_order sort_order;
107
SZEDER Gábore35b6ac2017-06-10 13:41:01 +0200108 unsigned int early_output;
109
110 unsigned int ignore_missing:1,
Vicent Marti2db1a432014-03-28 06:00:43 -0400111 ignore_missing_links:1;
Linus Torvaldscdcefbc2007-11-03 11:11:10 -0700112
Linus Torvaldsae563542006-02-25 16:19:46 -0800113 /* Traversal flags */
114 unsigned int dense:1,
Linus Torvalds53b2c822007-11-05 13:22:34 -0800115 prune:1,
Martin von Zweigbergkca92e592012-08-28 23:15:54 -0700116 no_walk:2,
Linus Torvaldsae563542006-02-25 16:19:46 -0800117 remove_empty_trees:1,
Linus Torvalds92024342006-06-11 10:57:35 -0700118 simplify_history:1,
Linus Torvaldsae563542006-02-25 16:19:46 -0800119 topo_order:1,
Junio C Hamano6546b592008-07-31 01:17:41 -0700120 simplify_merges:1,
Linus Torvalds78892e32008-11-03 11:25:46 -0800121 simplify_by_decoration:1,
Nguyễn Thái Ngọc Duyff9445b2017-08-23 19:36:49 +0700122 single_worktree:1,
Linus Torvaldsae563542006-02-25 16:19:46 -0800123 tag_objects:1,
124 tree_objects:1,
125 blob_objects:1,
Junio C Hamano5a48d242011-09-01 15:43:34 -0700126 verify_objects:1,
Linus Torvaldsd9a83682006-02-27 08:54:36 -0800127 edge_hint:1,
brian m. carlson1684c1b2014-12-24 23:05:39 +0000128 edge_hint_aggressive:1,
Linus Torvaldsd9a83682006-02-27 08:54:36 -0800129 limited:1,
Junio C Hamano03a96832009-02-28 00:00:21 -0800130 unpacked:1,
Junio C Hamano86ab4902007-03-05 13:10:06 -0800131 boundary:2,
Thomas Rastf69c5012010-06-10 13:47:23 +0200132 count:1,
Junio C Hamano74bd9022006-12-16 15:31:25 -0800133 left_right:1,
Michael J Gruber60adf7d2011-02-21 17:09:11 +0100134 left_only:1,
135 right_only:1,
Adam Simpkins885cf802008-05-04 03:36:52 -0700136 rewrite_parents:1,
137 print_parents:1,
Linus Torvaldsd467a522008-11-03 11:23:57 -0800138 show_decorations:1,
Junio C Hamano0053e902007-03-13 01:57:22 -0700139 reverse:1,
Thomas Rast498bcd32008-08-29 21:18:38 +0200140 reverse_output_stage:1,
Junio C Hamanod7a17ca2007-04-09 03:40:38 -0700141 cherry_pick:1,
Michael J Gruberadbbb312011-03-07 13:31:40 +0100142 cherry_mark:1,
Linus Torvaldsad3f9a72009-10-27 11:28:07 -0700143 bisect:1,
Junio C Hamanoebdc94f2010-04-20 13:48:39 -0700144 ancestry_path:1,
Thomas Rast12da1d12013-03-28 17:47:32 +0100145 first_parent_only:1,
Stefan Bellerce5b6f92017-11-15 18:00:35 -0800146 line_level_traverse:1,
Junio C Hamanof3d618d2018-02-13 13:39:03 -0800147 tree_blobs_in_commit_order:1,
Jonathan Tandf11e192017-12-08 15:27:15 +0000148
Matthew DeVore7c0fe332018-10-05 14:31:23 -0700149 /*
150 * Blobs are shown without regard for their existence.
151 * But not so for trees: unless exclude_promisor_objects
152 * is set and the tree in question is a promisor object;
153 * OR ignore_missing_links is set, the revision walker
154 * dies with a "bad tree object HASH" message when
155 * encountering a missing tree. For callers that can
156 * handle missing trees and want them to be filterable
157 * and showable, set this to true. The revision walker
158 * will filter and show such a missing tree as usual,
159 * but will not attempt to recurse into this tree
160 * object.
161 */
162 do_not_die_on_missing_tree:1,
163
Jonathan Tandf11e192017-12-08 15:27:15 +0000164 /* for internal use only */
165 exclude_promisor_objects:1;
Linus Torvaldsae563542006-02-25 16:19:46 -0800166
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700167 /* Diff flags */
168 unsigned int diff:1,
169 full_diff:1,
170 show_root_diff:1,
171 no_commit_id:1,
172 verbose_header:1,
173 ignore_merges:1,
174 combine_merges:1,
Elijah Newrend76ce4f2019-02-07 17:12:46 -0800175 combined_all_paths:1,
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700176 dense_combined_merges:1,
177 always_show_header:1;
178
179 /* Format info */
Linus Torvalds91539832006-04-17 11:59:32 -0700180 unsigned int shown_one:1,
Junio C Hamanobd1470b2012-10-17 21:27:22 -0700181 shown_dashes:1,
Pierre Habouzit02e54222008-07-08 15:19:33 +0200182 show_merge:1,
Junio C Hamano66b2ed02010-01-20 13:59:36 -0800183 show_notes:1,
184 show_notes_given:1,
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700185 show_signature:1,
Junio C Hamano66b2ed02010-01-20 13:59:36 -0800186 pretty_given:1,
Junio C Hamano4da45be2008-04-07 17:11:34 -0700187 abbrev_commit:1,
Jay Soffian0c476952011-05-18 13:56:04 -0400188 abbrev_commit_given:1,
brian m. carlson3a30aa12015-12-15 01:52:04 +0000189 zero_commit:1,
Adam Simpkins7fefda52008-05-04 03:36:54 -0700190 use_terminator:1,
Jeff Kingf4ea32f2009-09-24 04:28:15 -0400191 missing_newline:1,
Jeff King9553d2b2011-05-26 18:28:17 -0400192 date_mode_explicit:1,
193 preserve_subject:1;
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800194 unsigned int disable_stdin:1;
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +0700195 /* --show-linear-break */
196 unsigned int track_linear:1,
197 track_first_time:1,
198 linear:1;
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800199
Jeff Kinga5481a62015-06-25 12:55:02 -0400200 struct date_mode date_mode;
Junio C Hamano0893eec2016-03-29 15:49:24 -0700201 int expand_tabs_in_log; /* unset if negative */
202 int expand_tabs_in_log_default;
Junio C Hamano106d7102006-09-06 02:12:09 -0700203
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700204 unsigned int abbrev;
205 enum cmit_fmt commit_format;
Linus Torvalds91539832006-04-17 11:59:32 -0700206 struct log_info *loginfo;
Johannes Schindelin596524b2006-05-05 04:30:52 +0200207 int nr, total;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200208 const char *mime_boundary;
Stephen Boyd108dab22009-03-22 19:14:05 -0700209 const char *patch_suffix;
210 int numbered_files;
Junio C Hamano5fe10fe2012-12-22 00:21:23 -0800211 int reroll_count;
Daniel Barkalowe1a37342008-02-18 22:56:06 -0500212 char *message_id;
Jeff Kinga9080472013-07-03 03:08:22 -0400213 struct ident_split from_ident;
Thomas Rastb079c502009-02-19 22:26:31 +0100214 struct string_list *ref_message_ids;
Nguyễn Thái Ngọc Duy5289c562013-02-12 02:17:38 -0800215 int add_signoff;
Johannes Schindelin20ff0682006-06-02 15:21:17 +0200216 const char *extra_headers;
Junio C Hamano52883fb2006-12-25 11:48:35 -0800217 const char *log_reencode;
Robin H. Johnson2d9e4a42007-04-11 16:58:07 -0700218 const char *subject_prefix;
Johannes Schindelinc112f682007-03-04 00:12:06 +0100219 int no_inline;
Marco Costalba9fa34652007-07-20 20:15:13 +0200220 int show_log_size;
Antoine Pelisse0e2913b2013-01-05 22:26:41 +0100221 struct string_list *mailmap;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700222
Junio C Hamano8ecae9b2006-09-17 15:43:40 -0700223 /* Filter by commit log message */
Jeff King0843acf2008-08-25 02:15:05 -0400224 struct grep_opt grep_filter;
Christoph Junghans22dfa8a2015-01-12 18:33:32 -0700225 /* Negate the match of grep_filter */
226 int invert_grep;
Junio C Hamano8ecae9b2006-09-17 15:43:40 -0700227
Adam Simpkins7fefda52008-05-04 03:36:54 -0700228 /* Display history graph */
229 struct git_graph *graph;
230
Linus Torvaldsae563542006-02-25 16:19:46 -0800231 /* special limits */
Junio C Hamanod5db6c92006-12-19 18:25:32 -0800232 int skip_count;
Linus Torvaldsae563542006-02-25 16:19:46 -0800233 int max_count;
Johannes Schindelindddbad72017-04-26 21:29:31 +0200234 timestamp_t max_age;
235 timestamp_t min_age;
Michael J Gruberad5aeed2011-03-21 11:14:06 +0100236 int min_parents;
237 int max_parents;
Vicent Martia330de32013-10-24 14:01:41 -0400238 int (*include_check)(struct commit *, void *);
239 void *include_check_data;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100240
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700241 /* diff info for patches and for paths limiting */
Junio C Hamanoc4e05b12006-04-10 18:14:54 -0700242 struct diff_options diffopt;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700243 struct diff_options pruning;
Junio C Hamanoc4e05b12006-04-10 18:14:54 -0700244
Johannes Schindelin8860fd42007-01-11 11:47:48 +0100245 struct reflog_walk_info *reflog_info;
Junio C Hamanof35f5602008-04-03 02:12:06 -0700246 struct decoration children;
Junio C Hamanofaf01562008-08-14 10:59:44 -0700247 struct decoration merge_simplification;
Kevin Braceyd0af6632013-05-16 18:32:34 +0300248 struct decoration treesame;
Thomas Rast894a9d32010-03-12 18:04:26 +0100249
250 /* notes-specific options: which refs to show */
251 struct display_notes_opt notes_opt;
Thomas Rastf69c5012010-06-10 13:47:23 +0200252
Eric Sunshine126facf2018-07-22 05:57:05 -0400253 /* interdiff */
254 const struct object_id *idiff_oid1;
255 const struct object_id *idiff_oid2;
Eric Sunshine5ac290f2018-07-22 05:57:06 -0400256 const char *idiff_title;
Eric Sunshine126facf2018-07-22 05:57:05 -0400257
Eric Sunshine31e26172018-07-22 05:57:13 -0400258 /* range-diff */
259 const char *rdiff1;
260 const char *rdiff2;
261 int creation_factor;
Eric Sunshine4ee99682018-07-22 05:57:15 -0400262 const char *rdiff_title;
Eric Sunshine31e26172018-07-22 05:57:13 -0400263
Thomas Rastf69c5012010-06-10 13:47:23 +0200264 /* commit counts */
265 int count_left;
266 int count_right;
Michael J Gruberb388e142011-04-26 10:24:29 +0200267 int count_same;
Thomas Rast12da1d12013-03-28 17:47:32 +0100268
269 /* line level range that we are chasing */
270 struct decoration line_log_data;
Thomas Rast53d00b32013-07-31 22:13:20 +0200271
272 /* copies of the parent lists, for --full-diff display */
273 struct saved_parents *saved_parents_slab;
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +0700274
275 struct commit_list *previous_parents;
276 const char *break_bar;
Nguyễn Thái Ngọc Duy87be2522018-05-19 07:28:24 +0200277
278 struct revision_sources *sources;
Derrick Stoleef0d9cc42018-11-01 13:46:20 +0000279
280 struct topo_walk_info *topo_walk_info;
Linus Torvaldsae563542006-02-25 16:19:46 -0800281};
282
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200283int ref_excluded(struct string_list *, const char *path);
Junio C Hamanoff32d342013-11-01 12:02:45 -0700284void clear_ref_exclusion(struct string_list **);
285void add_ref_exclusion(struct string_list **, const char *exclude);
286
287
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100288#define REV_TREE_SAME 0
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700289#define REV_TREE_NEW 1 /* Only new files */
290#define REV_TREE_OLD 2 /* Only files removed */
291#define REV_TREE_DIFFERENT 3 /* Mixed changes */
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100292
Linus Torvaldsae563542006-02-25 16:19:46 -0800293/* revision.c */
Linus Torvaldscdcefbc2007-11-03 11:11:10 -0700294typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
Brandon Casey4dc1db02008-08-20 19:34:30 -0500295extern volatile show_early_output_fn_t show_early_output;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100296
Junio C Hamano32962c92010-03-08 22:58:09 -0800297struct setup_revision_opt {
298 const char *def;
Junio C Hamanob4490052010-03-08 23:27:25 -0800299 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
Nguyễn Thái Ngọc Duy2abf3502018-09-21 17:57:38 +0200300 const char *submodule; /* TODO: drop this and use rev_info->repo */
Matthew DeVorebbcde412018-12-03 14:10:19 -0800301 unsigned int assume_dashdash:1,
302 allow_exclude_promisor_objects:1;
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -0700303 unsigned revarg_opt;
Junio C Hamano32962c92010-03-08 22:58:09 -0800304};
305
Nguyễn Thái Ngọc Duy2abf3502018-09-21 17:57:38 +0200306#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
307#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
308#endif
309void repo_init_revisions(struct repository *r,
310 struct rev_info *revs,
311 const char *prefix);
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200312int setup_revisions(int argc, const char **argv, struct rev_info *revs,
313 struct setup_revision_opt *);
314void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
315 const struct option *options,
316 const char * const usagestr[]);
Junio C Hamano8e676e82012-07-02 12:33:52 -0700317#define REVARG_CANNOT_BE_FILENAME 01
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -0700318#define REVARG_COMMITTISH 02
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200319int handle_revision_arg(const char *arg, struct rev_info *revs,
320 int flags, unsigned revarg_opt);
Junio C Hamano5d6f0932006-09-05 21:28:36 -0700321
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200322void reset_revision_walk(void);
323int prepare_revision_walk(struct rev_info *revs);
324struct commit *get_revision(struct rev_info *revs);
325char *get_revision_mark(const struct rev_info *revs,
326 const struct commit *commit);
327void put_revision_mark(const struct rev_info *revs,
328 const struct commit *commit);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800329
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200330void mark_parents_uninteresting(struct commit *commit);
Nguyễn Thái Ngọc Duyb3c7eef2018-09-21 17:57:39 +0200331void mark_tree_uninteresting(struct repository *r, struct tree *tree);
Derrick Stoleef1f5de42019-01-16 10:25:58 -0800332void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees);
Linus Torvaldsae563542006-02-25 16:19:46 -0800333
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200334void show_object_with_name(FILE *, struct object *, const char *);
Junio C Hamano91f17512011-08-17 14:30:34 -0700335
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200336void add_pending_object(struct rev_info *revs,
337 struct object *obj, const char *name);
338void add_pending_oid(struct rev_info *revs,
339 const char *name, const struct object_id *oid,
340 unsigned int flags);
Linus Torvaldsae563542006-02-25 16:19:46 -0800341
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200342void add_head_to_pending(struct rev_info *);
343void add_reflogs_to_pending(struct rev_info *, unsigned int flags);
344void add_index_objects_to_pending(struct rev_info *, unsigned int flags);
Junio C Hamano3384a2d2007-12-11 10:09:04 -0800345
Linus Torvalds252a7c02007-11-04 12:12:05 -0800346enum commit_action {
347 commit_ignore,
348 commit_show,
349 commit_error
350};
351
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200352enum commit_action get_commit_action(struct rev_info *revs,
353 struct commit *commit);
354enum commit_action simplify_commit(struct rev_info *revs,
355 struct commit *commit);
Linus Torvalds252a7c02007-11-04 12:12:05 -0800356
Bo Yangc7edcae2013-03-28 17:47:31 +0100357enum rewrite_result {
358 rewrite_one_ok,
359 rewrite_one_noparents,
360 rewrite_one_error
361};
362
363typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
364
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200365int rewrite_parents(struct rev_info *revs,
366 struct commit *commit,
367 rewrite_parent_fn_t rewrite_parent);
Thomas Rast53d00b32013-07-31 22:13:20 +0200368
369/*
Junio C Hamano0131c492015-01-14 14:49:24 -0800370 * The log machinery saves the original parent list so that
371 * get_saved_parents() can later tell what the real parents of the
372 * commits are, when commit->parents has been modified by history
373 * simpification.
Thomas Rast53d00b32013-07-31 22:13:20 +0200374 *
375 * get_saved_parents() will transparently return commit->parents if
376 * history simplification is off.
377 */
Nguyễn Thái Ngọc Duyd16ec9c2018-06-30 11:20:30 +0200378struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
Thomas Rast53d00b32013-07-31 22:13:20 +0200379
Linus Torvaldsae563542006-02-25 16:19:46 -0800380#endif