Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal
[git/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"
6
7struct commit;
f11c9580 8struct repository;
ef3ca954 9
66618a50 10const char *git_path_commit_editmsg(void);
8a2a0f53 11const char *git_path_seq_dir(void);
44b776c3 12const char *rebase_path_todo(void);
a930eb03 13const char *rebase_path_todo_backup(void);
26ae337b 14
bab4d109
BC
15#define APPEND_SIGNOFF_DEDUP (1u << 0)
16
043a4492
RR
17enum replay_action {
18 REPLAY_REVERT,
84583957
JS
19 REPLAY_PICK,
20 REPLAY_INTERACTIVE_REBASE
043a4492
RR
21};
22
28d6daed
PW
23enum commit_msg_cleanup_mode {
24 COMMIT_MSG_CLEANUP_SPACE,
25 COMMIT_MSG_CLEANUP_NONE,
26 COMMIT_MSG_CLEANUP_SCISSORS,
27 COMMIT_MSG_CLEANUP_ALL
28};
29
043a4492
RR
30struct replay_opts {
31 enum replay_action action;
043a4492
RR
32
33 /* Boolean options */
34 int edit;
35 int record_origin;
36 int no_commit;
37 int signoff;
38 int allow_ff;
39 int allow_rerere_auto;
df478b74 40 int allow_empty;
4bee9584 41 int allow_empty_message;
b27cfb0d 42 int keep_redundant_commits;
556907f1 43 int verbose;
899b49c4 44 int quiet;
d421afa0 45 int reschedule_failed_exec;
043a4492
RR
46
47 int mainline;
48
03a4e260 49 char *gpg_sign;
28d6daed 50 enum commit_msg_cleanup_mode default_msg_cleanup;
3253553e 51
043a4492 52 /* Merge strategy */
03a4e260
JS
53 char *strategy;
54 char **xopts;
043a4492
RR
55 size_t xopts_nr, xopts_alloc;
56
e12a7ef5
JS
57 /* Used by fixup/squash */
58 struct strbuf current_fixups;
59 int current_fixup_count;
60
d87d48b2
JS
61 /* placeholder commit for -i --root */
62 struct object_id squash_onto;
63 int have_squash_onto;
64
043a4492
RR
65 /* Only used by REPLAY_NONE */
66 struct rev_info *revs;
67};
e12a7ef5 68#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
043a4492 69
5d94d545
AG
70/*
71 * Note that ordering matters in this enum. Not only must it match the mapping
72 * of todo_command_info (in sequencer.c), it is also divided into several
73 * sections that matter. When adding new commands, make sure you add it in the
74 * right section.
75 */
76enum todo_command {
77 /* commands that handle commits */
78 TODO_PICK = 0,
79 TODO_REVERT,
80 TODO_EDIT,
81 TODO_REWORD,
82 TODO_FIXUP,
83 TODO_SQUASH,
84 /* commands that do something else than handling a single commit */
85 TODO_EXEC,
86 TODO_BREAK,
87 TODO_LABEL,
88 TODO_RESET,
89 TODO_MERGE,
90 /* commands that do nothing but are counted for reporting progress */
91 TODO_NOOP,
92 TODO_DROP,
93 /* comments (not counted for reporting progress) */
94 TODO_COMMENT
44b776c3
AG
95};
96
5d94d545
AG
97struct todo_item {
98 enum todo_command command;
99 struct commit *commit;
100 unsigned int flags;
5d94d545 101 int arg_len;
6ad656db
AG
102 /* The offset of the command and its argument in the strbuf */
103 size_t offset_in_buf, arg_offset;
5d94d545
AG
104};
105
106struct todo_list {
107 struct strbuf buf;
108 struct todo_item *items;
109 int nr, alloc, current;
110 int done_nr, total_nr;
111 struct stat_data stat;
112};
113
114#define TODO_LIST_INIT { STRBUF_INIT }
115
116int todo_list_parse_insn_buffer(struct repository *r, char *buf,
117 struct todo_list *todo_list);
616d7740
AG
118int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
119 const char *file, const char *shortrevisions,
120 const char *shortonto, int num, unsigned flags);
5d94d545 121void todo_list_release(struct todo_list *todo_list);
6ad656db
AG
122const char *todo_item_get_arg(struct todo_list *todo_list,
123 struct todo_item *item);
44b776c3 124
28d6daed
PW
125/* Call this to setup defaults before parsing command line options */
126void sequencer_init_config(struct replay_opts *opts);
f11c9580
NTND
127int sequencer_pick_revisions(struct repository *repo,
128 struct replay_opts *opts);
129int sequencer_continue(struct repository *repo, struct replay_opts *opts);
005af339 130int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
2863584f 131int sequencer_remove_state(struct replay_opts *opts);
043a4492 132
313a48ea
LB
133#define TODO_LIST_KEEP_EMPTY (1U << 0)
134#define TODO_LIST_SHORTEN_IDS (1U << 1)
d8ae6c84 135#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
1644c73c 136#define TODO_LIST_REBASE_MERGES (1U << 3)
7543f6f4
JS
137/*
138 * When rebasing merges, commits that do have the base commit as ancestor
139 * ("cousins") are *not* rebased onto the new base by default. If those
140 * commits should be rebased onto the new base, this flag needs to be passed.
141 */
142#define TODO_LIST_REBASE_COUSINS (1U << 4)
616d7740
AG
143#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
144
d358fc28
AG
145int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
146 const char **argv, unsigned flags);
62db5247 147
1ba204de
AG
148void todo_list_add_exec_commands(struct todo_list *todo_list,
149 struct string_list *commands);
6ca89c6f 150int check_todo_list_from_file(struct repository *r);
005af339 151int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
b97e1873 152 const char *shortrevisions, const char *onto_name,
683153a4 153 const char *onto, const char *orig_head, struct string_list *commands,
94bcad79 154 unsigned autosquash, struct todo_list *todo_list);
79d7e883 155int todo_list_rearrange_squash(struct todo_list *todo_list);
3546c8d9 156
66e83d9b
JK
157/*
158 * Append a signoff to the commit message in "msgbuf". The ignore_footer
159 * parameter specifies the number of bytes at the end of msgbuf that should
160 * not be considered at all. I.e., they are not checked for existing trailers,
161 * and the new signoff will be spliced into the buffer before those bytes.
162 */
163void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
164
f11c9580 165void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf);
d0aaa46f
PW
166int message_is_empty(const struct strbuf *sb,
167 enum commit_msg_cleanup_mode cleanup_mode);
168int template_untouched(const struct strbuf *sb, const char *template_file,
169 enum commit_msg_cleanup_mode cleanup_mode);
0505d604
PW
170int update_head_with_reflog(const struct commit *old_head,
171 const struct object_id *new_head,
172 const char *action, const struct strbuf *msg,
173 struct strbuf *err);
1d18d758
NTND
174void commit_post_rewrite(struct repository *r,
175 const struct commit *current_head,
a87a6f3c 176 const struct object_id *new_head);
5ed75e2a 177
2c58483a
AG
178int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);
179
e47c6caf
PW
180#define SUMMARY_INITIAL_COMMIT (1 << 0)
181#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
f11c9580
NTND
182void print_commit_summary(struct repository *repo,
183 const char *prefix,
184 const struct object_id *oid,
e47c6caf 185 unsigned int flags);
bcd33ec2
PW
186
187int read_author_script(const char *path, char **name, char **email, char **date,
188 int allow_missing);
26ae337b 189#endif
65850686
AG
190
191void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
192int write_basic_state(struct replay_opts *opts, const char *head_name,
193 const char *onto, const char *orig_head);