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