]> git.ipfire.org Git - thirdparty/git.git/blame - sequencer.h
treewide: remove unnecessary git-compat-util.h includes in headers
[thirdparty/git.git] / sequencer.h
CommitLineData
26ae337b
RR
1#ifndef SEQUENCER_H
2#define SEQUENCER_H
3
ef3ca954
EN
4#include "cache.h"
5#include "strbuf.h"
901ba7b1 6#include "wt-status.h"
ef3ca954
EN
7
8struct commit;
f11c9580 9struct repository;
ef3ca954 10
66618a50 11const char *git_path_commit_editmsg(void);
44b776c3 12const char *rebase_path_todo(void);
a930eb03 13const char *rebase_path_todo_backup(void);
5a5445d8 14const char *rebase_path_dropped(void);
26ae337b 15
bab4d109
BC
16#define APPEND_SIGNOFF_DEDUP (1u << 0)
17
043a4492
RR
18enum replay_action {
19 REPLAY_REVERT,
84583957
JS
20 REPLAY_PICK,
21 REPLAY_INTERACTIVE_REBASE
043a4492
RR
22};
23
28d6daed
PW
24enum 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
043a4492
RR
31struct replay_opts {
32 enum replay_action action;
043a4492 33
39edfd5c 34 /* Tri-state options: unspecified, false, or true */
043a4492 35 int edit;
39edfd5c
EN
36
37 /* Boolean options */
043a4492
RR
38 int record_origin;
39 int no_commit;
40 int signoff;
41 int allow_ff;
42 int allow_rerere_auto;
df478b74 43 int allow_empty;
4bee9584 44 int allow_empty_message;
e98c4269 45 int drop_redundant_commits;
b27cfb0d 46 int keep_redundant_commits;
556907f1 47 int verbose;
899b49c4 48 int quiet;
d421afa0 49 int reschedule_failed_exec;
7573cec5 50 int committer_date_is_author_date;
a3894aad 51 int ignore_date;
43966ab3 52 int commit_use_reference;
043a4492
RR
53
54 int mainline;
55
03a4e260 56 char *gpg_sign;
28d6daed 57 enum commit_msg_cleanup_mode default_msg_cleanup;
d74f3e58 58 int explicit_cleanup;
3253553e 59
043a4492 60 /* Merge strategy */
14c4586c 61 char *default_strategy; /* from config options */
03a4e260
JS
62 char *strategy;
63 char **xopts;
043a4492
RR
64 size_t xopts_nr, xopts_alloc;
65
d188a60d
PW
66 /* Reflog */
67 char *reflog_action;
68
e12a7ef5
JS
69 /* Used by fixup/squash */
70 struct strbuf current_fixups;
71 int current_fixup_count;
72
d87d48b2
JS
73 /* placeholder commit for -i --root */
74 struct object_id squash_onto;
75 int have_squash_onto;
76
043a4492
RR
77 /* Only used by REPLAY_NONE */
78 struct rev_info *revs;
d188a60d
PW
79
80 /* Private use */
81 const char *reflog_message;
043a4492 82};
39edfd5c 83#define REPLAY_OPTS_INIT { .edit = -1, .action = -1, .current_fixups = STRBUF_INIT }
043a4492 84
5d94d545
AG
85/*
86 * Note that ordering matters in this enum. Not only must it match the mapping
87 * of todo_command_info (in sequencer.c), it is also divided into several
88 * sections that matter. When adding new commands, make sure you add it in the
89 * right section.
90 */
91enum todo_command {
92 /* commands that handle commits */
93 TODO_PICK = 0,
94 TODO_REVERT,
95 TODO_EDIT,
96 TODO_REWORD,
97 TODO_FIXUP,
98 TODO_SQUASH,
99 /* commands that do something else than handling a single commit */
100 TODO_EXEC,
101 TODO_BREAK,
102 TODO_LABEL,
103 TODO_RESET,
104 TODO_MERGE,
a97d7916 105 TODO_UPDATE_REF,
5d94d545
AG
106 /* commands that do nothing but are counted for reporting progress */
107 TODO_NOOP,
108 TODO_DROP,
109 /* comments (not counted for reporting progress) */
110 TODO_COMMENT
44b776c3
AG
111};
112
5d94d545
AG
113struct todo_item {
114 enum todo_command command;
115 struct commit *commit;
116 unsigned int flags;
5d94d545 117 int arg_len;
6ad656db
AG
118 /* The offset of the command and its argument in the strbuf */
119 size_t offset_in_buf, arg_offset;
5d94d545
AG
120};
121
122struct todo_list {
123 struct strbuf buf;
124 struct todo_item *items;
125 int nr, alloc, current;
126 int done_nr, total_nr;
5d94d545
AG
127};
128
f69a6e4f
ÆAB
129#define TODO_LIST_INIT { \
130 .buf = STRBUF_INIT, \
131}
5d94d545
AG
132
133int todo_list_parse_insn_buffer(struct repository *r, char *buf,
134 struct todo_list *todo_list);
616d7740
AG
135int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
136 const char *file, const char *shortrevisions,
137 const char *shortonto, int num, unsigned flags);
5d94d545 138void todo_list_release(struct todo_list *todo_list);
6ad656db
AG
139const char *todo_item_get_arg(struct todo_list *todo_list,
140 struct todo_item *item);
44b776c3 141
b3b1a21d
DS
142/*
143 * Parse the update-refs file for the current rebase, then remove the
144 * refs that do not appear in the todo_list (and have not had updated
145 * values stored) and add refs that are in the todo_list but not
146 * represented in the update-refs file.
147 *
148 * If there are changes to the update-refs list, then write the new state
149 * to disk.
150 */
151void todo_list_filter_update_refs(struct repository *r,
152 struct todo_list *todo_list);
153
28d6daed
PW
154/* Call this to setup defaults before parsing command line options */
155void sequencer_init_config(struct replay_opts *opts);
f11c9580
NTND
156int sequencer_pick_revisions(struct repository *repo,
157 struct replay_opts *opts);
158int sequencer_continue(struct repository *repo, struct replay_opts *opts);
005af339 159int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
de81ca3f 160int sequencer_skip(struct repository *repo, struct replay_opts *opts);
9ff2f060 161void replay_opts_release(struct replay_opts *opts);
2863584f 162int sequencer_remove_state(struct replay_opts *opts);
043a4492 163
b9cbd295 164#define TODO_LIST_KEEP_EMPTY (1U << 0)
313a48ea 165#define TODO_LIST_SHORTEN_IDS (1U << 1)
d8ae6c84 166#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
1644c73c 167#define TODO_LIST_REBASE_MERGES (1U << 3)
7543f6f4
JS
168/*
169 * When rebasing merges, commits that do have the base commit as ancestor
170 * ("cousins") are *not* rebased onto the new base by default. If those
171 * commits should be rebased onto the new base, this flag needs to be passed.
172 */
173#define TODO_LIST_REBASE_COUSINS (1U << 4)
616d7740 174#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
e1fac531
JS
175/*
176 * When generating a script that rebases merges with `--root` *and* with
177 * `--onto`, we do not want to re-generate the root commits.
178 */
179#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
0fcb4f6b 180#define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7)
767a4ca6 181#define TODO_LIST_WARN_SKIPPED_CHERRY_PICKS (1U << 8)
616d7740 182
d358fc28
AG
183int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
184 const char **argv, unsigned flags);
62db5247 185
005af339 186int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
b97e1873 187 const char *shortrevisions, const char *onto_name,
f3e27a02
PW
188 struct commit *onto, const struct object_id *orig_head,
189 struct string_list *commands, unsigned autosquash,
900b50c2 190 unsigned update_refs,
f3e27a02 191 struct todo_list *todo_list);
79d7e883 192int todo_list_rearrange_squash(struct todo_list *todo_list);
3546c8d9 193
66e83d9b
JK
194/*
195 * Append a signoff to the commit message in "msgbuf". The ignore_footer
196 * parameter specifies the number of bytes at the end of msgbuf that should
197 * not be considered at all. I.e., they are not checked for existing trailers,
198 * and the new signoff will be spliced into the buffer before those bytes.
199 */
200void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
201
1a2b985f
DL
202void append_conflicts_hint(struct index_state *istate,
203 struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode);
f29cd862
DL
204enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg,
205 int use_editor);
206
207void cleanup_message(struct strbuf *msgbuf,
208 enum commit_msg_cleanup_mode cleanup_mode, int verbose);
209
d0aaa46f
PW
210int message_is_empty(const struct strbuf *sb,
211 enum commit_msg_cleanup_mode cleanup_mode);
212int template_untouched(const struct strbuf *sb, const char *template_file,
213 enum commit_msg_cleanup_mode cleanup_mode);
0505d604
PW
214int update_head_with_reflog(const struct commit *old_head,
215 const struct object_id *new_head,
216 const char *action, const struct strbuf *msg,
217 struct strbuf *err);
1d18d758
NTND
218void commit_post_rewrite(struct repository *r,
219 const struct commit *current_head,
a87a6f3c 220 const struct object_id *new_head);
5ed75e2a 221
b7de153b 222void create_autostash(struct repository *r, const char *path);
12b6e136 223int save_autostash(const char *path);
86ed00af 224int apply_autostash(const char *path);
804fe315 225int apply_autostash_oid(const char *stash_oid);
86ed00af 226
e47c6caf
PW
227#define SUMMARY_INITIAL_COMMIT (1 << 0)
228#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
f11c9580
NTND
229void print_commit_summary(struct repository *repo,
230 const char *prefix,
231 const struct object_id *oid,
e47c6caf 232 unsigned int flags);
bcd33ec2 233
c20de8be
DL
234#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0)
235#define READ_ONELINER_WARN_MISSING (1 << 1)
236
237/*
238 * Reads a file that was presumably written by a shell script, i.e. with an
239 * end-of-line marker that needs to be stripped.
240 *
241 * Note that only the last end-of-line marker is stripped, consistent with the
242 * behavior of "$(cat path)" in a shell script.
243 *
244 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
245 */
246int read_oneliner(struct strbuf *buf,
247 const char *path, unsigned flags);
bcd33ec2
PW
248int read_author_script(const char *path, char **name, char **email, char **date,
249 int allow_missing);
65850686
AG
250void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
251int write_basic_state(struct replay_opts *opts, const char *head_name,
a2bb10d0 252 struct commit *onto, const struct object_id *orig_head);
f496b064 253void sequencer_post_commit_cleanup(struct repository *r, int verbose);
4a72486d
PW
254int sequencer_get_last_command(struct repository* r,
255 enum replay_action *action);
901ba7b1 256int sequencer_determine_whence(struct repository *r, enum commit_whence *whence);
aa7f2fd1
DS
257
258/**
259 * Append the set of ref-OID pairs that are currently stored for the 'git
260 * rebase --update-refs' feature if such a rebase is currently happening.
261 *
262 * Localized to a worktree's git dir.
263 */
264int sequencer_get_update_refs_state(const char *wt_dir, struct string_list *refs);
265
12bb7a54 266#endif /* SEQUENCER_H */