blob: d57d8ea23d7a225e10788859cab4bebf5cfc1346 [file] [log] [blame]
Ramkumar Ramachandra26ae3372011-08-04 16:09:11 +05301#ifndef SEQUENCER_H
2#define SEQUENCER_H
3
Elijah Newrenef3ca952018-08-15 10:54:05 -07004#include "cache.h"
5#include "strbuf.h"
Phillip Wood901ba7b2019-12-06 16:06:11 +00006#include "wt-status.h"
Elijah Newrenef3ca952018-08-15 10:54:05 -07007
8struct commit;
Nguyễn Thái Ngọc Duyf11c9582018-11-10 06:48:56 +01009struct repository;
Elijah Newrenef3ca952018-08-15 10:54:05 -070010
Phillip Wood66618a52018-01-24 12:34:22 +000011const char *git_path_commit_editmsg(void);
Alban Gruin44b776c2018-08-10 18:51:28 +020012const char *rebase_path_todo(void);
Alban Gruina930eb02019-03-05 20:18:03 +010013const char *rebase_path_todo_backup(void);
Alban Gruin5a5445d2020-01-28 22:12:46 +010014const char *rebase_path_dropped(void);
Ramkumar Ramachandra26ae3372011-08-04 16:09:11 +053015
Brandon Caseybab4d102013-02-12 02:17:35 -080016#define APPEND_SIGNOFF_DEDUP (1u << 0)
17
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053018enum replay_action {
19 REPLAY_REVERT,
Johannes Schindelin84583952017-01-02 16:26:28 +010020 REPLAY_PICK,
21 REPLAY_INTERACTIVE_REBASE
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053022};
23
Phillip Wood28d6dae2017-12-13 11:46:21 +000024enum commit_msg_cleanup_mode {
25 COMMIT_MSG_CLEANUP_SPACE,
26 COMMIT_MSG_CLEANUP_NONE,
27 COMMIT_MSG_CLEANUP_SCISSORS,
28 COMMIT_MSG_CLEANUP_ALL
29};
30
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053031struct replay_opts {
32 enum replay_action action;
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053033
Elijah Newren39edfd52021-03-31 06:52:20 +000034 /* Tri-state options: unspecified, false, or true */
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053035 int edit;
Elijah Newren39edfd52021-03-31 06:52:20 +000036
37 /* Boolean options */
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053038 int record_origin;
39 int no_commit;
40 int signoff;
41 int allow_ff;
42 int allow_rerere_auto;
Neil Hormandf478b72012-04-11 16:21:53 -040043 int allow_empty;
Chris Webb4bee9582012-08-02 11:38:51 +010044 int allow_empty_message;
Elijah Newrene98c4262020-02-15 21:36:25 +000045 int drop_redundant_commits;
Neil Hormanb27cfb02012-04-20 10:36:15 -040046 int keep_redundant_commits;
Johannes Schindelin556907f2017-01-02 16:26:53 +010047 int verbose;
Elijah Newren899b49c2018-12-11 08:11:36 -080048 int quiet;
Johannes Schindelind421afa2018-12-10 11:04:58 -080049 int reschedule_failed_exec;
Phillip Wood7573cec2020-08-17 18:40:02 +010050 int committer_date_is_author_date;
Phillip Wooda3894aa2020-08-17 18:40:03 +010051 int ignore_date;
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053052
53 int mainline;
54
Johannes Schindelin03a4e262016-10-21 14:24:13 +020055 char *gpg_sign;
Phillip Wood28d6dae2017-12-13 11:46:21 +000056 enum commit_msg_cleanup_mode default_msg_cleanup;
Phillip Woodd74f3e52019-03-29 11:08:42 +000057 int explicit_cleanup;
Nicolas Vigier32535532014-01-24 00:50:58 +000058
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053059 /* Merge strategy */
Elijah Newren14c45862020-11-02 23:45:34 +000060 char *default_strategy; /* from config options */
Johannes Schindelin03a4e262016-10-21 14:24:13 +020061 char *strategy;
62 char **xopts;
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053063 size_t xopts_nr, xopts_alloc;
64
Johannes Schindeline12a7ef2018-04-27 22:48:21 +020065 /* Used by fixup/squash */
66 struct strbuf current_fixups;
67 int current_fixup_count;
68
Johannes Schindelind87d48b2018-05-04 01:01:17 +020069 /* placeholder commit for -i --root */
70 struct object_id squash_onto;
71 int have_squash_onto;
72
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053073 /* Only used by REPLAY_NONE */
74 struct rev_info *revs;
75};
Elijah Newren39edfd52021-03-31 06:52:20 +000076#define REPLAY_OPTS_INIT { .edit = -1, .action = -1, .current_fixups = STRBUF_INIT }
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +053077
Alban Gruin5d94d542018-12-29 17:03:59 +010078/*
79 * Note that ordering matters in this enum. Not only must it match the mapping
80 * of todo_command_info (in sequencer.c), it is also divided into several
81 * sections that matter. When adding new commands, make sure you add it in the
82 * right section.
83 */
84enum todo_command {
85 /* commands that handle commits */
86 TODO_PICK = 0,
87 TODO_REVERT,
88 TODO_EDIT,
89 TODO_REWORD,
90 TODO_FIXUP,
91 TODO_SQUASH,
92 /* commands that do something else than handling a single commit */
93 TODO_EXEC,
94 TODO_BREAK,
95 TODO_LABEL,
96 TODO_RESET,
97 TODO_MERGE,
98 /* commands that do nothing but are counted for reporting progress */
99 TODO_NOOP,
100 TODO_DROP,
101 /* comments (not counted for reporting progress) */
102 TODO_COMMENT
Alban Gruin44b776c2018-08-10 18:51:28 +0200103};
104
Alban Gruin5d94d542018-12-29 17:03:59 +0100105struct todo_item {
106 enum todo_command command;
107 struct commit *commit;
108 unsigned int flags;
Alban Gruin5d94d542018-12-29 17:03:59 +0100109 int arg_len;
Alban Gruin6ad656d2019-01-29 16:01:46 +0100110 /* The offset of the command and its argument in the strbuf */
111 size_t offset_in_buf, arg_offset;
Alban Gruin5d94d542018-12-29 17:03:59 +0100112};
113
114struct todo_list {
115 struct strbuf buf;
116 struct todo_item *items;
117 int nr, alloc, current;
118 int done_nr, total_nr;
119 struct stat_data stat;
120};
121
122#define TODO_LIST_INIT { STRBUF_INIT }
123
124int todo_list_parse_insn_buffer(struct repository *r, char *buf,
125 struct todo_list *todo_list);
Alban Gruin616d7742019-01-29 16:01:48 +0100126int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
127 const char *file, const char *shortrevisions,
128 const char *shortonto, int num, unsigned flags);
Alban Gruin5d94d542018-12-29 17:03:59 +0100129void todo_list_release(struct todo_list *todo_list);
Alban Gruin6ad656d2019-01-29 16:01:46 +0100130const char *todo_item_get_arg(struct todo_list *todo_list,
131 struct todo_item *item);
Alban Gruin44b776c2018-08-10 18:51:28 +0200132
Phillip Wood28d6dae2017-12-13 11:46:21 +0000133/* Call this to setup defaults before parsing command line options */
134void sequencer_init_config(struct replay_opts *opts);
Nguyễn Thái Ngọc Duyf11c9582018-11-10 06:48:56 +0100135int sequencer_pick_revisions(struct repository *repo,
136 struct replay_opts *opts);
137int sequencer_continue(struct repository *repo, struct replay_opts *opts);
Nguyễn Thái Ngọc Duy005af332018-11-10 06:48:57 +0100138int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
Rohit Ashiwalde81ca32019-07-02 14:41:28 +0530139int sequencer_skip(struct repository *repo, struct replay_opts *opts);
Johannes Schindelin28635842016-10-21 14:24:55 +0200140int sequencer_remove_state(struct replay_opts *opts);
Ramkumar Ramachandra043a4492012-01-11 23:45:57 +0530141
Elijah Newrenb9cbd292020-04-11 02:44:25 +0000142#define TODO_LIST_KEEP_EMPTY (1U << 0)
Liam Beguin313a48e2017-12-05 12:52:32 -0500143#define TODO_LIST_SHORTEN_IDS (1U << 1)
Liam Beguind8ae6c82017-12-05 12:52:34 -0500144#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
Johannes Schindelin1644c732018-04-25 14:29:03 +0200145#define TODO_LIST_REBASE_MERGES (1U << 3)
Johannes Schindelin7543f6f2018-04-25 14:29:40 +0200146/*
147 * When rebasing merges, commits that do have the base commit as ancestor
148 * ("cousins") are *not* rebased onto the new base by default. If those
149 * commits should be rebased onto the new base, this flag needs to be passed.
150 */
151#define TODO_LIST_REBASE_COUSINS (1U << 4)
Alban Gruin616d7742019-01-29 16:01:48 +0100152#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
Johannes Schindeline1fac532019-07-31 08:18:49 -0700153/*
154 * When generating a script that rebases merges with `--root` *and* with
155 * `--onto`, we do not want to re-generate the root commits.
156 */
157#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
Jonathan Tan0fcb4f62020-04-11 02:44:27 +0000158#define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7)
Johannes Schindelin62db5242017-07-14 16:44:58 +0200159
Alban Gruind358fc22019-03-05 20:17:56 +0100160int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
161 const char **argv, unsigned flags);
Brandon Caseybab4d102013-02-12 02:17:35 -0800162
Alban Gruin1ba204d2019-03-05 20:17:58 +0100163void todo_list_add_exec_commands(struct todo_list *todo_list,
164 struct string_list *commands);
Nguyễn Thái Ngọc Duy005af332018-11-10 06:48:57 +0100165int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
Alban Gruinb97e1872018-08-28 14:10:36 +0200166 const char *shortrevisions, const char *onto_name,
Phillip Woodf3e27a02020-11-04 15:29:38 +0000167 struct commit *onto, const struct object_id *orig_head,
168 struct string_list *commands, unsigned autosquash,
169 struct todo_list *todo_list);
Alban Gruin79d7e882019-03-05 20:17:59 +0100170int todo_list_rearrange_squash(struct todo_list *todo_list);
Johannes Schindelin3546c8d2017-07-14 16:45:11 +0200171
Jeff King66e83d92018-08-22 20:50:51 -0400172/*
173 * Append a signoff to the commit message in "msgbuf". The ignore_footer
174 * parameter specifies the number of bytes at the end of msgbuf that should
175 * not be considered at all. I.e., they are not checked for existing trailers,
176 * and the new signoff will be spliced into the buffer before those bytes.
177 */
178void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
179
Denton Liu1a2b9852019-04-17 11:23:30 +0100180void append_conflicts_hint(struct index_state *istate,
181 struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode);
Denton Liuf29cd862019-04-17 11:23:25 +0100182enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg,
183 int use_editor);
184
185void cleanup_message(struct strbuf *msgbuf,
186 enum commit_msg_cleanup_mode cleanup_mode, int verbose);
187
Phillip Woodd0aaa462017-11-10 11:09:42 +0000188int message_is_empty(const struct strbuf *sb,
189 enum commit_msg_cleanup_mode cleanup_mode);
190int template_untouched(const struct strbuf *sb, const char *template_file,
191 enum commit_msg_cleanup_mode cleanup_mode);
Phillip Wood0505d602017-11-17 11:34:47 +0000192int update_head_with_reflog(const struct commit *old_head,
193 const struct object_id *new_head,
194 const char *action, const struct strbuf *msg,
195 struct strbuf *err);
Nguyễn Thái Ngọc Duy1d18d752019-01-12 09:13:23 +0700196void commit_post_rewrite(struct repository *r,
197 const struct commit *current_head,
Phillip Wooda87a6f32017-11-17 11:34:48 +0000198 const struct object_id *new_head);
Miklos Vajna5ed75e22012-09-14 08:52:03 +0200199
Denton Liu0816f1d2020-04-07 10:28:03 -0400200void create_autostash(struct repository *r, const char *path,
201 const char *default_reflog_action);
Denton Liu12b6e132020-04-07 10:28:05 -0400202int save_autostash(const char *path);
Denton Liu86ed00a2020-04-07 10:27:58 -0400203int apply_autostash(const char *path);
Denton Liu804fe312020-04-07 10:28:06 -0400204int apply_autostash_oid(const char *stash_oid);
Denton Liu86ed00a2020-04-07 10:27:58 -0400205
Phillip Woode47c6ca2017-11-24 11:07:54 +0000206#define SUMMARY_INITIAL_COMMIT (1 << 0)
207#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
Nguyễn Thái Ngọc Duyf11c9582018-11-10 06:48:56 +0100208void print_commit_summary(struct repository *repo,
209 const char *prefix,
210 const struct object_id *oid,
Phillip Woode47c6ca2017-11-24 11:07:54 +0000211 unsigned int flags);
Phillip Woodbcd33ec2018-10-31 10:15:55 +0000212
Denton Liuc20de8b2020-04-07 10:27:54 -0400213#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0)
214#define READ_ONELINER_WARN_MISSING (1 << 1)
215
216/*
217 * Reads a file that was presumably written by a shell script, i.e. with an
218 * end-of-line marker that needs to be stripped.
219 *
220 * Note that only the last end-of-line marker is stripped, consistent with the
221 * behavior of "$(cat path)" in a shell script.
222 *
223 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
224 */
225int read_oneliner(struct strbuf *buf,
226 const char *path, unsigned flags);
Phillip Woodbcd33ec2018-10-31 10:15:55 +0000227int read_author_script(const char *path, char **name, char **email, char **date,
228 int allow_missing);
Alban Gruin65850682018-08-28 14:10:40 +0200229void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
230int write_basic_state(struct replay_opts *opts, const char *head_name,
Phillip Wooda2bb10d2020-11-04 15:29:39 +0000231 struct commit *onto, const struct object_id *orig_head);
Junio C Hamanof496b062019-07-09 15:25:44 -0700232void sequencer_post_commit_cleanup(struct repository *r, int verbose);
Phillip Wood4a724862019-04-16 11:18:42 +0100233int sequencer_get_last_command(struct repository* r,
234 enum replay_action *action);
Phillip Wood901ba7b2019-12-06 16:06:11 +0000235int sequencer_determine_whence(struct repository *r, enum commit_whence *whence);
Phillip Wood12bb7a52019-10-15 10:25:30 +0000236#endif /* SEQUENCER_H */