]> git.ipfire.org Git - thirdparty/git.git/blame - sequencer.h
reftable: fix resource leak in block.c error path
[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;
043a4492
RR
52
53 int mainline;
54
03a4e260 55 char *gpg_sign;
28d6daed 56 enum commit_msg_cleanup_mode default_msg_cleanup;
d74f3e58 57 int explicit_cleanup;
3253553e 58
043a4492 59 /* Merge strategy */
14c4586c 60 char *default_strategy; /* from config options */
03a4e260
JS
61 char *strategy;
62 char **xopts;
043a4492
RR
63 size_t xopts_nr, xopts_alloc;
64
e12a7ef5
JS
65 /* Used by fixup/squash */
66 struct strbuf current_fixups;
67 int current_fixup_count;
68
d87d48b2
JS
69 /* placeholder commit for -i --root */
70 struct object_id squash_onto;
71 int have_squash_onto;
72
043a4492
RR
73 /* Only used by REPLAY_NONE */
74 struct rev_info *revs;
75};
39edfd5c 76#define REPLAY_OPTS_INIT { .edit = -1, .action = -1, .current_fixups = STRBUF_INIT }
043a4492 77
5d94d545
AG
78/*
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
44b776c3
AG
103};
104
5d94d545
AG
105struct todo_item {
106 enum todo_command command;
107 struct commit *commit;
108 unsigned int flags;
5d94d545 109 int arg_len;
6ad656db
AG
110 /* The offset of the command and its argument in the strbuf */
111 size_t offset_in_buf, arg_offset;
5d94d545
AG
112};
113
114struct todo_list {
115 struct strbuf buf;
116 struct todo_item *items;
117 int nr, alloc, current;
118 int done_nr, total_nr;
5d94d545
AG
119};
120
f69a6e4f
ÆAB
121#define TODO_LIST_INIT { \
122 .buf = STRBUF_INIT, \
123}
5d94d545
AG
124
125int todo_list_parse_insn_buffer(struct repository *r, char *buf,
126 struct todo_list *todo_list);
616d7740
AG
127int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
128 const char *file, const char *shortrevisions,
129 const char *shortonto, int num, unsigned flags);
5d94d545 130void todo_list_release(struct todo_list *todo_list);
6ad656db
AG
131const char *todo_item_get_arg(struct todo_list *todo_list,
132 struct todo_item *item);
44b776c3 133
28d6daed
PW
134/* Call this to setup defaults before parsing command line options */
135void sequencer_init_config(struct replay_opts *opts);
f11c9580
NTND
136int sequencer_pick_revisions(struct repository *repo,
137 struct replay_opts *opts);
138int sequencer_continue(struct repository *repo, struct replay_opts *opts);
005af339 139int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
de81ca3f 140int sequencer_skip(struct repository *repo, struct replay_opts *opts);
2863584f 141int sequencer_remove_state(struct replay_opts *opts);
043a4492 142
b9cbd295 143#define TODO_LIST_KEEP_EMPTY (1U << 0)
313a48ea 144#define TODO_LIST_SHORTEN_IDS (1U << 1)
d8ae6c84 145#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
1644c73c 146#define TODO_LIST_REBASE_MERGES (1U << 3)
7543f6f4
JS
147/*
148 * When rebasing merges, commits that do have the base commit as ancestor
149 * ("cousins") are *not* rebased onto the new base by default. If those
150 * commits should be rebased onto the new base, this flag needs to be passed.
151 */
152#define TODO_LIST_REBASE_COUSINS (1U << 4)
616d7740 153#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
e1fac531
JS
154/*
155 * When generating a script that rebases merges with `--root` *and* with
156 * `--onto`, we do not want to re-generate the root commits.
157 */
158#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
0fcb4f6b 159#define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7)
767a4ca6 160#define TODO_LIST_WARN_SKIPPED_CHERRY_PICKS (1U << 8)
616d7740 161
d358fc28
AG
162int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
163 const char **argv, unsigned flags);
62db5247 164
005af339 165int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
b97e1873 166 const char *shortrevisions, const char *onto_name,
f3e27a02
PW
167 struct commit *onto, const struct object_id *orig_head,
168 struct string_list *commands, unsigned autosquash,
169 struct todo_list *todo_list);
79d7e883 170int todo_list_rearrange_squash(struct todo_list *todo_list);
3546c8d9 171
66e83d9b
JK
172/*
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
1a2b985f
DL
180void append_conflicts_hint(struct index_state *istate,
181 struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode);
f29cd862
DL
182enum 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
d0aaa46f
PW
188int 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);
0505d604
PW
192int 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);
1d18d758
NTND
196void commit_post_rewrite(struct repository *r,
197 const struct commit *current_head,
a87a6f3c 198 const struct object_id *new_head);
5ed75e2a 199
0816f1df
DL
200void create_autostash(struct repository *r, const char *path,
201 const char *default_reflog_action);
12b6e136 202int save_autostash(const char *path);
86ed00af 203int apply_autostash(const char *path);
804fe315 204int apply_autostash_oid(const char *stash_oid);
86ed00af 205
e47c6caf
PW
206#define SUMMARY_INITIAL_COMMIT (1 << 0)
207#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
f11c9580
NTND
208void print_commit_summary(struct repository *repo,
209 const char *prefix,
210 const struct object_id *oid,
e47c6caf 211 unsigned int flags);
bcd33ec2 212
c20de8be
DL
213#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);
bcd33ec2
PW
227int read_author_script(const char *path, char **name, char **email, char **date,
228 int allow_missing);
65850686
AG
229void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
230int write_basic_state(struct replay_opts *opts, const char *head_name,
a2bb10d0 231 struct commit *onto, const struct object_id *orig_head);
f496b064 232void sequencer_post_commit_cleanup(struct repository *r, int verbose);
4a72486d
PW
233int sequencer_get_last_command(struct repository* r,
234 enum replay_action *action);
901ba7b1 235int sequencer_determine_whence(struct repository *r, enum commit_whence *whence);
12bb7a54 236#endif /* SEQUENCER_H */