]> git.ipfire.org Git - thirdparty/git.git/blame - sequencer.h
completion: nounset mode fixes
[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
RR
33
34 /* Boolean options */
35 int edit;
36 int record_origin;
37 int no_commit;
38 int signoff;
39 int allow_ff;
40 int allow_rerere_auto;
df478b74 41 int allow_empty;
4bee9584 42 int allow_empty_message;
e98c4269 43 int drop_redundant_commits;
b27cfb0d 44 int keep_redundant_commits;
556907f1 45 int verbose;
899b49c4 46 int quiet;
d421afa0 47 int reschedule_failed_exec;
043a4492
RR
48
49 int mainline;
50
03a4e260 51 char *gpg_sign;
28d6daed 52 enum commit_msg_cleanup_mode default_msg_cleanup;
d74f3e58 53 int explicit_cleanup;
3253553e 54
043a4492 55 /* Merge strategy */
03a4e260
JS
56 char *strategy;
57 char **xopts;
043a4492
RR
58 size_t xopts_nr, xopts_alloc;
59
e12a7ef5
JS
60 /* Used by fixup/squash */
61 struct strbuf current_fixups;
62 int current_fixup_count;
63
d87d48b2
JS
64 /* placeholder commit for -i --root */
65 struct object_id squash_onto;
66 int have_squash_onto;
67
043a4492
RR
68 /* Only used by REPLAY_NONE */
69 struct rev_info *revs;
70};
e12a7ef5 71#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
043a4492 72
5d94d545
AG
73/*
74 * Note that ordering matters in this enum. Not only must it match the mapping
75 * of todo_command_info (in sequencer.c), it is also divided into several
76 * sections that matter. When adding new commands, make sure you add it in the
77 * right section.
78 */
79enum todo_command {
80 /* commands that handle commits */
81 TODO_PICK = 0,
82 TODO_REVERT,
83 TODO_EDIT,
84 TODO_REWORD,
85 TODO_FIXUP,
86 TODO_SQUASH,
87 /* commands that do something else than handling a single commit */
88 TODO_EXEC,
89 TODO_BREAK,
90 TODO_LABEL,
91 TODO_RESET,
92 TODO_MERGE,
93 /* commands that do nothing but are counted for reporting progress */
94 TODO_NOOP,
95 TODO_DROP,
96 /* comments (not counted for reporting progress) */
97 TODO_COMMENT
44b776c3
AG
98};
99
5d94d545
AG
100struct todo_item {
101 enum todo_command command;
102 struct commit *commit;
103 unsigned int flags;
5d94d545 104 int arg_len;
6ad656db
AG
105 /* The offset of the command and its argument in the strbuf */
106 size_t offset_in_buf, arg_offset;
5d94d545
AG
107};
108
109struct todo_list {
110 struct strbuf buf;
111 struct todo_item *items;
112 int nr, alloc, current;
113 int done_nr, total_nr;
114 struct stat_data stat;
115};
116
117#define TODO_LIST_INIT { STRBUF_INIT }
118
119int todo_list_parse_insn_buffer(struct repository *r, char *buf,
120 struct todo_list *todo_list);
616d7740
AG
121int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
122 const char *file, const char *shortrevisions,
123 const char *shortonto, int num, unsigned flags);
5d94d545 124void todo_list_release(struct todo_list *todo_list);
6ad656db
AG
125const char *todo_item_get_arg(struct todo_list *todo_list,
126 struct todo_item *item);
44b776c3 127
28d6daed
PW
128/* Call this to setup defaults before parsing command line options */
129void sequencer_init_config(struct replay_opts *opts);
f11c9580
NTND
130int sequencer_pick_revisions(struct repository *repo,
131 struct replay_opts *opts);
132int sequencer_continue(struct repository *repo, struct replay_opts *opts);
005af339 133int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
de81ca3f 134int sequencer_skip(struct repository *repo, struct replay_opts *opts);
2863584f 135int sequencer_remove_state(struct replay_opts *opts);
043a4492 136
b9cbd295 137#define TODO_LIST_KEEP_EMPTY (1U << 0)
313a48ea 138#define TODO_LIST_SHORTEN_IDS (1U << 1)
d8ae6c84 139#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
1644c73c 140#define TODO_LIST_REBASE_MERGES (1U << 3)
7543f6f4
JS
141/*
142 * When rebasing merges, commits that do have the base commit as ancestor
143 * ("cousins") are *not* rebased onto the new base by default. If those
144 * commits should be rebased onto the new base, this flag needs to be passed.
145 */
146#define TODO_LIST_REBASE_COUSINS (1U << 4)
616d7740 147#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
e1fac531
JS
148/*
149 * When generating a script that rebases merges with `--root` *and* with
150 * `--onto`, we do not want to re-generate the root commits.
151 */
152#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
0fcb4f6b 153#define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7)
616d7740 154
d358fc28
AG
155int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
156 const char **argv, unsigned flags);
62db5247 157
1ba204de
AG
158void todo_list_add_exec_commands(struct todo_list *todo_list,
159 struct string_list *commands);
005af339 160int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
b97e1873 161 const char *shortrevisions, const char *onto_name,
7d3488eb 162 struct commit *onto, const char *orig_head, struct string_list *commands,
94bcad79 163 unsigned autosquash, struct todo_list *todo_list);
79d7e883 164int todo_list_rearrange_squash(struct todo_list *todo_list);
3546c8d9 165
66e83d9b
JK
166/*
167 * Append a signoff to the commit message in "msgbuf". The ignore_footer
168 * parameter specifies the number of bytes at the end of msgbuf that should
169 * not be considered at all. I.e., they are not checked for existing trailers,
170 * and the new signoff will be spliced into the buffer before those bytes.
171 */
172void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
173
1a2b985f
DL
174void append_conflicts_hint(struct index_state *istate,
175 struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode);
f29cd862
DL
176enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg,
177 int use_editor);
178
179void cleanup_message(struct strbuf *msgbuf,
180 enum commit_msg_cleanup_mode cleanup_mode, int verbose);
181
d0aaa46f
PW
182int message_is_empty(const struct strbuf *sb,
183 enum commit_msg_cleanup_mode cleanup_mode);
184int template_untouched(const struct strbuf *sb, const char *template_file,
185 enum commit_msg_cleanup_mode cleanup_mode);
0505d604
PW
186int update_head_with_reflog(const struct commit *old_head,
187 const struct object_id *new_head,
188 const char *action, const struct strbuf *msg,
189 struct strbuf *err);
1d18d758
NTND
190void commit_post_rewrite(struct repository *r,
191 const struct commit *current_head,
a87a6f3c 192 const struct object_id *new_head);
5ed75e2a 193
0816f1df
DL
194void create_autostash(struct repository *r, const char *path,
195 const char *default_reflog_action);
12b6e136 196int save_autostash(const char *path);
86ed00af 197int apply_autostash(const char *path);
804fe315 198int apply_autostash_oid(const char *stash_oid);
86ed00af 199
e47c6caf
PW
200#define SUMMARY_INITIAL_COMMIT (1 << 0)
201#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
f11c9580
NTND
202void print_commit_summary(struct repository *repo,
203 const char *prefix,
204 const struct object_id *oid,
e47c6caf 205 unsigned int flags);
bcd33ec2 206
c20de8be
DL
207#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0)
208#define READ_ONELINER_WARN_MISSING (1 << 1)
209
210/*
211 * Reads a file that was presumably written by a shell script, i.e. with an
212 * end-of-line marker that needs to be stripped.
213 *
214 * Note that only the last end-of-line marker is stripped, consistent with the
215 * behavior of "$(cat path)" in a shell script.
216 *
217 * Returns 1 if the file was read, 0 if it could not be read or does not exist.
218 */
219int read_oneliner(struct strbuf *buf,
220 const char *path, unsigned flags);
bcd33ec2
PW
221int read_author_script(const char *path, char **name, char **email, char **date,
222 int allow_missing);
65850686
AG
223void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
224int write_basic_state(struct replay_opts *opts, const char *head_name,
7d3488eb 225 struct commit *onto, const char *orig_head);
f496b064 226void sequencer_post_commit_cleanup(struct repository *r, int verbose);
4a72486d
PW
227int sequencer_get_last_command(struct repository* r,
228 enum replay_action *action);
901ba7b1 229int sequencer_determine_whence(struct repository *r, enum commit_whence *whence);
12bb7a54 230#endif /* SEQUENCER_H */