]>
Commit | Line | Data |
---|---|---|
26ae337b | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
697cc8ef | 3 | #include "lockfile.h" |
26ae337b | 4 | #include "dir.h" |
cbd53a21 | 5 | #include "object-store.h" |
043a4492 RR |
6 | #include "object.h" |
7 | #include "commit.h" | |
0505d604 | 8 | #include "sequencer.h" |
043a4492 RR |
9 | #include "tag.h" |
10 | #include "run-command.h" | |
5e3aba33 | 11 | #include "hook.h" |
d807c4a0 | 12 | #include "exec-cmd.h" |
043a4492 RR |
13 | #include "utf8.h" |
14 | #include "cache-tree.h" | |
15 | #include "diff.h" | |
16 | #include "revision.h" | |
17 | #include "rerere.h" | |
14c4586c EN |
18 | #include "merge-ort.h" |
19 | #include "merge-ort-wrappers.h" | |
043a4492 | 20 | #include "refs.h" |
dbbcd44f | 21 | #include "strvec.h" |
a1c75762 | 22 | #include "quote.h" |
967dfd4d | 23 | #include "trailer.h" |
56dc3ab0 | 24 | #include "log-tree.h" |
311af526 | 25 | #include "wt-status.h" |
c44a4c65 | 26 | #include "hashmap.h" |
a87a6f3c PW |
27 | #include "notes-utils.h" |
28 | #include "sigchain.h" | |
9055e401 JS |
29 | #include "unpack-trees.h" |
30 | #include "worktree.h" | |
1644c73c JS |
31 | #include "oidmap.h" |
32 | #include "oidset.h" | |
8315bd20 | 33 | #include "commit-slab.h" |
65b5f948 | 34 | #include "alias.h" |
64043556 | 35 | #include "commit-reach.h" |
b97e1873 | 36 | #include "rebase-interactive.h" |
0816f1df | 37 | #include "reset.h" |
043a4492 RR |
38 | |
39 | #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" | |
26ae337b | 40 | |
5fe81438 | 41 | static const char sign_off_header[] = "Signed-off-by: "; |
cd650a4e | 42 | static const char cherry_picked_prefix[] = "(cherry picked from commit "; |
5ed75e2a | 43 | |
66618a50 PW |
44 | GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG") |
45 | ||
901ba7b1 | 46 | static GIT_PATH_FUNC(git_path_seq_dir, "sequencer") |
8a2a0f53 JS |
47 | |
48 | static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo") | |
49 | static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts") | |
50 | static GIT_PATH_FUNC(git_path_head_file, "sequencer/head") | |
1e41229d | 51 | static GIT_PATH_FUNC(git_path_abort_safety_file, "sequencer/abort-safety") |
f932729c | 52 | |
84583957 JS |
53 | static GIT_PATH_FUNC(rebase_path, "rebase-merge") |
54 | /* | |
55 | * The file containing rebase commands, comments, and empty lines. | |
56 | * This file is created by "git rebase -i" then edited by the user. As | |
57 | * the lines are processed, they are removed from the front of this | |
58 | * file and written to the tail of 'done'. | |
59 | */ | |
44b776c3 | 60 | GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo") |
a930eb03 | 61 | GIT_PATH_FUNC(rebase_path_todo_backup, "rebase-merge/git-rebase-todo.backup") |
b97e1873 | 62 | |
5a5445d8 AG |
63 | GIT_PATH_FUNC(rebase_path_dropped, "rebase-merge/dropped") |
64 | ||
1df6df0c JS |
65 | /* |
66 | * The rebase command lines that have already been processed. A line | |
67 | * is moved here when it is first handled, before any associated user | |
68 | * actions. | |
69 | */ | |
70 | static GIT_PATH_FUNC(rebase_path_done, "rebase-merge/done") | |
ef80069a JS |
71 | /* |
72 | * The file to keep track of how many commands were already processed (e.g. | |
73 | * for the prompt). | |
74 | */ | |
9ad36356 | 75 | static GIT_PATH_FUNC(rebase_path_msgnum, "rebase-merge/msgnum") |
ef80069a JS |
76 | /* |
77 | * The file to keep track of how many commands are to be processed in total | |
78 | * (e.g. for the prompt). | |
79 | */ | |
9ad36356 | 80 | static GIT_PATH_FUNC(rebase_path_msgtotal, "rebase-merge/end") |
6e98de72 JS |
81 | /* |
82 | * The commit message that is planned to be used for any changes that | |
83 | * need to be committed following a user interaction. | |
84 | */ | |
85 | static GIT_PATH_FUNC(rebase_path_message, "rebase-merge/message") | |
86 | /* | |
87 | * The file into which is accumulated the suggested commit message for | |
88 | * squash/fixup commands. When the first of a series of squash/fixups | |
89 | * is seen, the file is created and the commit message from the | |
90 | * previous commit and from the first squash/fixup commit are written | |
91 | * to it. The commit message for each subsequent squash/fixup commit | |
92 | * is appended to the file as it is processed. | |
6e98de72 JS |
93 | */ |
94 | static GIT_PATH_FUNC(rebase_path_squash_msg, "rebase-merge/message-squash") | |
95 | /* | |
96 | * If the current series of squash/fixups has not yet included a squash | |
97 | * command, then this file exists and holds the commit message of the | |
98 | * original "pick" commit. (If the series ends without a "squash" | |
99 | * command, then this can be used as the commit message of the combined | |
100 | * commit without opening the editor.) | |
101 | */ | |
102 | static GIT_PATH_FUNC(rebase_path_fixup_msg, "rebase-merge/message-fixup") | |
e12a7ef5 JS |
103 | /* |
104 | * This file contains the list fixup/squash commands that have been | |
105 | * accumulated into message-fixup or message-squash so far. | |
106 | */ | |
107 | static GIT_PATH_FUNC(rebase_path_current_fixups, "rebase-merge/current-fixups") | |
b5a67045 JS |
108 | /* |
109 | * A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and | |
110 | * GIT_AUTHOR_DATE that will be used for the commit that is currently | |
111 | * being rebased. | |
112 | */ | |
113 | static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script") | |
56dc3ab0 JS |
114 | /* |
115 | * When an "edit" rebase command is being processed, the SHA1 of the | |
116 | * commit to be edited is recorded in this file. When "git rebase | |
117 | * --continue" is executed, if there are any staged changes then they | |
118 | * will be amended to the HEAD commit, but only provided the HEAD | |
119 | * commit is still the commit to be edited. When any other rebase | |
120 | * command is processed, this file is deleted. | |
121 | */ | |
122 | static GIT_PATH_FUNC(rebase_path_amend, "rebase-merge/amend") | |
123 | /* | |
124 | * When we stop at a given patch via the "edit" command, this file contains | |
0512eabd | 125 | * the commit object name of the corresponding patch. |
56dc3ab0 JS |
126 | */ |
127 | static GIT_PATH_FUNC(rebase_path_stopped_sha, "rebase-merge/stopped-sha") | |
25cb8df9 JS |
128 | /* |
129 | * For the post-rewrite hook, we make a list of rewritten commits and | |
130 | * their new sha1s. The rewritten-pending list keeps the sha1s of | |
131 | * commits that have been processed, but not committed yet, | |
132 | * e.g. because they are waiting for a 'squash' command. | |
133 | */ | |
134 | static GIT_PATH_FUNC(rebase_path_rewritten_list, "rebase-merge/rewritten-list") | |
135 | static GIT_PATH_FUNC(rebase_path_rewritten_pending, | |
136 | "rebase-merge/rewritten-pending") | |
9055e401 | 137 | |
d87d48b2 | 138 | /* |
15beaaa3 | 139 | * The path of the file containing the OID of the "squash onto" commit, i.e. |
d87d48b2 JS |
140 | * the dummy commit used for `reset [new root]`. |
141 | */ | |
142 | static GIT_PATH_FUNC(rebase_path_squash_onto, "rebase-merge/squash-onto") | |
143 | ||
9055e401 JS |
144 | /* |
145 | * The path of the file listing refs that need to be deleted after the rebase | |
146 | * finishes. This is used by the `label` command to record the need for cleanup. | |
147 | */ | |
148 | static GIT_PATH_FUNC(rebase_path_refs_to_delete, "rebase-merge/refs-to-delete") | |
149 | ||
a1c75762 JS |
150 | /* |
151 | * The following files are written by git-rebase just after parsing the | |
65850686 | 152 | * command-line. |
a1c75762 JS |
153 | */ |
154 | static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt") | |
7573cec5 | 155 | static GIT_PATH_FUNC(rebase_path_cdate_is_adate, "rebase-merge/cdate_is_adate") |
a3894aad | 156 | static GIT_PATH_FUNC(rebase_path_ignore_date, "rebase-merge/ignore_date") |
556907f1 JS |
157 | static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head") |
158 | static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose") | |
899b49c4 | 159 | static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet") |
a852ec7f | 160 | static GIT_PATH_FUNC(rebase_path_signoff, "rebase-merge/signoff") |
4b83ce9f JS |
161 | static GIT_PATH_FUNC(rebase_path_head_name, "rebase-merge/head-name") |
162 | static GIT_PATH_FUNC(rebase_path_onto, "rebase-merge/onto") | |
796c7972 | 163 | static GIT_PATH_FUNC(rebase_path_autostash, "rebase-merge/autostash") |
ca6c6b45 JS |
164 | static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy") |
165 | static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts") | |
9b6d7a62 | 166 | static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate") |
d421afa0 | 167 | static GIT_PATH_FUNC(rebase_path_reschedule_failed_exec, "rebase-merge/reschedule-failed-exec") |
e5b32bff | 168 | static GIT_PATH_FUNC(rebase_path_no_reschedule_failed_exec, "rebase-merge/no-reschedule-failed-exec") |
e98c4269 EN |
169 | static GIT_PATH_FUNC(rebase_path_drop_redundant_commits, "rebase-merge/drop_redundant_commits") |
170 | static GIT_PATH_FUNC(rebase_path_keep_redundant_commits, "rebase-merge/keep_redundant_commits") | |
b5a67045 | 171 | |
28d6daed PW |
172 | static int git_sequencer_config(const char *k, const char *v, void *cb) |
173 | { | |
174 | struct replay_opts *opts = cb; | |
175 | int status; | |
176 | ||
177 | if (!strcmp(k, "commit.cleanup")) { | |
178 | const char *s; | |
179 | ||
180 | status = git_config_string(&s, k, v); | |
181 | if (status) | |
182 | return status; | |
183 | ||
d74f3e58 | 184 | if (!strcmp(s, "verbatim")) { |
28d6daed | 185 | opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_NONE; |
d74f3e58 PW |
186 | opts->explicit_cleanup = 1; |
187 | } else if (!strcmp(s, "whitespace")) { | |
28d6daed | 188 | opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_SPACE; |
d74f3e58 PW |
189 | opts->explicit_cleanup = 1; |
190 | } else if (!strcmp(s, "strip")) { | |
28d6daed | 191 | opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_ALL; |
d74f3e58 PW |
192 | opts->explicit_cleanup = 1; |
193 | } else if (!strcmp(s, "scissors")) { | |
1a2b985f | 194 | opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_SCISSORS; |
d74f3e58 PW |
195 | opts->explicit_cleanup = 1; |
196 | } else { | |
28d6daed PW |
197 | warning(_("invalid commit message cleanup mode '%s'"), |
198 | s); | |
d74f3e58 | 199 | } |
28d6daed | 200 | |
f40f3c16 | 201 | free((char *)s); |
28d6daed PW |
202 | return status; |
203 | } | |
204 | ||
205 | if (!strcmp(k, "commit.gpgsign")) { | |
ed1e5282 | 206 | opts->gpg_sign = git_config_bool(k, v) ? xstrdup("") : NULL; |
28d6daed PW |
207 | return 0; |
208 | } | |
209 | ||
14c4586c EN |
210 | if (!opts->default_strategy && !strcmp(k, "pull.twohead")) { |
211 | int ret = git_config_string((const char**)&opts->default_strategy, k, v); | |
212 | if (ret == 0) { | |
213 | /* | |
214 | * pull.twohead is allowed to be multi-valued; we only | |
215 | * care about the first value. | |
216 | */ | |
217 | char *tmp = strchr(opts->default_strategy, ' '); | |
218 | if (tmp) | |
219 | *tmp = '\0'; | |
220 | } | |
221 | return ret; | |
222 | } | |
223 | ||
28d6daed PW |
224 | status = git_gpg_config(k, v, NULL); |
225 | if (status) | |
226 | return status; | |
227 | ||
228 | return git_diff_basic_config(k, v, NULL); | |
229 | } | |
230 | ||
231 | void sequencer_init_config(struct replay_opts *opts) | |
232 | { | |
233 | opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_NONE; | |
234 | git_config(git_sequencer_config, opts); | |
235 | } | |
236 | ||
b5a67045 JS |
237 | static inline int is_rebase_i(const struct replay_opts *opts) |
238 | { | |
84583957 | 239 | return opts->action == REPLAY_INTERACTIVE_REBASE; |
b5a67045 JS |
240 | } |
241 | ||
285abf56 JS |
242 | static const char *get_dir(const struct replay_opts *opts) |
243 | { | |
84583957 JS |
244 | if (is_rebase_i(opts)) |
245 | return rebase_path(); | |
285abf56 JS |
246 | return git_path_seq_dir(); |
247 | } | |
248 | ||
c0246501 JS |
249 | static const char *get_todo_path(const struct replay_opts *opts) |
250 | { | |
84583957 JS |
251 | if (is_rebase_i(opts)) |
252 | return rebase_path_todo(); | |
c0246501 JS |
253 | return git_path_todo_file(); |
254 | } | |
255 | ||
bab4d109 BC |
256 | /* |
257 | * Returns 0 for non-conforming footer | |
258 | * Returns 1 for conforming footer | |
259 | * Returns 2 when sob exists within conforming footer | |
260 | * Returns 3 when sob exists within conforming footer as last entry | |
261 | */ | |
262 | static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob, | |
66e83d9b | 263 | size_t ignore_footer) |
b971e04f | 264 | { |
00a21f5c | 265 | struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT; |
967dfd4d | 266 | struct trailer_info info; |
a3b636e2 | 267 | size_t i; |
967dfd4d | 268 | int found_sob = 0, found_sob_last = 0; |
9dad073d | 269 | char saved_char; |
b971e04f | 270 | |
ffce7f59 JK |
271 | opts.no_divider = 1; |
272 | ||
9dad073d JK |
273 | if (ignore_footer) { |
274 | saved_char = sb->buf[sb->len - ignore_footer]; | |
275 | sb->buf[sb->len - ignore_footer] = '\0'; | |
276 | } | |
277 | ||
00a21f5c | 278 | trailer_info_get(&info, sb->buf, &opts); |
b971e04f | 279 | |
9dad073d JK |
280 | if (ignore_footer) |
281 | sb->buf[sb->len - ignore_footer] = saved_char; | |
282 | ||
967dfd4d | 283 | if (info.trailer_start == info.trailer_end) |
b971e04f BC |
284 | return 0; |
285 | ||
967dfd4d JT |
286 | for (i = 0; i < info.trailer_nr; i++) |
287 | if (sob && !strncmp(info.trailers[i], sob->buf, sob->len)) { | |
288 | found_sob = 1; | |
289 | if (i == info.trailer_nr - 1) | |
290 | found_sob_last = 1; | |
291 | } | |
b971e04f | 292 | |
967dfd4d | 293 | trailer_info_release(&info); |
bab4d109 | 294 | |
967dfd4d | 295 | if (found_sob_last) |
bab4d109 BC |
296 | return 3; |
297 | if (found_sob) | |
298 | return 2; | |
b971e04f BC |
299 | return 1; |
300 | } | |
5ed75e2a | 301 | |
a1c75762 JS |
302 | static const char *gpg_sign_opt_quoted(struct replay_opts *opts) |
303 | { | |
304 | static struct strbuf buf = STRBUF_INIT; | |
305 | ||
306 | strbuf_reset(&buf); | |
307 | if (opts->gpg_sign) | |
308 | sq_quotef(&buf, "-S%s", opts->gpg_sign); | |
309 | return buf.buf; | |
310 | } | |
311 | ||
2863584f | 312 | int sequencer_remove_state(struct replay_opts *opts) |
26ae337b | 313 | { |
9055e401 | 314 | struct strbuf buf = STRBUF_INIT; |
37e9ee5c | 315 | int i, ret = 0; |
03a4e260 | 316 | |
9055e401 JS |
317 | if (is_rebase_i(opts) && |
318 | strbuf_read_file(&buf, rebase_path_refs_to_delete(), 0) > 0) { | |
319 | char *p = buf.buf; | |
320 | while (*p) { | |
321 | char *eol = strchr(p, '\n'); | |
322 | if (eol) | |
323 | *eol = '\0'; | |
c2417d3a | 324 | if (delete_ref("(rebase) cleanup", p, NULL, 0) < 0) { |
9055e401 | 325 | warning(_("could not delete '%s'"), p); |
37e9ee5c PW |
326 | ret = -1; |
327 | } | |
9055e401 JS |
328 | if (!eol) |
329 | break; | |
330 | p = eol + 1; | |
331 | } | |
332 | } | |
333 | ||
03a4e260 | 334 | free(opts->gpg_sign); |
14c4586c | 335 | free(opts->default_strategy); |
03a4e260 JS |
336 | free(opts->strategy); |
337 | for (i = 0; i < opts->xopts_nr; i++) | |
338 | free(opts->xopts[i]); | |
339 | free(opts->xopts); | |
e12a7ef5 | 340 | strbuf_release(&opts->current_fixups); |
26ae337b | 341 | |
9055e401 JS |
342 | strbuf_reset(&buf); |
343 | strbuf_addstr(&buf, get_dir(opts)); | |
37e9ee5c PW |
344 | if (remove_dir_recursively(&buf, 0)) |
345 | ret = error(_("could not remove '%s'"), buf.buf); | |
9055e401 | 346 | strbuf_release(&buf); |
2863584f | 347 | |
37e9ee5c | 348 | return ret; |
26ae337b | 349 | } |
043a4492 RR |
350 | |
351 | static const char *action_name(const struct replay_opts *opts) | |
352 | { | |
84583957 JS |
353 | switch (opts->action) { |
354 | case REPLAY_REVERT: | |
355 | return N_("revert"); | |
356 | case REPLAY_PICK: | |
357 | return N_("cherry-pick"); | |
358 | case REPLAY_INTERACTIVE_REBASE: | |
c2417d3a | 359 | return N_("rebase"); |
84583957 | 360 | } |
1a07e59c | 361 | die(_("unknown action: %d"), opts->action); |
043a4492 RR |
362 | } |
363 | ||
043a4492 RR |
364 | struct commit_message { |
365 | char *parent_label; | |
7b35eaf8 JK |
366 | char *label; |
367 | char *subject; | |
043a4492 RR |
368 | const char *message; |
369 | }; | |
370 | ||
39755964 JS |
371 | static const char *short_commit_name(struct commit *commit) |
372 | { | |
aab9583f | 373 | return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV); |
39755964 JS |
374 | } |
375 | ||
043a4492 RR |
376 | static int get_message(struct commit *commit, struct commit_message *out) |
377 | { | |
043a4492 | 378 | const char *abbrev, *subject; |
7b35eaf8 | 379 | int subject_len; |
043a4492 | 380 | |
7b35eaf8 | 381 | out->message = logmsg_reencode(commit, NULL, get_commit_output_encoding()); |
39755964 | 382 | abbrev = short_commit_name(commit); |
043a4492 RR |
383 | |
384 | subject_len = find_commit_subject(out->message, &subject); | |
385 | ||
7b35eaf8 | 386 | out->subject = xmemdupz(subject, subject_len); |
7d056dea | 387 | out->label = xstrfmt("%s (%s)", abbrev, out->subject); |
7b35eaf8 JK |
388 | out->parent_label = xstrfmt("parent of %s", out->label); |
389 | ||
043a4492 RR |
390 | return 0; |
391 | } | |
392 | ||
d74a4e57 | 393 | static void free_message(struct commit *commit, struct commit_message *msg) |
043a4492 RR |
394 | { |
395 | free(msg->parent_label); | |
7b35eaf8 JK |
396 | free(msg->label); |
397 | free(msg->subject); | |
b66103c3 | 398 | unuse_commit_buffer(commit, msg->message); |
043a4492 RR |
399 | } |
400 | ||
005af339 NTND |
401 | static void print_advice(struct repository *r, int show_hint, |
402 | struct replay_opts *opts) | |
043a4492 RR |
403 | { |
404 | char *msg = getenv("GIT_CHERRY_PICK_HELP"); | |
405 | ||
406 | if (msg) { | |
f172556b | 407 | advise("%s\n", msg); |
043a4492 | 408 | /* |
41ccfdd9 | 409 | * A conflict has occurred but the porcelain |
043a4492 RR |
410 | * (typically rebase --interactive) wants to take care |
411 | * of the commit itself so remove CHERRY_PICK_HEAD | |
412 | */ | |
c8e4159e HWN |
413 | refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", |
414 | NULL, 0); | |
043a4492 RR |
415 | return; |
416 | } | |
417 | ||
ed727b19 PH |
418 | if (show_hint) { |
419 | if (opts->no_commit) | |
420 | advise(_("after resolving the conflicts, mark the corrected paths\n" | |
421 | "with 'git add <paths>' or 'git rm <paths>'")); | |
f172556b ZH |
422 | else if (opts->action == REPLAY_PICK) |
423 | advise(_("After resolving the conflicts, mark them with\n" | |
424 | "\"git add/rm <pathspec>\", then run\n" | |
425 | "\"git cherry-pick --continue\".\n" | |
426 | "You can instead skip this commit with \"git cherry-pick --skip\".\n" | |
427 | "To abort and get back to the state before \"git cherry-pick\",\n" | |
428 | "run \"git cherry-pick --abort\".")); | |
429 | else if (opts->action == REPLAY_REVERT) | |
430 | advise(_("After resolving the conflicts, mark them with\n" | |
431 | "\"git add/rm <pathspec>\", then run\n" | |
432 | "\"git revert --continue\".\n" | |
433 | "You can instead skip this commit with \"git revert --skip\".\n" | |
434 | "To abort and get back to the state before \"git revert\",\n" | |
435 | "run \"git revert --abort\".")); | |
ed727b19 | 436 | else |
f172556b | 437 | BUG("unexpected pick action in print_advice()"); |
ed727b19 | 438 | } |
043a4492 RR |
439 | } |
440 | ||
ddb81e50 AG |
441 | static int write_message(const void *buf, size_t len, const char *filename, |
442 | int append_eol) | |
043a4492 | 443 | { |
14bca6c6 | 444 | struct lock_file msg_file = LOCK_INIT; |
043a4492 | 445 | |
4ef3d8f0 JS |
446 | int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0); |
447 | if (msg_fd < 0) | |
93b3df6f | 448 | return error_errno(_("could not lock '%s'"), filename); |
75871495 | 449 | if (write_in_full(msg_fd, buf, len) < 0) { |
bf5c0571 | 450 | error_errno(_("could not write to '%s'"), filename); |
4f66c837 | 451 | rollback_lock_file(&msg_file); |
bf5c0571 | 452 | return -1; |
4f66c837 | 453 | } |
f56fffef | 454 | if (append_eol && write(msg_fd, "\n", 1) < 0) { |
bf5c0571 | 455 | error_errno(_("could not write eol to '%s'"), filename); |
f56fffef | 456 | rollback_lock_file(&msg_file); |
bf5c0571 | 457 | return -1; |
f56fffef | 458 | } |
350292a1 MÅ |
459 | if (commit_lock_file(&msg_file) < 0) |
460 | return error(_("failed to finalize '%s'"), filename); | |
4ef3d8f0 JS |
461 | |
462 | return 0; | |
043a4492 RR |
463 | } |
464 | ||
c20de8be | 465 | int read_oneliner(struct strbuf *buf, |
3442c3d1 | 466 | const char *path, unsigned flags) |
1dfc84e9 JS |
467 | { |
468 | int orig_len = buf->len; | |
469 | ||
1dfc84e9 | 470 | if (strbuf_read_file(buf, path, 0) < 0) { |
bfa50c2c DL |
471 | if ((flags & READ_ONELINER_WARN_MISSING) || |
472 | (errno != ENOENT && errno != ENOTDIR)) | |
5b2f6d9c | 473 | warning_errno(_("could not read '%s'"), path); |
1dfc84e9 JS |
474 | return 0; |
475 | } | |
476 | ||
477 | if (buf->len > orig_len && buf->buf[buf->len - 1] == '\n') { | |
478 | if (--buf->len > orig_len && buf->buf[buf->len - 1] == '\r') | |
479 | --buf->len; | |
480 | buf->buf[buf->len] = '\0'; | |
481 | } | |
482 | ||
3442c3d1 | 483 | if ((flags & READ_ONELINER_SKIP_IF_EMPTY) && buf->len == orig_len) |
1dfc84e9 JS |
484 | return 0; |
485 | ||
486 | return 1; | |
487 | } | |
488 | ||
005af339 | 489 | static struct tree *empty_tree(struct repository *r) |
043a4492 | 490 | { |
005af339 | 491 | return lookup_tree(r, the_hash_algo->empty_tree); |
043a4492 RR |
492 | } |
493 | ||
e1ff0a32 | 494 | static int error_dirty_index(struct repository *repo, struct replay_opts *opts) |
043a4492 | 495 | { |
e1ff0a32 | 496 | if (repo_read_index_unmerged(repo)) |
c28cbc5e | 497 | return error_resolve_conflict(_(action_name(opts))); |
043a4492 | 498 | |
93b3df6f | 499 | error(_("your local changes would be overwritten by %s."), |
c28cbc5e | 500 | _(action_name(opts))); |
043a4492 | 501 | |
ed9bff08 | 502 | if (advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)) |
93b3df6f | 503 | advise(_("commit your changes or stash them to proceed.")); |
043a4492 RR |
504 | return -1; |
505 | } | |
506 | ||
1e41229d SB |
507 | static void update_abort_safety_file(void) |
508 | { | |
509 | struct object_id head; | |
510 | ||
511 | /* Do nothing on a single-pick */ | |
512 | if (!file_exists(git_path_seq_dir())) | |
513 | return; | |
514 | ||
515 | if (!get_oid("HEAD", &head)) | |
516 | write_file(git_path_abort_safety_file(), "%s", oid_to_hex(&head)); | |
517 | else | |
518 | write_file(git_path_abort_safety_file(), "%s", ""); | |
519 | } | |
520 | ||
f11c9580 NTND |
521 | static int fast_forward_to(struct repository *r, |
522 | const struct object_id *to, | |
523 | const struct object_id *from, | |
524 | int unborn, | |
525 | struct replay_opts *opts) | |
043a4492 | 526 | { |
d668d16c | 527 | struct ref_transaction *transaction; |
eb4be1cb | 528 | struct strbuf sb = STRBUF_INIT; |
d668d16c | 529 | struct strbuf err = STRBUF_INIT; |
043a4492 | 530 | |
e1ff0a32 | 531 | repo_read_index(r); |
f11c9580 | 532 | if (checkout_fast_forward(r, from, to, 1)) |
0e408fc3 | 533 | return -1; /* the callee should have complained already */ |
651ab9f5 | 534 | |
c28cbc5e | 535 | strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts))); |
d668d16c RS |
536 | |
537 | transaction = ref_transaction_begin(&err); | |
538 | if (!transaction || | |
539 | ref_transaction_update(transaction, "HEAD", | |
d87d48b2 | 540 | to, unborn && !is_rebase_i(opts) ? |
14228447 | 541 | null_oid() : from, |
1d147bdf | 542 | 0, sb.buf, &err) || |
db7516ab | 543 | ref_transaction_commit(transaction, &err)) { |
d668d16c RS |
544 | ref_transaction_free(transaction); |
545 | error("%s", err.buf); | |
546 | strbuf_release(&sb); | |
547 | strbuf_release(&err); | |
548 | return -1; | |
549 | } | |
651ab9f5 | 550 | |
eb4be1cb | 551 | strbuf_release(&sb); |
d668d16c RS |
552 | strbuf_release(&err); |
553 | ref_transaction_free(transaction); | |
1e41229d | 554 | update_abort_safety_file(); |
d668d16c | 555 | return 0; |
043a4492 RR |
556 | } |
557 | ||
f29cd862 DL |
558 | enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg, |
559 | int use_editor) | |
560 | { | |
561 | if (!cleanup_arg || !strcmp(cleanup_arg, "default")) | |
562 | return use_editor ? COMMIT_MSG_CLEANUP_ALL : | |
563 | COMMIT_MSG_CLEANUP_SPACE; | |
564 | else if (!strcmp(cleanup_arg, "verbatim")) | |
565 | return COMMIT_MSG_CLEANUP_NONE; | |
566 | else if (!strcmp(cleanup_arg, "whitespace")) | |
567 | return COMMIT_MSG_CLEANUP_SPACE; | |
568 | else if (!strcmp(cleanup_arg, "strip")) | |
569 | return COMMIT_MSG_CLEANUP_ALL; | |
570 | else if (!strcmp(cleanup_arg, "scissors")) | |
571 | return use_editor ? COMMIT_MSG_CLEANUP_SCISSORS : | |
572 | COMMIT_MSG_CLEANUP_SPACE; | |
573 | else | |
574 | die(_("Invalid cleanup mode %s"), cleanup_arg); | |
575 | } | |
576 | ||
dc42e9a8 PW |
577 | /* |
578 | * NB using int rather than enum cleanup_mode to stop clang's | |
579 | * -Wtautological-constant-out-of-range-compare complaining that the comparison | |
580 | * is always true. | |
581 | */ | |
582 | static const char *describe_cleanup_mode(int cleanup_mode) | |
583 | { | |
584 | static const char *modes[] = { "whitespace", | |
585 | "verbatim", | |
586 | "scissors", | |
587 | "strip" }; | |
588 | ||
589 | if (cleanup_mode < ARRAY_SIZE(modes)) | |
590 | return modes[cleanup_mode]; | |
591 | ||
592 | BUG("invalid cleanup_mode provided (%d)", cleanup_mode); | |
593 | } | |
594 | ||
f11c9580 | 595 | void append_conflicts_hint(struct index_state *istate, |
1a2b985f | 596 | struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode) |
75c961b7 JH |
597 | { |
598 | int i; | |
599 | ||
1a2b985f DL |
600 | if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) { |
601 | strbuf_addch(msgbuf, '\n'); | |
602 | wt_status_append_cut_line(msgbuf); | |
603 | strbuf_addch(msgbuf, comment_line_char); | |
604 | } | |
605 | ||
261f315b JH |
606 | strbuf_addch(msgbuf, '\n'); |
607 | strbuf_commented_addf(msgbuf, "Conflicts:\n"); | |
f11c9580 NTND |
608 | for (i = 0; i < istate->cache_nr;) { |
609 | const struct cache_entry *ce = istate->cache[i++]; | |
75c961b7 | 610 | if (ce_stage(ce)) { |
261f315b | 611 | strbuf_commented_addf(msgbuf, "\t%s\n", ce->name); |
f11c9580 NTND |
612 | while (i < istate->cache_nr && |
613 | !strcmp(ce->name, istate->cache[i]->name)) | |
75c961b7 JH |
614 | i++; |
615 | } | |
616 | } | |
617 | } | |
618 | ||
f11c9580 NTND |
619 | static int do_recursive_merge(struct repository *r, |
620 | struct commit *base, struct commit *next, | |
043a4492 | 621 | const char *base_label, const char *next_label, |
48be4c62 | 622 | struct object_id *head, struct strbuf *msgbuf, |
043a4492 RR |
623 | struct replay_opts *opts) |
624 | { | |
625 | struct merge_options o; | |
14c4586c | 626 | struct merge_result result; |
b4db8a2b | 627 | struct tree *next_tree, *base_tree, *head_tree; |
14c4586c | 628 | int clean, show_output; |
d20bc01a | 629 | int i; |
14bca6c6 | 630 | struct lock_file index_lock = LOCK_INIT; |
043a4492 | 631 | |
3a95f31d | 632 | if (repo_hold_locked_index(r, &index_lock, LOCK_REPORT_ON_ERROR) < 0) |
bd588867 | 633 | return -1; |
043a4492 | 634 | |
e1ff0a32 | 635 | repo_read_index(r); |
043a4492 | 636 | |
0d6caa2d | 637 | init_merge_options(&o, r); |
043a4492 RR |
638 | o.ancestor = base ? base_label : "(empty tree)"; |
639 | o.branch1 = "HEAD"; | |
640 | o.branch2 = next ? next_label : "(empty tree)"; | |
62fdb652 JS |
641 | if (is_rebase_i(opts)) |
642 | o.buffer_output = 2; | |
9268cf4a | 643 | o.show_rename_progress = 1; |
043a4492 RR |
644 | |
645 | head_tree = parse_tree_indirect(head); | |
005af339 NTND |
646 | next_tree = next ? get_commit_tree(next) : empty_tree(r); |
647 | base_tree = base ? get_commit_tree(base) : empty_tree(r); | |
043a4492 | 648 | |
d20bc01a JK |
649 | for (i = 0; i < opts->xopts_nr; i++) |
650 | parse_merge_opt(&o, opts->xopts[i]); | |
043a4492 | 651 | |
6a5fb966 | 652 | if (!opts->strategy || !strcmp(opts->strategy, "ort")) { |
14c4586c EN |
653 | memset(&result, 0, sizeof(result)); |
654 | merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree, | |
655 | &result); | |
656 | show_output = !is_rebase_i(opts) || !result.clean; | |
657 | /* | |
658 | * TODO: merge_switch_to_result will update index/working tree; | |
659 | * we only really want to do that if !result.clean || this is | |
660 | * the final patch to be picked. But determining this is the | |
661 | * final patch would take some work, and "head_tree" would need | |
662 | * to be replace with the tree the index matched before we | |
663 | * started doing any picks. | |
664 | */ | |
665 | merge_switch_to_result(&o, head_tree, &result, 1, show_output); | |
666 | clean = result.clean; | |
667 | } else { | |
5d9c9349 | 668 | ensure_full_index(r->index); |
14c4586c EN |
669 | clean = merge_trees(&o, head_tree, next_tree, base_tree); |
670 | if (is_rebase_i(opts) && clean <= 0) | |
671 | fputs(o.obuf.buf, stdout); | |
672 | strbuf_release(&o.obuf); | |
673 | } | |
64816524 MÅ |
674 | if (clean < 0) { |
675 | rollback_lock_file(&index_lock); | |
f241ff0d | 676 | return clean; |
64816524 | 677 | } |
043a4492 | 678 | |
f11c9580 | 679 | if (write_locked_index(r->index, &index_lock, |
61000814 | 680 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) |
66f5f6dc ÆAB |
681 | /* |
682 | * TRANSLATORS: %s will be "revert", "cherry-pick" or | |
c2417d3a | 683 | * "rebase". |
84583957 | 684 | */ |
c527b55e | 685 | return error(_("%s: Unable to write new index file"), |
c28cbc5e | 686 | _(action_name(opts))); |
043a4492 | 687 | |
75c961b7 | 688 | if (!clean) |
1a2b985f DL |
689 | append_conflicts_hint(r->index, msgbuf, |
690 | opts->default_msg_cleanup); | |
043a4492 RR |
691 | |
692 | return !clean; | |
693 | } | |
694 | ||
f11c9580 | 695 | static struct object_id *get_cache_tree_oid(struct index_state *istate) |
ba97aea1 | 696 | { |
f11c9580 NTND |
697 | if (!cache_tree_fully_valid(istate->cache_tree)) |
698 | if (cache_tree_update(istate, 0)) { | |
ba97aea1 JS |
699 | error(_("unable to update cache tree")); |
700 | return NULL; | |
701 | } | |
702 | ||
f11c9580 | 703 | return &istate->cache_tree->oid; |
ba97aea1 JS |
704 | } |
705 | ||
005af339 | 706 | static int is_index_unchanged(struct repository *r) |
b27cfb0d | 707 | { |
ba97aea1 | 708 | struct object_id head_oid, *cache_tree_oid; |
b27cfb0d | 709 | struct commit *head_commit; |
005af339 | 710 | struct index_state *istate = r->index; |
b27cfb0d | 711 | |
49e61479 | 712 | if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL)) |
aee42e1f | 713 | return error(_("could not resolve HEAD commit")); |
b27cfb0d | 714 | |
005af339 | 715 | head_commit = lookup_commit(r, &head_oid); |
4b580061 NH |
716 | |
717 | /* | |
718 | * If head_commit is NULL, check_commit, called from | |
719 | * lookup_commit, would have indicated that head_commit is not | |
720 | * a commit object already. parse_commit() will return failure | |
721 | * without further complaints in such a case. Otherwise, if | |
722 | * the commit is invalid, parse_commit() will complain. So | |
723 | * there is nothing for us to say here. Just return failure. | |
724 | */ | |
725 | if (parse_commit(head_commit)) | |
726 | return -1; | |
b27cfb0d | 727 | |
f11c9580 | 728 | if (!(cache_tree_oid = get_cache_tree_oid(istate))) |
ba97aea1 | 729 | return -1; |
b27cfb0d | 730 | |
4a7e27e9 | 731 | return oideq(cache_tree_oid, get_commit_tree_oid(head_commit)); |
b27cfb0d NH |
732 | } |
733 | ||
0473f28a JS |
734 | static int write_author_script(const char *message) |
735 | { | |
736 | struct strbuf buf = STRBUF_INIT; | |
737 | const char *eol; | |
738 | int res; | |
739 | ||
740 | for (;;) | |
741 | if (!*message || starts_with(message, "\n")) { | |
742 | missing_author: | |
743 | /* Missing 'author' line? */ | |
744 | unlink(rebase_path_author_script()); | |
745 | return 0; | |
746 | } else if (skip_prefix(message, "author ", &message)) | |
747 | break; | |
748 | else if ((eol = strchr(message, '\n'))) | |
749 | message = eol + 1; | |
750 | else | |
751 | goto missing_author; | |
752 | ||
753 | strbuf_addstr(&buf, "GIT_AUTHOR_NAME='"); | |
754 | while (*message && *message != '\n' && *message != '\r') | |
755 | if (skip_prefix(message, " <", &message)) | |
756 | break; | |
757 | else if (*message != '\'') | |
758 | strbuf_addch(&buf, *(message++)); | |
759 | else | |
4aa5ff94 | 760 | strbuf_addf(&buf, "'\\%c'", *(message++)); |
0473f28a JS |
761 | strbuf_addstr(&buf, "'\nGIT_AUTHOR_EMAIL='"); |
762 | while (*message && *message != '\n' && *message != '\r') | |
763 | if (skip_prefix(message, "> ", &message)) | |
764 | break; | |
765 | else if (*message != '\'') | |
766 | strbuf_addch(&buf, *(message++)); | |
767 | else | |
4aa5ff94 | 768 | strbuf_addf(&buf, "'\\%c'", *(message++)); |
0473f28a JS |
769 | strbuf_addstr(&buf, "'\nGIT_AUTHOR_DATE='@"); |
770 | while (*message && *message != '\n' && *message != '\r') | |
771 | if (*message != '\'') | |
772 | strbuf_addch(&buf, *(message++)); | |
773 | else | |
4aa5ff94 | 774 | strbuf_addf(&buf, "'\\%c'", *(message++)); |
0f16c09a | 775 | strbuf_addch(&buf, '\''); |
0473f28a JS |
776 | res = write_message(buf.buf, buf.len, rebase_path_author_script(), 1); |
777 | strbuf_release(&buf); | |
778 | return res; | |
779 | } | |
780 | ||
bcd33ec2 PW |
781 | /** |
782 | * Take a series of KEY='VALUE' lines where VALUE part is | |
783 | * sq-quoted, and append <KEY, VALUE> at the end of the string list | |
784 | */ | |
785 | static int parse_key_value_squoted(char *buf, struct string_list *list) | |
786 | { | |
787 | while (*buf) { | |
788 | struct string_list_item *item; | |
789 | char *np; | |
790 | char *cp = strchr(buf, '='); | |
791 | if (!cp) { | |
792 | np = strchrnul(buf, '\n'); | |
793 | return error(_("no key present in '%.*s'"), | |
794 | (int) (np - buf), buf); | |
795 | } | |
796 | np = strchrnul(cp, '\n'); | |
797 | *cp++ = '\0'; | |
798 | item = string_list_append(list, buf); | |
799 | ||
800 | buf = np + (*np == '\n'); | |
801 | *np = '\0'; | |
802 | cp = sq_dequote(cp); | |
803 | if (!cp) | |
804 | return error(_("unable to dequote value of '%s'"), | |
805 | item->string); | |
806 | item->util = xstrdup(cp); | |
807 | } | |
808 | return 0; | |
809 | } | |
4aa5ff94 | 810 | |
bcd33ec2 PW |
811 | /** |
812 | * Reads and parses the state directory's "author-script" file, and sets name, | |
813 | * email and date accordingly. | |
814 | * Returns 0 on success, -1 if the file could not be parsed. | |
815 | * | |
816 | * The author script is of the format: | |
817 | * | |
818 | * GIT_AUTHOR_NAME='$author_name' | |
819 | * GIT_AUTHOR_EMAIL='$author_email' | |
820 | * GIT_AUTHOR_DATE='$author_date' | |
821 | * | |
822 | * where $author_name, $author_email and $author_date are quoted. We are strict | |
c3c003e7 | 823 | * with our parsing, as the file was meant to be eval'd in the now-removed |
bcd33ec2 PW |
824 | * git-am.sh/git-rebase--interactive.sh scripts, and thus if the file differs |
825 | * from what this function expects, it is better to bail out than to do | |
826 | * something that the user does not expect. | |
4aa5ff94 | 827 | */ |
bcd33ec2 PW |
828 | int read_author_script(const char *path, char **name, char **email, char **date, |
829 | int allow_missing) | |
4aa5ff94 | 830 | { |
bcd33ec2 PW |
831 | struct strbuf buf = STRBUF_INIT; |
832 | struct string_list kv = STRING_LIST_INIT_DUP; | |
833 | int retval = -1; /* assume failure */ | |
834 | int i, name_i = -2, email_i = -2, date_i = -2, err = 0; | |
4aa5ff94 | 835 | |
bcd33ec2 PW |
836 | if (strbuf_read_file(&buf, path, 256) <= 0) { |
837 | strbuf_release(&buf); | |
838 | if (errno == ENOENT && allow_missing) | |
839 | return 0; | |
840 | else | |
841 | return error_errno(_("could not open '%s' for reading"), | |
842 | path); | |
843 | } | |
844 | ||
845 | if (parse_key_value_squoted(buf.buf, &kv)) | |
846 | goto finish; | |
847 | ||
848 | for (i = 0; i < kv.nr; i++) { | |
849 | if (!strcmp(kv.items[i].string, "GIT_AUTHOR_NAME")) { | |
850 | if (name_i != -2) | |
851 | name_i = error(_("'GIT_AUTHOR_NAME' already given")); | |
852 | else | |
853 | name_i = i; | |
854 | } else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_EMAIL")) { | |
855 | if (email_i != -2) | |
856 | email_i = error(_("'GIT_AUTHOR_EMAIL' already given")); | |
857 | else | |
858 | email_i = i; | |
859 | } else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_DATE")) { | |
860 | if (date_i != -2) | |
861 | date_i = error(_("'GIT_AUTHOR_DATE' already given")); | |
862 | else | |
863 | date_i = i; | |
864 | } else { | |
865 | err = error(_("unknown variable '%s'"), | |
866 | kv.items[i].string); | |
867 | } | |
868 | } | |
869 | if (name_i == -2) | |
870 | error(_("missing 'GIT_AUTHOR_NAME'")); | |
871 | if (email_i == -2) | |
872 | error(_("missing 'GIT_AUTHOR_EMAIL'")); | |
873 | if (date_i == -2) | |
874 | error(_("missing 'GIT_AUTHOR_DATE'")); | |
875 | if (date_i < 0 || email_i < 0 || date_i < 0 || err) | |
876 | goto finish; | |
4d924528 JH |
877 | *name = kv.items[name_i].util; |
878 | *email = kv.items[email_i].util; | |
879 | *date = kv.items[date_i].util; | |
bcd33ec2 PW |
880 | retval = 0; |
881 | finish: | |
882 | string_list_clear(&kv, !!retval); | |
883 | strbuf_release(&buf); | |
884 | return retval; | |
4aa5ff94 PW |
885 | } |
886 | ||
b5a67045 | 887 | /* |
4d010a75 | 888 | * Read a GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL AND GIT_AUTHOR_DATE from a |
c972bf4c | 889 | * file with shell quoting into struct strvec. Returns -1 on |
4d010a75 | 890 | * error, 0 otherwise. |
b5a67045 | 891 | */ |
c972bf4c | 892 | static int read_env_script(struct strvec *env) |
b5a67045 | 893 | { |
4d010a75 | 894 | char *name, *email, *date; |
b5a67045 | 895 | |
4d010a75 PW |
896 | if (read_author_script(rebase_path_author_script(), |
897 | &name, &email, &date, 0)) | |
a2a20b0d | 898 | return -1; |
b5a67045 | 899 | |
c972bf4c JK |
900 | strvec_pushf(env, "GIT_AUTHOR_NAME=%s", name); |
901 | strvec_pushf(env, "GIT_AUTHOR_EMAIL=%s", email); | |
902 | strvec_pushf(env, "GIT_AUTHOR_DATE=%s", date); | |
4d010a75 PW |
903 | free(name); |
904 | free(email); | |
905 | free(date); | |
b5a67045 | 906 | |
a2a20b0d | 907 | return 0; |
b5a67045 JS |
908 | } |
909 | ||
356ee465 PW |
910 | static char *get_author(const char *message) |
911 | { | |
912 | size_t len; | |
913 | const char *a; | |
914 | ||
915 | a = find_commit_header(message, "author", &len); | |
916 | if (a) | |
917 | return xmemdupz(a, len); | |
918 | ||
919 | return NULL; | |
920 | } | |
921 | ||
9c31b19d | 922 | static const char *author_date_from_env_array(const struct strvec *env) |
7573cec5 PW |
923 | { |
924 | int i; | |
925 | const char *date; | |
926 | ||
9c31b19d JH |
927 | for (i = 0; i < env->nr; i++) |
928 | if (skip_prefix(env->v[i], | |
7573cec5 PW |
929 | "GIT_AUTHOR_DATE=", &date)) |
930 | return date; | |
931 | /* | |
932 | * If GIT_AUTHOR_DATE is missing we should have already errored out when | |
933 | * reading the script | |
934 | */ | |
935 | BUG("GIT_AUTHOR_DATE missing from author script"); | |
936 | } | |
937 | ||
791eb870 JS |
938 | static const char staged_changes_advice[] = |
939 | N_("you have staged changes in your working tree\n" | |
940 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
941 | "\n" | |
942 | " git commit --amend %s\n" | |
943 | "\n" | |
944 | "If they are meant to go into a new commit, run:\n" | |
945 | "\n" | |
946 | " git commit %s\n" | |
947 | "\n" | |
948 | "In both cases, once you're done, continue with:\n" | |
949 | "\n" | |
950 | " git rebase --continue\n"); | |
951 | ||
789b3eff JS |
952 | #define ALLOW_EMPTY (1<<0) |
953 | #define EDIT_MSG (1<<1) | |
954 | #define AMEND_MSG (1<<2) | |
955 | #define CLEANUP_MSG (1<<3) | |
b92ff6e8 | 956 | #define VERIFY_MSG (1<<4) |
d87d48b2 | 957 | #define CREATE_ROOT_COMMIT (1<<5) |
f7d42cee | 958 | #define VERBATIM_MSG (1<<6) |
789b3eff | 959 | |
34bec2c4 AG |
960 | static int run_command_silent_on_success(struct child_process *cmd) |
961 | { | |
962 | struct strbuf buf = STRBUF_INIT; | |
963 | int rc; | |
964 | ||
965 | cmd->stdout_to_stderr = 1; | |
966 | rc = pipe_command(cmd, | |
967 | NULL, 0, | |
968 | NULL, 0, | |
969 | &buf, 0); | |
970 | ||
971 | if (rc) | |
972 | fputs(buf.buf, stderr); | |
973 | strbuf_release(&buf); | |
974 | return rc; | |
975 | } | |
976 | ||
043a4492 RR |
977 | /* |
978 | * If we are cherry-pick, and if the merge did not result in | |
979 | * hand-editing, we will hit this commit and inherit the original | |
980 | * author date and name. | |
b5a67045 | 981 | * |
043a4492 RR |
982 | * If we are revert, or if our cherry-pick results in a hand merge, |
983 | * we had better say that the current user is responsible for that. | |
b5a67045 JS |
984 | * |
985 | * An exception is when run_git_commit() is called during an | |
986 | * interactive rebase: in that case, we will want to retain the | |
987 | * author metadata. | |
043a4492 | 988 | */ |
20f4b044 | 989 | static int run_git_commit(const char *defmsg, |
f11c9580 | 990 | struct replay_opts *opts, |
789b3eff | 991 | unsigned int flags) |
043a4492 | 992 | { |
07d968ef | 993 | struct child_process cmd = CHILD_PROCESS_INIT; |
b27cfb0d | 994 | |
f7d42cee JS |
995 | if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG)) |
996 | BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive"); | |
997 | ||
07d968ef JS |
998 | cmd.git_cmd = 1; |
999 | ||
9d6b9df1 PW |
1000 | if (is_rebase_i(opts) && |
1001 | ((opts->committer_date_is_author_date && !opts->ignore_date) || | |
1002 | !(!defmsg && (flags & AMEND_MSG))) && | |
baf8ec8d | 1003 | read_env_script(&cmd.env_array)) { |
34bec2c4 | 1004 | const char *gpg_opt = gpg_sign_opt_quoted(opts); |
a1c75762 | 1005 | |
34bec2c4 AG |
1006 | return error(_(staged_changes_advice), |
1007 | gpg_opt, gpg_opt); | |
b5a67045 JS |
1008 | } |
1009 | ||
7573cec5 | 1010 | if (opts->committer_date_is_author_date) |
9c31b19d JH |
1011 | strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s", |
1012 | opts->ignore_date ? | |
1013 | "" : | |
1014 | author_date_from_env_array(&cmd.env_array)); | |
a3894aad | 1015 | if (opts->ignore_date) |
9c31b19d | 1016 | strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE="); |
7573cec5 | 1017 | |
c972bf4c | 1018 | strvec_push(&cmd.args, "commit"); |
043a4492 | 1019 | |
b92ff6e8 | 1020 | if (!(flags & VERIFY_MSG)) |
c972bf4c | 1021 | strvec_push(&cmd.args, "-n"); |
789b3eff | 1022 | if ((flags & AMEND_MSG)) |
c972bf4c | 1023 | strvec_push(&cmd.args, "--amend"); |
3bdd5522 | 1024 | if (opts->gpg_sign) |
c972bf4c | 1025 | strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign); |
cf0ad4d1 | 1026 | else |
c972bf4c | 1027 | strvec_push(&cmd.args, "--no-gpg-sign"); |
b5a67045 | 1028 | if (defmsg) |
c972bf4c | 1029 | strvec_pushl(&cmd.args, "-F", defmsg, NULL); |
dc4b5bc3 | 1030 | else if (!(flags & EDIT_MSG)) |
c972bf4c | 1031 | strvec_pushl(&cmd.args, "-C", "HEAD", NULL); |
789b3eff | 1032 | if ((flags & CLEANUP_MSG)) |
c972bf4c | 1033 | strvec_push(&cmd.args, "--cleanup=strip"); |
f7d42cee JS |
1034 | if ((flags & VERBATIM_MSG)) |
1035 | strvec_push(&cmd.args, "--cleanup=verbatim"); | |
789b3eff | 1036 | if ((flags & EDIT_MSG)) |
c972bf4c | 1037 | strvec_push(&cmd.args, "-e"); |
789b3eff | 1038 | else if (!(flags & CLEANUP_MSG) && |
0009426d | 1039 | !opts->signoff && !opts->record_origin && |
1a2b985f | 1040 | !opts->explicit_cleanup) |
c972bf4c | 1041 | strvec_push(&cmd.args, "--cleanup=verbatim"); |
b27cfb0d | 1042 | |
789b3eff | 1043 | if ((flags & ALLOW_EMPTY)) |
c972bf4c | 1044 | strvec_push(&cmd.args, "--allow-empty"); |
df478b74 | 1045 | |
a3ec9eaf | 1046 | if (!(flags & EDIT_MSG)) |
c972bf4c | 1047 | strvec_push(&cmd.args, "--allow-empty-message"); |
4bee9584 | 1048 | |
34bec2c4 AG |
1049 | if (is_rebase_i(opts) && !(flags & EDIT_MSG)) |
1050 | return run_command_silent_on_success(&cmd); | |
1051 | else | |
1052 | return run_command(&cmd); | |
b27cfb0d NH |
1053 | } |
1054 | ||
d0aaa46f PW |
1055 | static int rest_is_empty(const struct strbuf *sb, int start) |
1056 | { | |
1057 | int i, eol; | |
1058 | const char *nl; | |
1059 | ||
1060 | /* Check if the rest is just whitespace and Signed-off-by's. */ | |
1061 | for (i = start; i < sb->len; i++) { | |
1062 | nl = memchr(sb->buf + i, '\n', sb->len - i); | |
1063 | if (nl) | |
1064 | eol = nl - sb->buf; | |
1065 | else | |
1066 | eol = sb->len; | |
1067 | ||
1068 | if (strlen(sign_off_header) <= eol - i && | |
1069 | starts_with(sb->buf + i, sign_off_header)) { | |
1070 | i = eol; | |
1071 | continue; | |
1072 | } | |
1073 | while (i < eol) | |
1074 | if (!isspace(sb->buf[i++])) | |
1075 | return 0; | |
1076 | } | |
1077 | ||
1078 | return 1; | |
1079 | } | |
1080 | ||
f29cd862 DL |
1081 | void cleanup_message(struct strbuf *msgbuf, |
1082 | enum commit_msg_cleanup_mode cleanup_mode, int verbose) | |
1083 | { | |
1084 | if (verbose || /* Truncate the message just before the diff, if any. */ | |
1085 | cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) | |
1086 | strbuf_setlen(msgbuf, wt_status_locate_end(msgbuf->buf, msgbuf->len)); | |
1087 | if (cleanup_mode != COMMIT_MSG_CLEANUP_NONE) | |
1088 | strbuf_stripspace(msgbuf, cleanup_mode == COMMIT_MSG_CLEANUP_ALL); | |
1089 | } | |
1090 | ||
d0aaa46f PW |
1091 | /* |
1092 | * Find out if the message in the strbuf contains only whitespace and | |
1093 | * Signed-off-by lines. | |
1094 | */ | |
1095 | int message_is_empty(const struct strbuf *sb, | |
1096 | enum commit_msg_cleanup_mode cleanup_mode) | |
1097 | { | |
1098 | if (cleanup_mode == COMMIT_MSG_CLEANUP_NONE && sb->len) | |
1099 | return 0; | |
1100 | return rest_is_empty(sb, 0); | |
1101 | } | |
1102 | ||
1103 | /* | |
1104 | * See if the user edited the message in the editor or left what | |
1105 | * was in the template intact | |
1106 | */ | |
1107 | int template_untouched(const struct strbuf *sb, const char *template_file, | |
1108 | enum commit_msg_cleanup_mode cleanup_mode) | |
1109 | { | |
1110 | struct strbuf tmpl = STRBUF_INIT; | |
1111 | const char *start; | |
1112 | ||
1113 | if (cleanup_mode == COMMIT_MSG_CLEANUP_NONE && sb->len) | |
1114 | return 0; | |
1115 | ||
1116 | if (!template_file || strbuf_read_file(&tmpl, template_file, 0) <= 0) | |
1117 | return 0; | |
1118 | ||
1119 | strbuf_stripspace(&tmpl, cleanup_mode == COMMIT_MSG_CLEANUP_ALL); | |
1120 | if (!skip_prefix(sb->buf, tmpl.buf, &start)) | |
1121 | start = sb->buf; | |
1122 | strbuf_release(&tmpl); | |
1123 | return rest_is_empty(sb, start - sb->buf); | |
1124 | } | |
1125 | ||
0505d604 PW |
1126 | int update_head_with_reflog(const struct commit *old_head, |
1127 | const struct object_id *new_head, | |
1128 | const char *action, const struct strbuf *msg, | |
1129 | struct strbuf *err) | |
1130 | { | |
1131 | struct ref_transaction *transaction; | |
1132 | struct strbuf sb = STRBUF_INIT; | |
1133 | const char *nl; | |
1134 | int ret = 0; | |
1135 | ||
1136 | if (action) { | |
1137 | strbuf_addstr(&sb, action); | |
1138 | strbuf_addstr(&sb, ": "); | |
1139 | } | |
1140 | ||
1141 | nl = strchr(msg->buf, '\n'); | |
1142 | if (nl) { | |
1143 | strbuf_add(&sb, msg->buf, nl + 1 - msg->buf); | |
1144 | } else { | |
1145 | strbuf_addbuf(&sb, msg); | |
1146 | strbuf_addch(&sb, '\n'); | |
1147 | } | |
1148 | ||
1149 | transaction = ref_transaction_begin(err); | |
1150 | if (!transaction || | |
1151 | ref_transaction_update(transaction, "HEAD", new_head, | |
14228447 | 1152 | old_head ? &old_head->object.oid : null_oid(), |
0505d604 PW |
1153 | 0, sb.buf, err) || |
1154 | ref_transaction_commit(transaction, err)) { | |
1155 | ret = -1; | |
1156 | } | |
1157 | ref_transaction_free(transaction); | |
1158 | strbuf_release(&sb); | |
1159 | ||
1160 | return ret; | |
1161 | } | |
1162 | ||
a87a6f3c PW |
1163 | static int run_rewrite_hook(const struct object_id *oldoid, |
1164 | const struct object_id *newoid) | |
1165 | { | |
1166 | struct child_process proc = CHILD_PROCESS_INIT; | |
a87a6f3c PW |
1167 | int code; |
1168 | struct strbuf sb = STRBUF_INIT; | |
2b709893 | 1169 | const char *hook_path = find_hook("post-rewrite"); |
a87a6f3c | 1170 | |
2b709893 | 1171 | if (!hook_path) |
a87a6f3c PW |
1172 | return 0; |
1173 | ||
2b709893 | 1174 | strvec_pushl(&proc.args, hook_path, "amend", NULL); |
a87a6f3c PW |
1175 | proc.in = -1; |
1176 | proc.stdout_to_stderr = 1; | |
6206286e | 1177 | proc.trace2_hook_name = "post-rewrite"; |
a87a6f3c PW |
1178 | |
1179 | code = start_command(&proc); | |
1180 | if (code) | |
1181 | return code; | |
1182 | strbuf_addf(&sb, "%s %s\n", oid_to_hex(oldoid), oid_to_hex(newoid)); | |
1183 | sigchain_push(SIGPIPE, SIG_IGN); | |
1184 | write_in_full(proc.in, sb.buf, sb.len); | |
1185 | close(proc.in); | |
1186 | strbuf_release(&sb); | |
1187 | sigchain_pop(SIGPIPE); | |
1188 | return finish_command(&proc); | |
1189 | } | |
1190 | ||
1d18d758 NTND |
1191 | void commit_post_rewrite(struct repository *r, |
1192 | const struct commit *old_head, | |
a87a6f3c PW |
1193 | const struct object_id *new_head) |
1194 | { | |
1195 | struct notes_rewrite_cfg *cfg; | |
1196 | ||
1197 | cfg = init_copy_notes_for_rewrite("amend"); | |
1198 | if (cfg) { | |
1199 | /* we are amending, so old_head is not NULL */ | |
1200 | copy_note_for_rewrite(cfg, &old_head->object.oid, new_head); | |
1d18d758 | 1201 | finish_copy_notes_for_rewrite(r, cfg, "Notes added by 'git commit --amend'"); |
a87a6f3c PW |
1202 | } |
1203 | run_rewrite_hook(&old_head->object.oid, new_head); | |
1204 | } | |
1205 | ||
f11c9580 NTND |
1206 | static int run_prepare_commit_msg_hook(struct repository *r, |
1207 | struct strbuf *msg, | |
1208 | const char *commit) | |
66618a50 | 1209 | { |
49697cb7 PW |
1210 | int ret = 0; |
1211 | const char *name, *arg1 = NULL, *arg2 = NULL; | |
66618a50 PW |
1212 | |
1213 | name = git_path_commit_editmsg(); | |
1214 | if (write_message(msg->buf, msg->len, name, 0)) | |
1215 | return -1; | |
1216 | ||
49697cb7 PW |
1217 | if (commit) { |
1218 | arg1 = "commit"; | |
1219 | arg2 = commit; | |
1220 | } else { | |
1221 | arg1 = "message"; | |
1222 | } | |
1223 | if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name, | |
1224 | arg1, arg2, NULL)) | |
66618a50 | 1225 | ret = error(_("'prepare-commit-msg' hook failed")); |
66618a50 PW |
1226 | |
1227 | return ret; | |
1228 | } | |
1229 | ||
e47c6caf PW |
1230 | static const char implicit_ident_advice_noconfig[] = |
1231 | N_("Your name and email address were configured automatically based\n" | |
1232 | "on your username and hostname. Please check that they are accurate.\n" | |
1233 | "You can suppress this message by setting them explicitly. Run the\n" | |
1234 | "following command and follow the instructions in your editor to edit\n" | |
1235 | "your configuration file:\n" | |
1236 | "\n" | |
1237 | " git config --global --edit\n" | |
1238 | "\n" | |
1239 | "After doing this, you may fix the identity used for this commit with:\n" | |
1240 | "\n" | |
1241 | " git commit --amend --reset-author\n"); | |
1242 | ||
1243 | static const char implicit_ident_advice_config[] = | |
1244 | N_("Your name and email address were configured automatically based\n" | |
1245 | "on your username and hostname. Please check that they are accurate.\n" | |
1246 | "You can suppress this message by setting them explicitly:\n" | |
1247 | "\n" | |
1248 | " git config --global user.name \"Your Name\"\n" | |
1249 | " git config --global user.email you@example.com\n" | |
1250 | "\n" | |
1251 | "After doing this, you may fix the identity used for this commit with:\n" | |
1252 | "\n" | |
1253 | " git commit --amend --reset-author\n"); | |
1254 | ||
1255 | static const char *implicit_ident_advice(void) | |
1256 | { | |
a03b097d | 1257 | char *user_config = interpolate_path("~/.gitconfig", 0); |
e47c6caf PW |
1258 | char *xdg_config = xdg_config_home("config"); |
1259 | int config_exists = file_exists(user_config) || file_exists(xdg_config); | |
1260 | ||
1261 | free(user_config); | |
1262 | free(xdg_config); | |
1263 | ||
1264 | if (config_exists) | |
1265 | return _(implicit_ident_advice_config); | |
1266 | else | |
1267 | return _(implicit_ident_advice_noconfig); | |
1268 | ||
1269 | } | |
1270 | ||
f11c9580 NTND |
1271 | void print_commit_summary(struct repository *r, |
1272 | const char *prefix, | |
1273 | const struct object_id *oid, | |
e47c6caf PW |
1274 | unsigned int flags) |
1275 | { | |
1276 | struct rev_info rev; | |
1277 | struct commit *commit; | |
1278 | struct strbuf format = STRBUF_INIT; | |
1279 | const char *head; | |
1280 | struct pretty_print_context pctx = {0}; | |
1281 | struct strbuf author_ident = STRBUF_INIT; | |
1282 | struct strbuf committer_ident = STRBUF_INIT; | |
ed90f041 ÆAB |
1283 | struct ref_store *refs; |
1284 | int resolve_errno; | |
e47c6caf | 1285 | |
f11c9580 | 1286 | commit = lookup_commit(r, oid); |
e47c6caf PW |
1287 | if (!commit) |
1288 | die(_("couldn't look up newly created commit")); | |
1289 | if (parse_commit(commit)) | |
1290 | die(_("could not parse newly created commit")); | |
1291 | ||
1292 | strbuf_addstr(&format, "format:%h] %s"); | |
1293 | ||
1294 | format_commit_message(commit, "%an <%ae>", &author_ident, &pctx); | |
1295 | format_commit_message(commit, "%cn <%ce>", &committer_ident, &pctx); | |
1296 | if (strbuf_cmp(&author_ident, &committer_ident)) { | |
1297 | strbuf_addstr(&format, "\n Author: "); | |
1298 | strbuf_addbuf_percentquote(&format, &author_ident); | |
1299 | } | |
1300 | if (flags & SUMMARY_SHOW_AUTHOR_DATE) { | |
1301 | struct strbuf date = STRBUF_INIT; | |
1302 | ||
1303 | format_commit_message(commit, "%ad", &date, &pctx); | |
1304 | strbuf_addstr(&format, "\n Date: "); | |
1305 | strbuf_addbuf_percentquote(&format, &date); | |
1306 | strbuf_release(&date); | |
1307 | } | |
1308 | if (!committer_ident_sufficiently_given()) { | |
1309 | strbuf_addstr(&format, "\n Committer: "); | |
1310 | strbuf_addbuf_percentquote(&format, &committer_ident); | |
ed9bff08 | 1311 | if (advice_enabled(ADVICE_IMPLICIT_IDENTITY)) { |
e47c6caf PW |
1312 | strbuf_addch(&format, '\n'); |
1313 | strbuf_addstr(&format, implicit_ident_advice()); | |
1314 | } | |
1315 | } | |
1316 | strbuf_release(&author_ident); | |
1317 | strbuf_release(&committer_ident); | |
1318 | ||
f11c9580 | 1319 | repo_init_revisions(r, &rev, prefix); |
e47c6caf PW |
1320 | setup_revisions(0, NULL, &rev, NULL); |
1321 | ||
1322 | rev.diff = 1; | |
1323 | rev.diffopt.output_format = | |
1324 | DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY; | |
1325 | ||
1326 | rev.verbose_header = 1; | |
1327 | rev.show_root_diff = 1; | |
1328 | get_commit_format(format.buf, &rev); | |
1329 | rev.always_show_header = 0; | |
0f57f731 | 1330 | rev.diffopt.detect_rename = DIFF_DETECT_RENAME; |
e47c6caf PW |
1331 | rev.diffopt.break_opt = 0; |
1332 | diff_setup_done(&rev.diffopt); | |
1333 | ||
ed90f041 | 1334 | refs = get_main_ref_store(the_repository); |
f1da24ca | 1335 | head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL, |
ed90f041 ÆAB |
1336 | &resolve_errno); |
1337 | if (!head) { | |
1338 | errno = resolve_errno; | |
e47c6caf | 1339 | die_errno(_("unable to resolve HEAD after creating commit")); |
ed90f041 | 1340 | } |
e47c6caf PW |
1341 | if (!strcmp(head, "HEAD")) |
1342 | head = _("detached HEAD"); | |
1343 | else | |
1344 | skip_prefix(head, "refs/heads/", &head); | |
1345 | printf("[%s%s ", head, (flags & SUMMARY_INITIAL_COMMIT) ? | |
1346 | _(" (root-commit)") : ""); | |
1347 | ||
1348 | if (!log_tree_commit(&rev, commit)) { | |
1349 | rev.always_show_header = 1; | |
1350 | rev.use_terminator = 1; | |
1351 | log_tree_commit(&rev, commit); | |
1352 | } | |
1353 | ||
1354 | strbuf_release(&format); | |
1355 | } | |
1356 | ||
005af339 | 1357 | static int parse_head(struct repository *r, struct commit **head) |
356ee465 PW |
1358 | { |
1359 | struct commit *current_head; | |
1360 | struct object_id oid; | |
1361 | ||
1362 | if (get_oid("HEAD", &oid)) { | |
1363 | current_head = NULL; | |
1364 | } else { | |
005af339 | 1365 | current_head = lookup_commit_reference(r, &oid); |
356ee465 PW |
1366 | if (!current_head) |
1367 | return error(_("could not parse HEAD")); | |
9001dc2a | 1368 | if (!oideq(&oid, ¤t_head->object.oid)) { |
356ee465 PW |
1369 | warning(_("HEAD %s is not a commit!"), |
1370 | oid_to_hex(&oid)); | |
1371 | } | |
1372 | if (parse_commit(current_head)) | |
1373 | return error(_("could not parse HEAD commit")); | |
1374 | } | |
1375 | *head = current_head; | |
1376 | ||
1377 | return 0; | |
1378 | } | |
1379 | ||
1380 | /* | |
1381 | * Try to commit without forking 'git commit'. In some cases we need | |
1382 | * to run 'git commit' to display an error message | |
1383 | * | |
1384 | * Returns: | |
1385 | * -1 - error unable to commit | |
1386 | * 0 - success | |
1387 | * 1 - run 'git commit' | |
1388 | */ | |
f11c9580 NTND |
1389 | static int try_to_commit(struct repository *r, |
1390 | struct strbuf *msg, const char *author, | |
356ee465 PW |
1391 | struct replay_opts *opts, unsigned int flags, |
1392 | struct object_id *oid) | |
1393 | { | |
1394 | struct object_id tree; | |
b0a31861 | 1395 | struct commit *current_head = NULL; |
356ee465 PW |
1396 | struct commit_list *parents = NULL; |
1397 | struct commit_extra_header *extra = NULL; | |
1398 | struct strbuf err = STRBUF_INIT; | |
66618a50 | 1399 | struct strbuf commit_msg = STRBUF_INIT; |
4d924528 | 1400 | char *amend_author = NULL; |
7573cec5 | 1401 | const char *committer = NULL; |
66618a50 | 1402 | const char *hook_commit = NULL; |
356ee465 PW |
1403 | enum commit_msg_cleanup_mode cleanup; |
1404 | int res = 0; | |
1405 | ||
f7d42cee JS |
1406 | if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG)) |
1407 | BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive"); | |
1408 | ||
005af339 | 1409 | if (parse_head(r, ¤t_head)) |
356ee465 | 1410 | return -1; |
4d924528 | 1411 | |
356ee465 | 1412 | if (flags & AMEND_MSG) { |
42d4e1d1 | 1413 | const char *exclude_gpgsig[] = { "gpgsig", "gpgsig-sha256", NULL }; |
356ee465 PW |
1414 | const char *out_enc = get_commit_output_encoding(); |
1415 | const char *message = logmsg_reencode(current_head, NULL, | |
1416 | out_enc); | |
1417 | ||
1418 | if (!msg) { | |
1419 | const char *orig_message = NULL; | |
1420 | ||
1421 | find_commit_subject(message, &orig_message); | |
66618a50 | 1422 | msg = &commit_msg; |
356ee465 | 1423 | strbuf_addstr(msg, orig_message); |
66618a50 | 1424 | hook_commit = "HEAD"; |
356ee465 | 1425 | } |
4d924528 | 1426 | author = amend_author = get_author(message); |
356ee465 PW |
1427 | unuse_commit_buffer(current_head, message); |
1428 | if (!author) { | |
1429 | res = error(_("unable to parse commit author")); | |
1430 | goto out; | |
1431 | } | |
1432 | parents = copy_commit_list(current_head->parents); | |
1433 | extra = read_commit_extra_headers(current_head, exclude_gpgsig); | |
b0a31861 PW |
1434 | } else if (current_head && |
1435 | (!(flags & CREATE_ROOT_COMMIT) || (flags & AMEND_MSG))) { | |
356ee465 PW |
1436 | commit_list_insert(current_head, &parents); |
1437 | } | |
1438 | ||
f11c9580 | 1439 | if (write_index_as_tree(&tree, r->index, r->index_file, 0, NULL)) { |
356ee465 PW |
1440 | res = error(_("git write-tree failed to write a tree")); |
1441 | goto out; | |
1442 | } | |
1443 | ||
2d05ef27 PW |
1444 | if (!(flags & ALLOW_EMPTY)) { |
1445 | struct commit *first_parent = current_head; | |
1446 | ||
1447 | if (flags & AMEND_MSG) { | |
1448 | if (current_head->parents) { | |
1449 | first_parent = current_head->parents->item; | |
1450 | if (repo_parse_commit(r, first_parent)) { | |
1451 | res = error(_("could not parse HEAD commit")); | |
1452 | goto out; | |
1453 | } | |
1454 | } else { | |
1455 | first_parent = NULL; | |
1456 | } | |
1457 | } | |
1458 | if (oideq(first_parent | |
1459 | ? get_commit_tree_oid(first_parent) | |
1460 | : the_hash_algo->empty_tree, | |
1461 | &tree)) { | |
1462 | res = 1; /* run 'git commit' to display error message */ | |
1463 | goto out; | |
1464 | } | |
356ee465 PW |
1465 | } |
1466 | ||
07a348e7 | 1467 | if (hook_exists("prepare-commit-msg")) { |
f11c9580 | 1468 | res = run_prepare_commit_msg_hook(r, msg, hook_commit); |
66618a50 PW |
1469 | if (res) |
1470 | goto out; | |
1471 | if (strbuf_read_file(&commit_msg, git_path_commit_editmsg(), | |
1472 | 2048) < 0) { | |
1473 | res = error_errno(_("unable to read commit message " | |
1474 | "from '%s'"), | |
1475 | git_path_commit_editmsg()); | |
1476 | goto out; | |
1477 | } | |
1478 | msg = &commit_msg; | |
1479 | } | |
1480 | ||
d74f3e58 PW |
1481 | if (flags & CLEANUP_MSG) |
1482 | cleanup = COMMIT_MSG_CLEANUP_ALL; | |
f7d42cee JS |
1483 | else if (flags & VERBATIM_MSG) |
1484 | cleanup = COMMIT_MSG_CLEANUP_NONE; | |
d74f3e58 PW |
1485 | else if ((opts->signoff || opts->record_origin) && |
1486 | !opts->explicit_cleanup) | |
1487 | cleanup = COMMIT_MSG_CLEANUP_SPACE; | |
1488 | else | |
1489 | cleanup = opts->default_msg_cleanup; | |
66618a50 PW |
1490 | |
1491 | if (cleanup != COMMIT_MSG_CLEANUP_NONE) | |
1492 | strbuf_stripspace(msg, cleanup == COMMIT_MSG_CLEANUP_ALL); | |
a3ec9eaf | 1493 | if ((flags & EDIT_MSG) && message_is_empty(msg, cleanup)) { |
66618a50 PW |
1494 | res = 1; /* run 'git commit' to display error message */ |
1495 | goto out; | |
1496 | } | |
1497 | ||
7573cec5 PW |
1498 | if (opts->committer_date_is_author_date) { |
1499 | struct ident_split id; | |
1500 | struct strbuf date = STRBUF_INIT; | |
1501 | ||
a3894aad PW |
1502 | if (!opts->ignore_date) { |
1503 | if (split_ident_line(&id, author, (int)strlen(author)) < 0) { | |
1504 | res = error(_("invalid author identity '%s'"), | |
1505 | author); | |
1506 | goto out; | |
1507 | } | |
1508 | if (!id.date_begin) { | |
1509 | res = error(_( | |
1510 | "corrupt author: missing date information")); | |
1511 | goto out; | |
1512 | } | |
1513 | strbuf_addf(&date, "@%.*s %.*s", | |
1514 | (int)(id.date_end - id.date_begin), | |
1515 | id.date_begin, | |
1516 | (int)(id.tz_end - id.tz_begin), | |
1517 | id.tz_begin); | |
1518 | } else { | |
1519 | reset_ident_date(); | |
7573cec5 | 1520 | } |
2020451c JK |
1521 | committer = fmt_ident(getenv("GIT_COMMITTER_NAME"), |
1522 | getenv("GIT_COMMITTER_EMAIL"), | |
a3894aad PW |
1523 | WANT_COMMITTER_IDENT, |
1524 | opts->ignore_date ? NULL : date.buf, | |
7573cec5 PW |
1525 | IDENT_STRICT); |
1526 | strbuf_release(&date); | |
1527 | } else { | |
1528 | reset_ident_date(); | |
1529 | } | |
12f7babd | 1530 | |
a3894aad PW |
1531 | if (opts->ignore_date) { |
1532 | struct ident_split id; | |
1533 | char *name, *email; | |
12f7babd | 1534 | |
a3894aad PW |
1535 | if (split_ident_line(&id, author, strlen(author)) < 0) { |
1536 | error(_("invalid author identity '%s'"), author); | |
1537 | goto out; | |
1538 | } | |
1539 | name = xmemdupz(id.name_begin, id.name_end - id.name_begin); | |
1540 | email = xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); | |
1541 | author = fmt_ident(name, email, WANT_AUTHOR_IDENT, NULL, | |
1542 | IDENT_STRICT); | |
1543 | free(name); | |
1544 | free(email); | |
1545 | } | |
1546 | ||
e8cbe211 | 1547 | if (commit_tree_extended(msg->buf, msg->len, &tree, parents, oid, |
7573cec5 | 1548 | author, committer, opts->gpg_sign, extra)) { |
356ee465 PW |
1549 | res = error(_("failed to write commit object")); |
1550 | goto out; | |
1551 | } | |
1552 | ||
1553 | if (update_head_with_reflog(current_head, oid, | |
1554 | getenv("GIT_REFLOG_ACTION"), msg, &err)) { | |
1555 | res = error("%s", err.buf); | |
1556 | goto out; | |
1557 | } | |
1558 | ||
4627bc77 | 1559 | run_commit_hook(0, r->index_file, "post-commit", NULL); |
356ee465 | 1560 | if (flags & AMEND_MSG) |
1d18d758 | 1561 | commit_post_rewrite(r, current_head, oid); |
356ee465 PW |
1562 | |
1563 | out: | |
1564 | free_commit_extra_headers(extra); | |
1565 | strbuf_release(&err); | |
66618a50 | 1566 | strbuf_release(&commit_msg); |
4d924528 | 1567 | free(amend_author); |
356ee465 PW |
1568 | |
1569 | return res; | |
1570 | } | |
1571 | ||
430b75f7 PW |
1572 | static int write_rebase_head(struct object_id *oid) |
1573 | { | |
1574 | if (update_ref("rebase", "REBASE_HEAD", oid, | |
1575 | NULL, REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) | |
1576 | return error(_("could not update %s"), "REBASE_HEAD"); | |
1577 | ||
1578 | return 0; | |
1579 | } | |
1580 | ||
f11c9580 NTND |
1581 | static int do_commit(struct repository *r, |
1582 | const char *msg_file, const char *author, | |
430b75f7 PW |
1583 | struct replay_opts *opts, unsigned int flags, |
1584 | struct object_id *oid) | |
356ee465 PW |
1585 | { |
1586 | int res = 1; | |
1587 | ||
b0a31861 | 1588 | if (!(flags & EDIT_MSG) && !(flags & VERIFY_MSG)) { |
356ee465 PW |
1589 | struct object_id oid; |
1590 | struct strbuf sb = STRBUF_INIT; | |
1591 | ||
1592 | if (msg_file && strbuf_read_file(&sb, msg_file, 2048) < 0) | |
1593 | return error_errno(_("unable to read commit message " | |
1594 | "from '%s'"), | |
1595 | msg_file); | |
1596 | ||
f11c9580 NTND |
1597 | res = try_to_commit(r, msg_file ? &sb : NULL, |
1598 | author, opts, flags, &oid); | |
356ee465 PW |
1599 | strbuf_release(&sb); |
1600 | if (!res) { | |
c8e4159e HWN |
1601 | refs_delete_ref(get_main_ref_store(r), "", |
1602 | "CHERRY_PICK_HEAD", NULL, 0); | |
f11c9580 | 1603 | unlink(git_path_merge_msg(r)); |
356ee465 | 1604 | if (!is_rebase_i(opts)) |
f11c9580 | 1605 | print_commit_summary(r, NULL, &oid, |
356ee465 PW |
1606 | SUMMARY_SHOW_AUTHOR_DATE); |
1607 | return res; | |
1608 | } | |
1609 | } | |
430b75f7 PW |
1610 | if (res == 1) { |
1611 | if (is_rebase_i(opts) && oid) | |
1612 | if (write_rebase_head(oid)) | |
1613 | return -1; | |
20f4b044 | 1614 | return run_git_commit(msg_file, opts, flags); |
430b75f7 | 1615 | } |
356ee465 PW |
1616 | |
1617 | return res; | |
1618 | } | |
1619 | ||
b27cfb0d NH |
1620 | static int is_original_commit_empty(struct commit *commit) |
1621 | { | |
092bbcdf | 1622 | const struct object_id *ptree_oid; |
b27cfb0d NH |
1623 | |
1624 | if (parse_commit(commit)) | |
aee42e1f | 1625 | return error(_("could not parse commit %s"), |
f2fd0760 | 1626 | oid_to_hex(&commit->object.oid)); |
b27cfb0d NH |
1627 | if (commit->parents) { |
1628 | struct commit *parent = commit->parents->item; | |
1629 | if (parse_commit(parent)) | |
aee42e1f | 1630 | return error(_("could not parse parent commit %s"), |
f2fd0760 | 1631 | oid_to_hex(&parent->object.oid)); |
2e27bd77 | 1632 | ptree_oid = get_commit_tree_oid(parent); |
b27cfb0d | 1633 | } else { |
eb0ccfd7 | 1634 | ptree_oid = the_hash_algo->empty_tree; /* commit is root */ |
043a4492 | 1635 | } |
043a4492 | 1636 | |
4a7e27e9 | 1637 | return oideq(ptree_oid, get_commit_tree_oid(commit)); |
043a4492 RR |
1638 | } |
1639 | ||
ac2b0e8f | 1640 | /* |
e98c4269 EN |
1641 | * Should empty commits be allowed? Return status: |
1642 | * <0: Error in is_index_unchanged(r) or is_original_commit_empty(commit) | |
1643 | * 0: Halt on empty commit | |
1644 | * 1: Allow empty commit | |
1645 | * 2: Drop empty commit | |
ac2b0e8f | 1646 | */ |
f11c9580 NTND |
1647 | static int allow_empty(struct repository *r, |
1648 | struct replay_opts *opts, | |
1649 | struct commit *commit) | |
ac2b0e8f | 1650 | { |
d48e5e21 | 1651 | int index_unchanged, originally_empty; |
ac2b0e8f JH |
1652 | |
1653 | /* | |
e98c4269 | 1654 | * Four cases: |
ac2b0e8f JH |
1655 | * |
1656 | * (1) we do not allow empty at all and error out. | |
1657 | * | |
e98c4269 EN |
1658 | * (2) we allow ones that were initially empty, and |
1659 | * just drop the ones that become empty | |
ac2b0e8f | 1660 | * |
e98c4269 EN |
1661 | * (3) we allow ones that were initially empty, but |
1662 | * halt for the ones that become empty; | |
1663 | * | |
1664 | * (4) we allow both. | |
ac2b0e8f JH |
1665 | */ |
1666 | if (!opts->allow_empty) | |
1667 | return 0; /* let "git commit" barf as necessary */ | |
1668 | ||
005af339 | 1669 | index_unchanged = is_index_unchanged(r); |
ac2b0e8f JH |
1670 | if (index_unchanged < 0) |
1671 | return index_unchanged; | |
1672 | if (!index_unchanged) | |
1673 | return 0; /* we do not have to say --allow-empty */ | |
1674 | ||
1675 | if (opts->keep_redundant_commits) | |
1676 | return 1; | |
1677 | ||
d48e5e21 EN |
1678 | originally_empty = is_original_commit_empty(commit); |
1679 | if (originally_empty < 0) | |
1680 | return originally_empty; | |
e98c4269 | 1681 | if (originally_empty) |
ac2b0e8f | 1682 | return 1; |
e98c4269 EN |
1683 | else if (opts->drop_redundant_commits) |
1684 | return 2; | |
1685 | else | |
1686 | return 0; | |
ac2b0e8f JH |
1687 | } |
1688 | ||
414697a9 JS |
1689 | static struct { |
1690 | char c; | |
1691 | const char *str; | |
1692 | } todo_command_info[] = { | |
1693 | { 'p', "pick" }, | |
1694 | { 0, "revert" }, | |
1695 | { 'e', "edit" }, | |
04efc8b5 | 1696 | { 'r', "reword" }, |
414697a9 JS |
1697 | { 'f', "fixup" }, |
1698 | { 's', "squash" }, | |
1699 | { 'x', "exec" }, | |
71f82465 | 1700 | { 'b', "break" }, |
9055e401 JS |
1701 | { 'l', "label" }, |
1702 | { 't', "reset" }, | |
4c68e7dd | 1703 | { 'm', "merge" }, |
b3fdd581 | 1704 | { 0, "noop" }, |
ac191470 JS |
1705 | { 'd', "drop" }, |
1706 | { 0, NULL } | |
004fefa7 JS |
1707 | }; |
1708 | ||
1709 | static const char *command_to_string(const enum todo_command command) | |
1710 | { | |
ac191470 | 1711 | if (command < TODO_COMMENT) |
414697a9 | 1712 | return todo_command_info[command].str; |
02127c63 | 1713 | die(_("unknown command: %d"), command); |
004fefa7 JS |
1714 | } |
1715 | ||
ee5462d6 | 1716 | static char command_to_char(const enum todo_command command) |
d8ae6c84 | 1717 | { |
68e7090f | 1718 | if (command < TODO_COMMENT) |
d8ae6c84 LB |
1719 | return todo_command_info[command].c; |
1720 | return comment_line_char; | |
1721 | } | |
1722 | ||
25c43667 JS |
1723 | static int is_noop(const enum todo_command command) |
1724 | { | |
b3fdd581 | 1725 | return TODO_NOOP <= command; |
25c43667 | 1726 | } |
004fefa7 | 1727 | |
6e98de72 JS |
1728 | static int is_fixup(enum todo_command command) |
1729 | { | |
1730 | return command == TODO_FIXUP || command == TODO_SQUASH; | |
1731 | } | |
1732 | ||
d87d48b2 JS |
1733 | /* Does this command create a (non-merge) commit? */ |
1734 | static int is_pick_or_similar(enum todo_command command) | |
1735 | { | |
1736 | switch (command) { | |
1737 | case TODO_PICK: | |
1738 | case TODO_REVERT: | |
1739 | case TODO_EDIT: | |
1740 | case TODO_REWORD: | |
1741 | case TODO_FIXUP: | |
1742 | case TODO_SQUASH: | |
1743 | return 1; | |
1744 | default: | |
1745 | return 0; | |
1746 | } | |
1747 | } | |
1748 | ||
9e3cebd9 CM |
1749 | enum todo_item_flags { |
1750 | TODO_EDIT_MERGE_MSG = (1 << 0), | |
1751 | TODO_REPLACE_FIXUP_MSG = (1 << 1), | |
1752 | TODO_EDIT_FIXUP_MSG = (1 << 2), | |
1753 | }; | |
1754 | ||
71ee81cd CM |
1755 | static const char first_commit_msg_str[] = N_("This is the 1st commit message:"); |
1756 | static const char nth_commit_msg_fmt[] = N_("This is the commit message #%d:"); | |
9e3cebd9 | 1757 | static const char skip_first_commit_msg_str[] = N_("The 1st commit message will be skipped:"); |
71ee81cd CM |
1758 | static const char skip_nth_commit_msg_fmt[] = N_("The commit message #%d will be skipped:"); |
1759 | static const char combined_commit_msg_fmt[] = N_("This is a combination of %d commits."); | |
1760 | ||
1f969601 | 1761 | static int is_fixup_flag(enum todo_command command, unsigned flag) |
498bb5b8 | 1762 | { |
9e3cebd9 CM |
1763 | return command == TODO_FIXUP && ((flag & TODO_REPLACE_FIXUP_MSG) || |
1764 | (flag & TODO_EDIT_FIXUP_MSG)); | |
1765 | } | |
7cdb9682 | 1766 | |
9e3cebd9 CM |
1767 | /* |
1768 | * Wrapper around strbuf_add_commented_lines() which avoids double | |
1769 | * commenting commit subjects. | |
1770 | */ | |
1771 | static void add_commented_lines(struct strbuf *buf, const void *str, size_t len) | |
1772 | { | |
1773 | const char *s = str; | |
1774 | while (len > 0 && s[0] == comment_line_char) { | |
1775 | size_t count; | |
1776 | const char *n = memchr(s, '\n', len); | |
1777 | if (!n) | |
1778 | count = len; | |
1779 | else | |
1780 | count = n - s + 1; | |
1781 | strbuf_add(buf, s, count); | |
1782 | s += count; | |
1783 | len -= count; | |
1784 | } | |
1785 | strbuf_add_commented_lines(buf, s, len); | |
1786 | } | |
1787 | ||
1788 | /* Does the current fixup chain contain a squash command? */ | |
1789 | static int seen_squash(struct replay_opts *opts) | |
1790 | { | |
1791 | return starts_with(opts->current_fixups.buf, "squash") || | |
1792 | strstr(opts->current_fixups.buf, "\nsquash"); | |
1793 | } | |
1794 | ||
1795 | static void update_comment_bufs(struct strbuf *buf1, struct strbuf *buf2, int n) | |
1796 | { | |
1797 | strbuf_setlen(buf1, 2); | |
1798 | strbuf_addf(buf1, _(nth_commit_msg_fmt), n); | |
1799 | strbuf_addch(buf1, '\n'); | |
1800 | strbuf_setlen(buf2, 2); | |
1801 | strbuf_addf(buf2, _(skip_nth_commit_msg_fmt), n); | |
1802 | strbuf_addch(buf2, '\n'); | |
1803 | } | |
1804 | ||
1805 | /* | |
1806 | * Comment out any un-commented commit messages, updating the message comments | |
1807 | * to say they will be skipped but do not comment out the empty lines that | |
1808 | * surround commit messages and their comments. | |
1809 | */ | |
1810 | static void update_squash_message_for_fixup(struct strbuf *msg) | |
1811 | { | |
1812 | void (*copy_lines)(struct strbuf *, const void *, size_t) = strbuf_add; | |
1813 | struct strbuf buf1 = STRBUF_INIT, buf2 = STRBUF_INIT; | |
1814 | const char *s, *start; | |
1815 | char *orig_msg; | |
1816 | size_t orig_msg_len; | |
1817 | int i = 1; | |
1818 | ||
1819 | strbuf_addf(&buf1, "# %s\n", _(first_commit_msg_str)); | |
1820 | strbuf_addf(&buf2, "# %s\n", _(skip_first_commit_msg_str)); | |
1821 | s = start = orig_msg = strbuf_detach(msg, &orig_msg_len); | |
1822 | while (s) { | |
1823 | const char *next; | |
1824 | size_t off; | |
1825 | if (skip_prefix(s, buf1.buf, &next)) { | |
1826 | /* | |
1827 | * Copy the last message, preserving the blank line | |
1828 | * preceding the current line | |
1829 | */ | |
1830 | off = (s > start + 1 && s[-2] == '\n') ? 1 : 0; | |
1831 | copy_lines(msg, start, s - start - off); | |
1832 | if (off) | |
1833 | strbuf_addch(msg, '\n'); | |
1834 | /* | |
1835 | * The next message needs to be commented out but the | |
1836 | * message header is already commented out so just copy | |
1837 | * it and the blank line that follows it. | |
1838 | */ | |
1839 | strbuf_addbuf(msg, &buf2); | |
1840 | if (*next == '\n') | |
1841 | strbuf_addch(msg, *next++); | |
1842 | start = s = next; | |
1843 | copy_lines = add_commented_lines; | |
1844 | update_comment_bufs(&buf1, &buf2, ++i); | |
1845 | } else if (skip_prefix(s, buf2.buf, &next)) { | |
1846 | off = (s > start + 1 && s[-2] == '\n') ? 1 : 0; | |
1847 | copy_lines(msg, start, s - start - off); | |
1848 | start = s - off; | |
1849 | s = next; | |
1850 | copy_lines = strbuf_add; | |
1851 | update_comment_bufs(&buf1, &buf2, ++i); | |
1852 | } else { | |
1853 | s = strchr(s, '\n'); | |
1854 | if (s) | |
1855 | s++; | |
1856 | } | |
1857 | } | |
1858 | copy_lines(msg, start, orig_msg_len - (start - orig_msg)); | |
1859 | free(orig_msg); | |
1860 | strbuf_release(&buf1); | |
1861 | strbuf_release(&buf2); | |
1862 | } | |
1863 | ||
1864 | static int append_squash_message(struct strbuf *buf, const char *body, | |
1865 | enum todo_command command, struct replay_opts *opts, | |
a25314c1 | 1866 | unsigned flag) |
9e3cebd9 CM |
1867 | { |
1868 | const char *fixup_msg; | |
1869 | size_t commented_len = 0, fixup_off; | |
1870 | /* | |
1871 | * amend is non-interactive and not normally used with fixup! | |
1872 | * or squash! commits, so only comment out those subjects when | |
1873 | * squashing commit messages. | |
1874 | */ | |
1875 | if (starts_with(body, "amend!") || | |
1876 | ((command == TODO_SQUASH || seen_squash(opts)) && | |
1877 | (starts_with(body, "squash!") || starts_with(body, "fixup!")))) | |
6e0e2887 | 1878 | commented_len = commit_subject_length(body); |
9e3cebd9 | 1879 | |
498bb5b8 | 1880 | strbuf_addf(buf, "\n%c ", comment_line_char); |
71ee81cd | 1881 | strbuf_addf(buf, _(nth_commit_msg_fmt), |
498bb5b8 PW |
1882 | ++opts->current_fixup_count + 1); |
1883 | strbuf_addstr(buf, "\n\n"); | |
7cdb9682 | 1884 | strbuf_add_commented_lines(buf, body, commented_len); |
9e3cebd9 CM |
1885 | /* buf->buf may be reallocated so store an offset into the buffer */ |
1886 | fixup_off = buf->len; | |
7cdb9682 | 1887 | strbuf_addstr(buf, body + commented_len); |
9e3cebd9 CM |
1888 | |
1889 | /* fixup -C after squash behaves like squash */ | |
1f969601 | 1890 | if (is_fixup_flag(command, flag) && !seen_squash(opts)) { |
9e3cebd9 CM |
1891 | /* |
1892 | * We're replacing the commit message so we need to | |
1893 | * append the Signed-off-by: trailer if the user | |
1894 | * requested '--signoff'. | |
1895 | */ | |
1896 | if (opts->signoff) | |
1897 | append_signoff(buf, 0, 0); | |
1898 | ||
1899 | if ((command == TODO_FIXUP) && | |
1900 | (flag & TODO_REPLACE_FIXUP_MSG) && | |
1901 | (file_exists(rebase_path_fixup_msg()) || | |
1902 | !file_exists(rebase_path_squash_msg()))) { | |
1903 | fixup_msg = skip_blank_lines(buf->buf + fixup_off); | |
1904 | if (write_message(fixup_msg, strlen(fixup_msg), | |
1905 | rebase_path_fixup_msg(), 0) < 0) | |
1906 | return error(_("cannot write '%s'"), | |
1907 | rebase_path_fixup_msg()); | |
1908 | } else { | |
1909 | unlink(rebase_path_fixup_msg()); | |
1910 | } | |
1911 | } else { | |
1912 | unlink(rebase_path_fixup_msg()); | |
1913 | } | |
1914 | ||
1915 | return 0; | |
498bb5b8 PW |
1916 | } |
1917 | ||
005af339 NTND |
1918 | static int update_squash_messages(struct repository *r, |
1919 | enum todo_command command, | |
1920 | struct commit *commit, | |
9e3cebd9 | 1921 | struct replay_opts *opts, |
a25314c1 | 1922 | unsigned flag) |
6e98de72 JS |
1923 | { |
1924 | struct strbuf buf = STRBUF_INIT; | |
9e3cebd9 | 1925 | int res = 0; |
6e98de72 | 1926 | const char *message, *body; |
b3757442 | 1927 | const char *encoding = get_commit_output_encoding(); |
6e98de72 | 1928 | |
e12a7ef5 | 1929 | if (opts->current_fixup_count > 0) { |
6e98de72 | 1930 | struct strbuf header = STRBUF_INIT; |
e12a7ef5 | 1931 | char *eol; |
6e98de72 | 1932 | |
e12a7ef5 | 1933 | if (strbuf_read_file(&buf, rebase_path_squash_msg(), 9) <= 0) |
6e98de72 JS |
1934 | return error(_("could not read '%s'"), |
1935 | rebase_path_squash_msg()); | |
1936 | ||
e12a7ef5 JS |
1937 | eol = buf.buf[0] != comment_line_char ? |
1938 | buf.buf : strchrnul(buf.buf, '\n'); | |
6e98de72 JS |
1939 | |
1940 | strbuf_addf(&header, "%c ", comment_line_char); | |
71ee81cd | 1941 | strbuf_addf(&header, _(combined_commit_msg_fmt), |
e12a7ef5 | 1942 | opts->current_fixup_count + 2); |
6e98de72 JS |
1943 | strbuf_splice(&buf, 0, eol - buf.buf, header.buf, header.len); |
1944 | strbuf_release(&header); | |
1f969601 | 1945 | if (is_fixup_flag(command, flag) && !seen_squash(opts)) |
9e3cebd9 | 1946 | update_squash_message_for_fixup(&buf); |
6e98de72 | 1947 | } else { |
33d66df3 | 1948 | struct object_id head; |
6e98de72 JS |
1949 | struct commit *head_commit; |
1950 | const char *head_message, *body; | |
1951 | ||
33d66df3 | 1952 | if (get_oid("HEAD", &head)) |
6e98de72 | 1953 | return error(_("need a HEAD to fixup")); |
005af339 | 1954 | if (!(head_commit = lookup_commit_reference(r, &head))) |
6e98de72 | 1955 | return error(_("could not read HEAD")); |
b3757442 | 1956 | if (!(head_message = logmsg_reencode(head_commit, NULL, encoding))) |
6e98de72 JS |
1957 | return error(_("could not read HEAD's commit message")); |
1958 | ||
1959 | find_commit_subject(head_message, &body); | |
9e3cebd9 | 1960 | if (command == TODO_FIXUP && !flag && write_message(body, strlen(body), |
eab0df0e | 1961 | rebase_path_fixup_msg(), 0) < 0) { |
6e98de72 | 1962 | unuse_commit_buffer(head_commit, head_message); |
eab0df0e | 1963 | return error(_("cannot write '%s'"), rebase_path_fixup_msg()); |
6e98de72 | 1964 | } |
6e98de72 | 1965 | strbuf_addf(&buf, "%c ", comment_line_char); |
71ee81cd | 1966 | strbuf_addf(&buf, _(combined_commit_msg_fmt), 2); |
6e98de72 | 1967 | strbuf_addf(&buf, "\n%c ", comment_line_char); |
1f969601 | 1968 | strbuf_addstr(&buf, is_fixup_flag(command, flag) ? |
9e3cebd9 CM |
1969 | _(skip_first_commit_msg_str) : |
1970 | _(first_commit_msg_str)); | |
6e98de72 | 1971 | strbuf_addstr(&buf, "\n\n"); |
1f969601 | 1972 | if (is_fixup_flag(command, flag)) |
9e3cebd9 CM |
1973 | strbuf_add_commented_lines(&buf, body, strlen(body)); |
1974 | else | |
1975 | strbuf_addstr(&buf, body); | |
6e98de72 JS |
1976 | |
1977 | unuse_commit_buffer(head_commit, head_message); | |
1978 | } | |
1979 | ||
b3757442 | 1980 | if (!(message = logmsg_reencode(commit, NULL, encoding))) |
6e98de72 JS |
1981 | return error(_("could not read commit message of %s"), |
1982 | oid_to_hex(&commit->object.oid)); | |
1983 | find_commit_subject(message, &body); | |
1984 | ||
1f969601 | 1985 | if (command == TODO_SQUASH || is_fixup_flag(command, flag)) { |
9e3cebd9 | 1986 | res = append_squash_message(&buf, body, command, opts, flag); |
6e98de72 JS |
1987 | } else if (command == TODO_FIXUP) { |
1988 | strbuf_addf(&buf, "\n%c ", comment_line_char); | |
71ee81cd | 1989 | strbuf_addf(&buf, _(skip_nth_commit_msg_fmt), |
dd2e36eb | 1990 | ++opts->current_fixup_count + 1); |
6e98de72 JS |
1991 | strbuf_addstr(&buf, "\n\n"); |
1992 | strbuf_add_commented_lines(&buf, body, strlen(body)); | |
1993 | } else | |
1994 | return error(_("unknown command: %d"), command); | |
1995 | unuse_commit_buffer(commit, message); | |
1996 | ||
9e3cebd9 CM |
1997 | if (!res) |
1998 | res = write_message(buf.buf, buf.len, rebase_path_squash_msg(), | |
1999 | 0); | |
6e98de72 | 2000 | strbuf_release(&buf); |
e12a7ef5 JS |
2001 | |
2002 | if (!res) { | |
2003 | strbuf_addf(&opts->current_fixups, "%s%s %s", | |
2004 | opts->current_fixups.len ? "\n" : "", | |
2005 | command_to_string(command), | |
2006 | oid_to_hex(&commit->object.oid)); | |
2007 | res = write_message(opts->current_fixups.buf, | |
2008 | opts->current_fixups.len, | |
2009 | rebase_path_current_fixups(), 0); | |
2010 | } | |
2011 | ||
6e98de72 JS |
2012 | return res; |
2013 | } | |
2014 | ||
3b335762 NTND |
2015 | static void flush_rewritten_pending(void) |
2016 | { | |
25cb8df9 | 2017 | struct strbuf buf = STRBUF_INIT; |
092bbcdf | 2018 | struct object_id newoid; |
25cb8df9 JS |
2019 | FILE *out; |
2020 | ||
092bbcdf | 2021 | if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), (GIT_MAX_HEXSZ + 1) * 2) > 0 && |
2022 | !get_oid("HEAD", &newoid) && | |
e9d983f1 | 2023 | (out = fopen_or_warn(rebase_path_rewritten_list(), "a"))) { |
25cb8df9 JS |
2024 | char *bol = buf.buf, *eol; |
2025 | ||
2026 | while (*bol) { | |
2027 | eol = strchrnul(bol, '\n'); | |
2028 | fprintf(out, "%.*s %s\n", (int)(eol - bol), | |
092bbcdf | 2029 | bol, oid_to_hex(&newoid)); |
25cb8df9 JS |
2030 | if (!*eol) |
2031 | break; | |
2032 | bol = eol + 1; | |
2033 | } | |
2034 | fclose(out); | |
2035 | unlink(rebase_path_rewritten_pending()); | |
2036 | } | |
2037 | strbuf_release(&buf); | |
2038 | } | |
2039 | ||
2040 | static void record_in_rewritten(struct object_id *oid, | |
3b335762 NTND |
2041 | enum todo_command next_command) |
2042 | { | |
e9d983f1 | 2043 | FILE *out = fopen_or_warn(rebase_path_rewritten_pending(), "a"); |
25cb8df9 JS |
2044 | |
2045 | if (!out) | |
2046 | return; | |
2047 | ||
2048 | fprintf(out, "%s\n", oid_to_hex(oid)); | |
2049 | fclose(out); | |
2050 | ||
2051 | if (!is_fixup(next_command)) | |
2052 | flush_rewritten_pending(); | |
2053 | } | |
2054 | ||
39edfd5c EN |
2055 | static int should_edit(struct replay_opts *opts) { |
2056 | if (opts->edit < 0) | |
2057 | /* | |
2058 | * Note that we only handle the case of non-conflicted | |
2059 | * commits; continue_single_pick() handles the conflicted | |
2060 | * commits itself instead of calling this function. | |
2061 | */ | |
2062 | return (opts->action == REPLAY_REVERT && isatty(0)) ? 1 : 0; | |
2063 | return opts->edit; | |
2064 | } | |
2065 | ||
f11c9580 | 2066 | static int do_pick_commit(struct repository *r, |
ae70e34f | 2067 | struct todo_item *item, |
f11c9580 | 2068 | struct replay_opts *opts, |
a47ba3c7 | 2069 | int final_fixup, int *check_todo) |
043a4492 | 2070 | { |
39edfd5c EN |
2071 | unsigned int flags = should_edit(opts) ? EDIT_MSG : 0; |
2072 | const char *msg_file = should_edit(opts) ? NULL : git_path_merge_msg(r); | |
ace976b2 | 2073 | struct object_id head; |
043a4492 RR |
2074 | struct commit *base, *next, *parent; |
2075 | const char *base_label, *next_label; | |
356ee465 | 2076 | char *author = NULL; |
d74a4e57 | 2077 | struct commit_message msg = { NULL, NULL, NULL, NULL }; |
043a4492 | 2078 | struct strbuf msgbuf = STRBUF_INIT; |
e98c4269 | 2079 | int res, unborn = 0, reword = 0, allow, drop_commit; |
ae70e34f CM |
2080 | enum todo_command command = item->command; |
2081 | struct commit *commit = item->commit; | |
043a4492 RR |
2082 | |
2083 | if (opts->no_commit) { | |
2084 | /* | |
2085 | * We do not intend to commit immediately. We just want to | |
2086 | * merge the differences in, so let's compute the tree | |
81483fe6 | 2087 | * that represents the "current" state for the merge machinery |
043a4492 RR |
2088 | * to work on. |
2089 | */ | |
f11c9580 | 2090 | if (write_index_as_tree(&head, r->index, r->index_file, 0, NULL)) |
93b3df6f | 2091 | return error(_("your index file is unmerged.")); |
043a4492 | 2092 | } else { |
ace976b2 | 2093 | unborn = get_oid("HEAD", &head); |
d87d48b2 JS |
2094 | /* Do we want to generate a root commit? */ |
2095 | if (is_pick_or_similar(command) && opts->have_squash_onto && | |
4a7e27e9 | 2096 | oideq(&head, &opts->squash_onto)) { |
d87d48b2 JS |
2097 | if (is_fixup(command)) |
2098 | return error(_("cannot fixup root commit")); | |
2099 | flags |= CREATE_ROOT_COMMIT; | |
2100 | unborn = 1; | |
2101 | } else if (unborn) | |
eb0ccfd7 | 2102 | oidcpy(&head, the_hash_algo->empty_tree); |
ffc00a48 | 2103 | if (index_differs_from(r, unborn ? empty_tree_oid_hex() : "HEAD", |
02f2f56b | 2104 | NULL, 0)) |
e1ff0a32 | 2105 | return error_dirty_index(r, opts); |
043a4492 | 2106 | } |
f11c9580 | 2107 | discard_index(r->index); |
043a4492 | 2108 | |
637666c8 | 2109 | if (!commit->parents) |
043a4492 | 2110 | parent = NULL; |
043a4492 RR |
2111 | else if (commit->parents->next) { |
2112 | /* Reverting or cherry-picking a merge commit */ | |
2113 | int cnt; | |
2114 | struct commit_list *p; | |
2115 | ||
2116 | if (!opts->mainline) | |
93b3df6f | 2117 | return error(_("commit %s is a merge but no -m option was given."), |
f2fd0760 | 2118 | oid_to_hex(&commit->object.oid)); |
043a4492 RR |
2119 | |
2120 | for (cnt = 1, p = commit->parents; | |
2121 | cnt != opts->mainline && p; | |
2122 | cnt++) | |
2123 | p = p->next; | |
2124 | if (cnt != opts->mainline || !p) | |
93b3df6f | 2125 | return error(_("commit %s does not have parent %d"), |
f2fd0760 | 2126 | oid_to_hex(&commit->object.oid), opts->mainline); |
043a4492 | 2127 | parent = p->item; |
37897bfc SO |
2128 | } else if (1 < opts->mainline) |
2129 | /* | |
2130 | * Non-first parent explicitly specified as mainline for | |
2131 | * non-merge commit | |
2132 | */ | |
2133 | return error(_("commit %s does not have parent %d"), | |
2134 | oid_to_hex(&commit->object.oid), opts->mainline); | |
043a4492 RR |
2135 | else |
2136 | parent = commit->parents->item; | |
2137 | ||
bcbb68be JS |
2138 | if (get_message(commit, &msg) != 0) |
2139 | return error(_("cannot get commit message for %s"), | |
2140 | oid_to_hex(&commit->object.oid)); | |
2141 | ||
6e98de72 | 2142 | if (opts->allow_ff && !is_fixup(command) && |
4a7e27e9 | 2143 | ((parent && oideq(&parent->object.oid, &head)) || |
bcbb68be JS |
2144 | (!parent && unborn))) { |
2145 | if (is_rebase_i(opts)) | |
2146 | write_author_script(msg.message); | |
f11c9580 | 2147 | res = fast_forward_to(r, &commit->object.oid, &head, unborn, |
bcbb68be JS |
2148 | opts); |
2149 | if (res || command != TODO_REWORD) | |
2150 | goto leave; | |
450efe2d | 2151 | reword = 1; |
bcbb68be JS |
2152 | msg_file = NULL; |
2153 | goto fast_forward_edit; | |
2154 | } | |
043a4492 | 2155 | if (parent && parse_commit(parent) < 0) |
004fefa7 JS |
2156 | /* TRANSLATORS: The first %s will be a "todo" command like |
2157 | "revert" or "pick", the second %s a SHA1. */ | |
043a4492 | 2158 | return error(_("%s: cannot parse parent commit %s"), |
004fefa7 JS |
2159 | command_to_string(command), |
2160 | oid_to_hex(&parent->object.oid)); | |
043a4492 | 2161 | |
043a4492 RR |
2162 | /* |
2163 | * "commit" is an existing commit. We would want to apply | |
2164 | * the difference it introduces since its first parent "prev" | |
2165 | * on top of the current HEAD if we are cherry-pick. Or the | |
2166 | * reverse of it if we are revert. | |
2167 | */ | |
2168 | ||
004fefa7 | 2169 | if (command == TODO_REVERT) { |
043a4492 RR |
2170 | base = commit; |
2171 | base_label = msg.label; | |
2172 | next = parent; | |
2173 | next_label = msg.parent_label; | |
2174 | strbuf_addstr(&msgbuf, "Revert \""); | |
2175 | strbuf_addstr(&msgbuf, msg.subject); | |
2176 | strbuf_addstr(&msgbuf, "\"\n\nThis reverts commit "); | |
f2fd0760 | 2177 | strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid)); |
043a4492 RR |
2178 | |
2179 | if (commit->parents && commit->parents->next) { | |
2180 | strbuf_addstr(&msgbuf, ", reversing\nchanges made to "); | |
f2fd0760 | 2181 | strbuf_addstr(&msgbuf, oid_to_hex(&parent->object.oid)); |
043a4492 RR |
2182 | } |
2183 | strbuf_addstr(&msgbuf, ".\n"); | |
2184 | } else { | |
2185 | const char *p; | |
2186 | ||
2187 | base = parent; | |
2188 | base_label = msg.parent_label; | |
2189 | next = commit; | |
2190 | next_label = msg.label; | |
2191 | ||
23aa5142 JS |
2192 | /* Append the commit log message to msgbuf. */ |
2193 | if (find_commit_subject(msg.message, &p)) | |
2194 | strbuf_addstr(&msgbuf, p); | |
043a4492 RR |
2195 | |
2196 | if (opts->record_origin) { | |
44dc738a | 2197 | strbuf_complete_line(&msgbuf); |
bab4d109 | 2198 | if (!has_conforming_footer(&msgbuf, NULL, 0)) |
b971e04f | 2199 | strbuf_addch(&msgbuf, '\n'); |
cd650a4e | 2200 | strbuf_addstr(&msgbuf, cherry_picked_prefix); |
f2fd0760 | 2201 | strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid)); |
043a4492 RR |
2202 | strbuf_addstr(&msgbuf, ")\n"); |
2203 | } | |
356ee465 PW |
2204 | if (!is_fixup(command)) |
2205 | author = get_author(msg.message); | |
043a4492 RR |
2206 | } |
2207 | ||
04efc8b5 | 2208 | if (command == TODO_REWORD) |
450efe2d | 2209 | reword = 1; |
04efc8b5 | 2210 | else if (is_fixup(command)) { |
9e3cebd9 CM |
2211 | if (update_squash_messages(r, command, commit, |
2212 | opts, item->flags)) | |
6e98de72 | 2213 | return -1; |
789b3eff | 2214 | flags |= AMEND_MSG; |
6e98de72 JS |
2215 | if (!final_fixup) |
2216 | msg_file = rebase_path_squash_msg(); | |
2217 | else if (file_exists(rebase_path_fixup_msg())) { | |
f7d42cee | 2218 | flags |= VERBATIM_MSG; |
6e98de72 JS |
2219 | msg_file = rebase_path_fixup_msg(); |
2220 | } else { | |
f11c9580 | 2221 | const char *dest = git_path_squash_msg(r); |
6e98de72 JS |
2222 | unlink(dest); |
2223 | if (copy_file(dest, rebase_path_squash_msg(), 0666)) | |
2224 | return error(_("could not rename '%s' to '%s'"), | |
2225 | rebase_path_squash_msg(), dest); | |
f11c9580 | 2226 | unlink(git_path_merge_msg(r)); |
6e98de72 | 2227 | msg_file = dest; |
789b3eff | 2228 | flags |= EDIT_MSG; |
6e98de72 JS |
2229 | } |
2230 | } | |
2231 | ||
a852ec7f | 2232 | if (opts->signoff && !is_fixup(command)) |
b34eeea3 PW |
2233 | append_signoff(&msgbuf, 0, 0); |
2234 | ||
0473f28a JS |
2235 | if (is_rebase_i(opts) && write_author_script(msg.message) < 0) |
2236 | res = -1; | |
14c4586c EN |
2237 | else if (!opts->strategy || |
2238 | !strcmp(opts->strategy, "recursive") || | |
2239 | !strcmp(opts->strategy, "ort") || | |
2240 | command == TODO_REVERT) { | |
f11c9580 | 2241 | res = do_recursive_merge(r, base, next, base_label, next_label, |
48be4c62 | 2242 | &head, &msgbuf, opts); |
f241ff0d | 2243 | if (res < 0) |
19517fb9 SB |
2244 | goto leave; |
2245 | ||
75871495 | 2246 | res |= write_message(msgbuf.buf, msgbuf.len, |
f11c9580 | 2247 | git_path_merge_msg(r), 0); |
043a4492 RR |
2248 | } else { |
2249 | struct commit_list *common = NULL; | |
2250 | struct commit_list *remotes = NULL; | |
2251 | ||
75871495 | 2252 | res = write_message(msgbuf.buf, msgbuf.len, |
f11c9580 | 2253 | git_path_merge_msg(r), 0); |
043a4492 RR |
2254 | |
2255 | commit_list_insert(base, &common); | |
2256 | commit_list_insert(next, &remotes); | |
f11c9580 | 2257 | res |= try_merge_command(r, opts->strategy, |
03a4e260 | 2258 | opts->xopts_nr, (const char **)opts->xopts, |
ace976b2 | 2259 | common, oid_to_hex(&head), remotes); |
043a4492 RR |
2260 | free_commit_list(common); |
2261 | free_commit_list(remotes); | |
2262 | } | |
452202c7 | 2263 | strbuf_release(&msgbuf); |
043a4492 RR |
2264 | |
2265 | /* | |
2266 | * If the merge was clean or if it failed due to conflict, we write | |
2267 | * CHERRY_PICK_HEAD for the subsequent invocation of commit to use. | |
2268 | * However, if the merge did not even start, then we don't want to | |
2269 | * write it at all. | |
2270 | */ | |
21b11c6d PW |
2271 | if ((command == TODO_PICK || command == TODO_REWORD || |
2272 | command == TODO_EDIT) && !opts->no_commit && | |
2273 | (res == 0 || res == 1) && | |
ae077771 | 2274 | update_ref(NULL, "CHERRY_PICK_HEAD", &commit->object.oid, NULL, |
91774afc | 2275 | REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) |
dbfad033 | 2276 | res = -1; |
004fefa7 | 2277 | if (command == TODO_REVERT && ((opts->no_commit && res == 0) || res == 1) && |
ae077771 | 2278 | update_ref(NULL, "REVERT_HEAD", &commit->object.oid, NULL, |
91774afc | 2279 | REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) |
dbfad033 | 2280 | res = -1; |
043a4492 RR |
2281 | |
2282 | if (res) { | |
004fefa7 | 2283 | error(command == TODO_REVERT |
043a4492 RR |
2284 | ? _("could not revert %s... %s") |
2285 | : _("could not apply %s... %s"), | |
39755964 | 2286 | short_commit_name(commit), msg.subject); |
005af339 | 2287 | print_advice(r, res == 1, opts); |
f11c9580 | 2288 | repo_rerere(r, opts->allow_rerere_auto); |
c8d1351d | 2289 | goto leave; |
043a4492 RR |
2290 | } |
2291 | ||
e98c4269 | 2292 | drop_commit = 0; |
f11c9580 | 2293 | allow = allow_empty(r, opts, commit); |
706728a3 FC |
2294 | if (allow < 0) { |
2295 | res = allow; | |
2296 | goto leave; | |
e98c4269 | 2297 | } else if (allow == 1) { |
789b3eff | 2298 | flags |= ALLOW_EMPTY; |
e98c4269 EN |
2299 | } else if (allow == 2) { |
2300 | drop_commit = 1; | |
c8e4159e HWN |
2301 | refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", |
2302 | NULL, 0); | |
9a1b7474 | 2303 | unlink(git_path_merge_msg(r)); |
5291828d | 2304 | unlink(git_path_auto_merge(r)); |
e98c4269 EN |
2305 | fprintf(stderr, |
2306 | _("dropping %s %s -- patch contents already upstream\n"), | |
2307 | oid_to_hex(&commit->object.oid), msg.subject); | |
2308 | } /* else allow == 0 and there's nothing special to do */ | |
2309 | if (!opts->no_commit && !drop_commit) { | |
356ee465 | 2310 | if (author || command == TODO_REVERT || (flags & AMEND_MSG)) |
430b75f7 PW |
2311 | res = do_commit(r, msg_file, author, opts, flags, |
2312 | commit? &commit->object.oid : NULL); | |
356ee465 PW |
2313 | else |
2314 | res = error(_("unable to parse commit author")); | |
a47ba3c7 PW |
2315 | *check_todo = !!(flags & EDIT_MSG); |
2316 | if (!res && reword) { | |
450efe2d | 2317 | fast_forward_edit: |
20f4b044 | 2318 | res = run_git_commit(NULL, opts, EDIT_MSG | |
450efe2d PW |
2319 | VERIFY_MSG | AMEND_MSG | |
2320 | (flags & ALLOW_EMPTY)); | |
a47ba3c7 PW |
2321 | *check_todo = 1; |
2322 | } | |
356ee465 | 2323 | } |
6e98de72 | 2324 | |
450efe2d | 2325 | |
6e98de72 JS |
2326 | if (!res && final_fixup) { |
2327 | unlink(rebase_path_fixup_msg()); | |
2328 | unlink(rebase_path_squash_msg()); | |
e12a7ef5 JS |
2329 | unlink(rebase_path_current_fixups()); |
2330 | strbuf_reset(&opts->current_fixups); | |
2331 | opts->current_fixup_count = 0; | |
6e98de72 | 2332 | } |
c8d1351d FC |
2333 | |
2334 | leave: | |
d74a4e57 | 2335 | free_message(commit, &msg); |
356ee465 | 2336 | free(author); |
1e41229d | 2337 | update_abort_safety_file(); |
043a4492 RR |
2338 | |
2339 | return res; | |
2340 | } | |
2341 | ||
c3e8618c | 2342 | static int prepare_revs(struct replay_opts *opts) |
043a4492 | 2343 | { |
a73e22e9 MZ |
2344 | /* |
2345 | * picking (but not reverting) ranges (but not individual revisions) | |
2346 | * should be done in reverse | |
2347 | */ | |
2348 | if (opts->action == REPLAY_PICK && !opts->revs->no_walk) | |
043a4492 RR |
2349 | opts->revs->reverse ^= 1; |
2350 | ||
2351 | if (prepare_revision_walk(opts->revs)) | |
c3e8618c | 2352 | return error(_("revision walk setup failed")); |
043a4492 | 2353 | |
c3e8618c | 2354 | return 0; |
043a4492 RR |
2355 | } |
2356 | ||
f11c9580 NTND |
2357 | static int read_and_refresh_cache(struct repository *r, |
2358 | struct replay_opts *opts) | |
043a4492 | 2359 | { |
14bca6c6 | 2360 | struct lock_file index_lock = LOCK_INIT; |
3a95f31d NTND |
2361 | int index_fd = repo_hold_locked_index(r, &index_lock, 0); |
2362 | if (repo_read_index(r) < 0) { | |
49fb937e | 2363 | rollback_lock_file(&index_lock); |
0d9c6dc9 | 2364 | return error(_("git %s: failed to read the index"), |
c28cbc5e | 2365 | _(action_name(opts))); |
49fb937e | 2366 | } |
f11c9580 | 2367 | refresh_index(r->index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL); |
5d9c9349 | 2368 | |
61000814 | 2369 | if (index_fd >= 0) { |
f11c9580 | 2370 | if (write_locked_index(r->index, &index_lock, |
61000814 | 2371 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) { |
0d9c6dc9 | 2372 | return error(_("git %s: failed to refresh the index"), |
c28cbc5e | 2373 | _(action_name(opts))); |
49fb937e | 2374 | } |
043a4492 | 2375 | } |
5d9c9349 DS |
2376 | |
2377 | /* | |
2378 | * If we are resolving merges in any way other than "ort", then | |
2379 | * expand the sparse index. | |
2380 | */ | |
2381 | if (opts->strategy && strcmp(opts->strategy, "ort")) | |
2382 | ensure_full_index(r->index); | |
0d9c6dc9 | 2383 | return 0; |
043a4492 RR |
2384 | } |
2385 | ||
5d94d545 | 2386 | void todo_list_release(struct todo_list *todo_list) |
043a4492 | 2387 | { |
004fefa7 | 2388 | strbuf_release(&todo_list->buf); |
6a83d902 | 2389 | FREE_AND_NULL(todo_list->items); |
004fefa7 JS |
2390 | todo_list->nr = todo_list->alloc = 0; |
2391 | } | |
043a4492 | 2392 | |
004fefa7 JS |
2393 | static struct todo_item *append_new_todo(struct todo_list *todo_list) |
2394 | { | |
2395 | ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc); | |
8638114e | 2396 | todo_list->total_nr++; |
004fefa7 | 2397 | return todo_list->items + todo_list->nr++; |
043a4492 RR |
2398 | } |
2399 | ||
6ad656db AG |
2400 | const char *todo_item_get_arg(struct todo_list *todo_list, |
2401 | struct todo_item *item) | |
2402 | { | |
2403 | return todo_list->buf.buf + item->arg_offset; | |
2404 | } | |
2405 | ||
3e81bccd PW |
2406 | static int is_command(enum todo_command command, const char **bol) |
2407 | { | |
2408 | const char *str = todo_command_info[command].str; | |
2409 | const char nick = todo_command_info[command].c; | |
2410 | const char *p = *bol + 1; | |
2411 | ||
2412 | return skip_prefix(*bol, str, bol) || | |
2413 | ((nick && **bol == nick) && | |
2414 | (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || !*p) && | |
2415 | (*bol = p)); | |
2416 | } | |
2417 | ||
005af339 | 2418 | static int parse_insn_line(struct repository *r, struct todo_item *item, |
6ad656db | 2419 | const char *buf, const char *bol, char *eol) |
043a4492 | 2420 | { |
1e43ed98 | 2421 | struct object_id commit_oid; |
043a4492 | 2422 | char *end_of_object_name; |
004fefa7 JS |
2423 | int i, saved, status, padding; |
2424 | ||
4c68e7dd JS |
2425 | item->flags = 0; |
2426 | ||
8f8550b3 JS |
2427 | /* left-trim */ |
2428 | bol += strspn(bol, " \t"); | |
2429 | ||
25c43667 | 2430 | if (bol == eol || *bol == '\r' || *bol == comment_line_char) { |
ac191470 | 2431 | item->command = TODO_COMMENT; |
25c43667 | 2432 | item->commit = NULL; |
6ad656db | 2433 | item->arg_offset = bol - buf; |
25c43667 JS |
2434 | item->arg_len = eol - bol; |
2435 | return 0; | |
2436 | } | |
2437 | ||
ac191470 | 2438 | for (i = 0; i < TODO_COMMENT; i++) |
3e81bccd | 2439 | if (is_command(i, &bol)) { |
004fefa7 JS |
2440 | item->command = i; |
2441 | break; | |
2442 | } | |
ac191470 | 2443 | if (i >= TODO_COMMENT) |
004fefa7 | 2444 | return -1; |
043a4492 | 2445 | |
66afa24f JS |
2446 | /* Eat up extra spaces/ tabs before object name */ |
2447 | padding = strspn(bol, " \t"); | |
2448 | bol += padding; | |
2449 | ||
71f82465 | 2450 | if (item->command == TODO_NOOP || item->command == TODO_BREAK) { |
66afa24f JS |
2451 | if (bol != eol) |
2452 | return error(_("%s does not accept arguments: '%s'"), | |
2453 | command_to_string(item->command), bol); | |
25c43667 | 2454 | item->commit = NULL; |
6ad656db | 2455 | item->arg_offset = bol - buf; |
25c43667 JS |
2456 | item->arg_len = eol - bol; |
2457 | return 0; | |
2458 | } | |
2459 | ||
043a4492 | 2460 | if (!padding) |
66afa24f JS |
2461 | return error(_("missing arguments for %s"), |
2462 | command_to_string(item->command)); | |
043a4492 | 2463 | |
9055e401 JS |
2464 | if (item->command == TODO_EXEC || item->command == TODO_LABEL || |
2465 | item->command == TODO_RESET) { | |
7dcbb3cb | 2466 | item->commit = NULL; |
6ad656db | 2467 | item->arg_offset = bol - buf; |
311af526 JS |
2468 | item->arg_len = (int)(eol - bol); |
2469 | return 0; | |
2470 | } | |
2471 | ||
9e3cebd9 CM |
2472 | if (item->command == TODO_FIXUP) { |
2473 | if (skip_prefix(bol, "-C", &bol) && | |
2474 | (*bol == ' ' || *bol == '\t')) { | |
2475 | bol += strspn(bol, " \t"); | |
2476 | item->flags |= TODO_REPLACE_FIXUP_MSG; | |
2477 | } else if (skip_prefix(bol, "-c", &bol) && | |
2478 | (*bol == ' ' || *bol == '\t')) { | |
2479 | bol += strspn(bol, " \t"); | |
2480 | item->flags |= TODO_EDIT_FIXUP_MSG; | |
2481 | } | |
2482 | } | |
2483 | ||
4c68e7dd JS |
2484 | if (item->command == TODO_MERGE) { |
2485 | if (skip_prefix(bol, "-C", &bol)) | |
2486 | bol += strspn(bol, " \t"); | |
2487 | else if (skip_prefix(bol, "-c", &bol)) { | |
2488 | bol += strspn(bol, " \t"); | |
2489 | item->flags |= TODO_EDIT_MERGE_MSG; | |
2490 | } else { | |
2491 | item->flags |= TODO_EDIT_MERGE_MSG; | |
2492 | item->commit = NULL; | |
6ad656db | 2493 | item->arg_offset = bol - buf; |
4c68e7dd JS |
2494 | item->arg_len = (int)(eol - bol); |
2495 | return 0; | |
2496 | } | |
2497 | } | |
2498 | ||
004fefa7 | 2499 | end_of_object_name = (char *) bol + strcspn(bol, " \t\n"); |
043a4492 RR |
2500 | saved = *end_of_object_name; |
2501 | *end_of_object_name = '\0'; | |
1e43ed98 | 2502 | status = get_oid(bol, &commit_oid); |
d859dcad JS |
2503 | if (status < 0) |
2504 | error(_("could not parse '%s'"), bol); /* return later */ | |
043a4492 RR |
2505 | *end_of_object_name = saved; |
2506 | ||
6ad656db AG |
2507 | bol = end_of_object_name + strspn(end_of_object_name, " \t"); |
2508 | item->arg_offset = bol - buf; | |
2509 | item->arg_len = (int)(eol - bol); | |
c22f7dfb | 2510 | |
043a4492 | 2511 | if (status < 0) |
d859dcad | 2512 | return status; |
043a4492 | 2513 | |
005af339 | 2514 | item->commit = lookup_commit_reference(r, &commit_oid); |
d859dcad | 2515 | return item->commit ? 0 : -1; |
043a4492 RR |
2516 | } |
2517 | ||
4a72486d PW |
2518 | int sequencer_get_last_command(struct repository *r, enum replay_action *action) |
2519 | { | |
ed5b1ca1 | 2520 | const char *todo_file, *bol; |
4a72486d | 2521 | struct strbuf buf = STRBUF_INIT; |
ed5b1ca1 | 2522 | int ret = 0; |
4a72486d PW |
2523 | |
2524 | todo_file = git_path_todo_file(); | |
2525 | if (strbuf_read_file(&buf, todo_file, 0) < 0) { | |
ed5b1ca1 | 2526 | if (errno == ENOENT || errno == ENOTDIR) |
4a72486d PW |
2527 | return -1; |
2528 | else | |
2529 | return error_errno("unable to open '%s'", todo_file); | |
2530 | } | |
ed5b1ca1 PW |
2531 | bol = buf.buf + strspn(buf.buf, " \t\r\n"); |
2532 | if (is_command(TODO_PICK, &bol) && (*bol == ' ' || *bol == '\t')) | |
4a72486d | 2533 | *action = REPLAY_PICK; |
ed5b1ca1 PW |
2534 | else if (is_command(TODO_REVERT, &bol) && |
2535 | (*bol == ' ' || *bol == '\t')) | |
4a72486d PW |
2536 | *action = REPLAY_REVERT; |
2537 | else | |
ed5b1ca1 | 2538 | ret = -1; |
4a72486d | 2539 | |
4a72486d PW |
2540 | strbuf_release(&buf); |
2541 | ||
2542 | return ret; | |
2543 | } | |
2544 | ||
5d94d545 AG |
2545 | int todo_list_parse_insn_buffer(struct repository *r, char *buf, |
2546 | struct todo_list *todo_list) | |
043a4492 | 2547 | { |
004fefa7 JS |
2548 | struct todo_item *item; |
2549 | char *p = buf, *next_p; | |
6e98de72 | 2550 | int i, res = 0, fixup_okay = file_exists(rebase_path_done()); |
043a4492 | 2551 | |
2b71595d AG |
2552 | todo_list->current = todo_list->nr = 0; |
2553 | ||
004fefa7 | 2554 | for (i = 1; *p; i++, p = next_p) { |
043a4492 | 2555 | char *eol = strchrnul(p, '\n'); |
004fefa7 JS |
2556 | |
2557 | next_p = *eol ? eol + 1 /* skip LF */ : eol; | |
2558 | ||
6307041d JS |
2559 | if (p != eol && eol[-1] == '\r') |
2560 | eol--; /* strip Carriage Return */ | |
2561 | ||
004fefa7 JS |
2562 | item = append_new_todo(todo_list); |
2563 | item->offset_in_buf = p - todo_list->buf.buf; | |
6ad656db | 2564 | if (parse_insn_line(r, item, buf, p, eol)) { |
93b3df6f | 2565 | res = error(_("invalid line %d: %.*s"), |
004fefa7 | 2566 | i, (int)(eol - p), p); |
2b71595d | 2567 | item->command = TODO_COMMENT + 1; |
6ad656db | 2568 | item->arg_offset = p - buf; |
2b71595d AG |
2569 | item->arg_len = (int)(eol - p); |
2570 | item->commit = NULL; | |
004fefa7 | 2571 | } |
6e98de72 JS |
2572 | |
2573 | if (fixup_okay) | |
2574 | ; /* do nothing */ | |
2575 | else if (is_fixup(item->command)) | |
2576 | return error(_("cannot '%s' without a previous commit"), | |
2577 | command_to_string(item->command)); | |
2578 | else if (!is_noop(item->command)) | |
2579 | fixup_okay = 1; | |
043a4492 | 2580 | } |
52865279 | 2581 | |
004fefa7 | 2582 | return res; |
043a4492 RR |
2583 | } |
2584 | ||
968492e4 JS |
2585 | static int count_commands(struct todo_list *todo_list) |
2586 | { | |
2587 | int count = 0, i; | |
2588 | ||
2589 | for (i = 0; i < todo_list->nr; i++) | |
2590 | if (todo_list->items[i].command != TODO_COMMENT) | |
2591 | count++; | |
2592 | ||
2593 | return count; | |
2594 | } | |
2595 | ||
a01c2a5f JS |
2596 | static int get_item_line_offset(struct todo_list *todo_list, int index) |
2597 | { | |
2598 | return index < todo_list->nr ? | |
2599 | todo_list->items[index].offset_in_buf : todo_list->buf.len; | |
2600 | } | |
2601 | ||
2602 | static const char *get_item_line(struct todo_list *todo_list, int index) | |
2603 | { | |
2604 | return todo_list->buf.buf + get_item_line_offset(todo_list, index); | |
2605 | } | |
2606 | ||
2607 | static int get_item_line_length(struct todo_list *todo_list, int index) | |
2608 | { | |
2609 | return get_item_line_offset(todo_list, index + 1) | |
2610 | - get_item_line_offset(todo_list, index); | |
2611 | } | |
2612 | ||
87805600 RS |
2613 | static ssize_t strbuf_read_file_or_whine(struct strbuf *sb, const char *path) |
2614 | { | |
2615 | int fd; | |
2616 | ssize_t len; | |
2617 | ||
2618 | fd = open(path, O_RDONLY); | |
2619 | if (fd < 0) | |
2620 | return error_errno(_("could not open '%s'"), path); | |
2621 | len = strbuf_read(sb, fd, 0); | |
2622 | close(fd); | |
2623 | if (len < 0) | |
2624 | return error(_("could not read '%s'."), path); | |
2625 | return len; | |
2626 | } | |
2627 | ||
b07d9bfd PW |
2628 | static int have_finished_the_last_pick(void) |
2629 | { | |
2630 | struct strbuf buf = STRBUF_INIT; | |
2631 | const char *eol; | |
2632 | const char *todo_path = git_path_todo_file(); | |
2633 | int ret = 0; | |
2634 | ||
2635 | if (strbuf_read_file(&buf, todo_path, 0) < 0) { | |
2636 | if (errno == ENOENT) { | |
2637 | return 0; | |
2638 | } else { | |
2639 | error_errno("unable to open '%s'", todo_path); | |
2640 | return 0; | |
2641 | } | |
2642 | } | |
2643 | /* If there is only one line then we are done */ | |
2644 | eol = strchr(buf.buf, '\n'); | |
2645 | if (!eol || !eol[1]) | |
2646 | ret = 1; | |
2647 | ||
2648 | strbuf_release(&buf); | |
2649 | ||
2650 | return ret; | |
2651 | } | |
2652 | ||
f496b064 | 2653 | void sequencer_post_commit_cleanup(struct repository *r, int verbose) |
b07d9bfd PW |
2654 | { |
2655 | struct replay_opts opts = REPLAY_OPTS_INIT; | |
2656 | int need_cleanup = 0; | |
2657 | ||
c8e4159e HWN |
2658 | if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD")) { |
2659 | if (!refs_delete_ref(get_main_ref_store(r), "", | |
2660 | "CHERRY_PICK_HEAD", NULL, 0) && | |
2661 | verbose) | |
f496b064 | 2662 | warning(_("cancelling a cherry picking in progress")); |
b07d9bfd PW |
2663 | opts.action = REPLAY_PICK; |
2664 | need_cleanup = 1; | |
2665 | } | |
2666 | ||
b8825ef2 HWN |
2667 | if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { |
2668 | if (!refs_delete_ref(get_main_ref_store(r), "", "REVERT_HEAD", | |
2669 | NULL, 0) && | |
2670 | verbose) | |
f496b064 | 2671 | warning(_("cancelling a revert in progress")); |
b07d9bfd PW |
2672 | opts.action = REPLAY_REVERT; |
2673 | need_cleanup = 1; | |
2674 | } | |
2675 | ||
5291828d EN |
2676 | unlink(git_path_auto_merge(r)); |
2677 | ||
b07d9bfd PW |
2678 | if (!need_cleanup) |
2679 | return; | |
2680 | ||
2681 | if (!have_finished_the_last_pick()) | |
2682 | return; | |
2683 | ||
2684 | sequencer_remove_state(&opts); | |
2685 | } | |
2686 | ||
3f34f2d8 AG |
2687 | static void todo_list_write_total_nr(struct todo_list *todo_list) |
2688 | { | |
2689 | FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w"); | |
2690 | ||
2691 | if (f) { | |
2692 | fprintf(f, "%d\n", todo_list->total_nr); | |
2693 | fclose(f); | |
2694 | } | |
2695 | } | |
2696 | ||
005af339 NTND |
2697 | static int read_populate_todo(struct repository *r, |
2698 | struct todo_list *todo_list, | |
2699 | struct replay_opts *opts) | |
043a4492 | 2700 | { |
c0246501 | 2701 | const char *todo_file = get_todo_path(opts); |
87805600 | 2702 | int res; |
043a4492 | 2703 | |
004fefa7 | 2704 | strbuf_reset(&todo_list->buf); |
87805600 RS |
2705 | if (strbuf_read_file_or_whine(&todo_list->buf, todo_file) < 0) |
2706 | return -1; | |
043a4492 | 2707 | |
5d94d545 | 2708 | res = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list); |
27fdbb96 JS |
2709 | if (res) { |
2710 | if (is_rebase_i(opts)) | |
2711 | return error(_("please fix this using " | |
2712 | "'git rebase --edit-todo'.")); | |
93b3df6f | 2713 | return error(_("unusable instruction sheet: '%s'"), todo_file); |
27fdbb96 | 2714 | } |
2eeaf1b3 | 2715 | |
52865279 JS |
2716 | if (!todo_list->nr && |
2717 | (!is_rebase_i(opts) || !file_exists(rebase_path_done()))) | |
2718 | return error(_("no commits parsed.")); | |
2719 | ||
2eeaf1b3 | 2720 | if (!is_rebase_i(opts)) { |
004fefa7 JS |
2721 | enum todo_command valid = |
2722 | opts->action == REPLAY_PICK ? TODO_PICK : TODO_REVERT; | |
2723 | int i; | |
2724 | ||
2725 | for (i = 0; i < todo_list->nr; i++) | |
2726 | if (valid == todo_list->items[i].command) | |
2727 | continue; | |
2728 | else if (valid == TODO_PICK) | |
93b3df6f | 2729 | return error(_("cannot cherry-pick during a revert.")); |
004fefa7 | 2730 | else |
93b3df6f | 2731 | return error(_("cannot revert during a cherry-pick.")); |
004fefa7 JS |
2732 | } |
2733 | ||
968492e4 JS |
2734 | if (is_rebase_i(opts)) { |
2735 | struct todo_list done = TODO_LIST_INIT; | |
2736 | ||
2737 | if (strbuf_read_file(&done.buf, rebase_path_done(), 0) > 0 && | |
5d94d545 | 2738 | !todo_list_parse_insn_buffer(r, done.buf.buf, &done)) |
968492e4 JS |
2739 | todo_list->done_nr = count_commands(&done); |
2740 | else | |
2741 | todo_list->done_nr = 0; | |
2742 | ||
2743 | todo_list->total_nr = todo_list->done_nr | |
2744 | + count_commands(todo_list); | |
968492e4 | 2745 | todo_list_release(&done); |
ef80069a | 2746 | |
3f34f2d8 | 2747 | todo_list_write_total_nr(todo_list); |
968492e4 JS |
2748 | } |
2749 | ||
0ae42a03 | 2750 | return 0; |
043a4492 RR |
2751 | } |
2752 | ||
03a4e260 JS |
2753 | static int git_config_string_dup(char **dest, |
2754 | const char *var, const char *value) | |
2755 | { | |
2756 | if (!value) | |
2757 | return config_error_nonbool(var); | |
2758 | free(*dest); | |
2759 | *dest = xstrdup(value); | |
2760 | return 0; | |
2761 | } | |
2762 | ||
043a4492 RR |
2763 | static int populate_opts_cb(const char *key, const char *value, void *data) |
2764 | { | |
2765 | struct replay_opts *opts = data; | |
2766 | int error_flag = 1; | |
2767 | ||
2768 | if (!value) | |
2769 | error_flag = 0; | |
2770 | else if (!strcmp(key, "options.no-commit")) | |
2771 | opts->no_commit = git_config_bool_or_int(key, value, &error_flag); | |
2772 | else if (!strcmp(key, "options.edit")) | |
2773 | opts->edit = git_config_bool_or_int(key, value, &error_flag); | |
6860ce5d PW |
2774 | else if (!strcmp(key, "options.allow-empty")) |
2775 | opts->allow_empty = | |
2776 | git_config_bool_or_int(key, value, &error_flag); | |
2777 | else if (!strcmp(key, "options.allow-empty-message")) | |
2778 | opts->allow_empty_message = | |
2779 | git_config_bool_or_int(key, value, &error_flag); | |
2780 | else if (!strcmp(key, "options.keep-redundant-commits")) | |
2781 | opts->keep_redundant_commits = | |
2782 | git_config_bool_or_int(key, value, &error_flag); | |
043a4492 RR |
2783 | else if (!strcmp(key, "options.signoff")) |
2784 | opts->signoff = git_config_bool_or_int(key, value, &error_flag); | |
2785 | else if (!strcmp(key, "options.record-origin")) | |
2786 | opts->record_origin = git_config_bool_or_int(key, value, &error_flag); | |
2787 | else if (!strcmp(key, "options.allow-ff")) | |
2788 | opts->allow_ff = git_config_bool_or_int(key, value, &error_flag); | |
2789 | else if (!strcmp(key, "options.mainline")) | |
2790 | opts->mainline = git_config_int(key, value); | |
2791 | else if (!strcmp(key, "options.strategy")) | |
03a4e260 | 2792 | git_config_string_dup(&opts->strategy, key, value); |
3253553e | 2793 | else if (!strcmp(key, "options.gpg-sign")) |
03a4e260 | 2794 | git_config_string_dup(&opts->gpg_sign, key, value); |
043a4492 RR |
2795 | else if (!strcmp(key, "options.strategy-option")) { |
2796 | ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc); | |
2797 | opts->xopts[opts->xopts_nr++] = xstrdup(value); | |
8d8cb4b0 PW |
2798 | } else if (!strcmp(key, "options.allow-rerere-auto")) |
2799 | opts->allow_rerere_auto = | |
2800 | git_config_bool_or_int(key, value, &error_flag) ? | |
2801 | RERERE_AUTOUPDATE : RERERE_NOAUTOUPDATE; | |
dc42e9a8 PW |
2802 | else if (!strcmp(key, "options.default-msg-cleanup")) { |
2803 | opts->explicit_cleanup = 1; | |
2804 | opts->default_msg_cleanup = get_cleanup_mode(value, 1); | |
2805 | } else | |
93b3df6f | 2806 | return error(_("invalid key: %s"), key); |
043a4492 RR |
2807 | |
2808 | if (!error_flag) | |
93b3df6f | 2809 | return error(_("invalid value for %s: %s"), key, value); |
043a4492 RR |
2810 | |
2811 | return 0; | |
2812 | } | |
2813 | ||
65850686 | 2814 | void parse_strategy_opts(struct replay_opts *opts, char *raw_opts) |
ca6c6b45 JS |
2815 | { |
2816 | int i; | |
65850686 | 2817 | char *strategy_opts_string = raw_opts; |
ca6c6b45 | 2818 | |
0060041d EN |
2819 | if (*strategy_opts_string == ' ') |
2820 | strategy_opts_string++; | |
65850686 | 2821 | |
0060041d EN |
2822 | opts->xopts_nr = split_cmdline(strategy_opts_string, |
2823 | (const char ***)&opts->xopts); | |
ca6c6b45 JS |
2824 | for (i = 0; i < opts->xopts_nr; i++) { |
2825 | const char *arg = opts->xopts[i]; | |
2826 | ||
2827 | skip_prefix(arg, "--", &arg); | |
2828 | opts->xopts[i] = xstrdup(arg); | |
2829 | } | |
2830 | } | |
2831 | ||
65850686 AG |
2832 | static void read_strategy_opts(struct replay_opts *opts, struct strbuf *buf) |
2833 | { | |
2834 | strbuf_reset(buf); | |
2835 | if (!read_oneliner(buf, rebase_path_strategy(), 0)) | |
2836 | return; | |
2837 | opts->strategy = strbuf_detach(buf, NULL); | |
2838 | if (!read_oneliner(buf, rebase_path_strategy_opts(), 0)) | |
2839 | return; | |
2840 | ||
2841 | parse_strategy_opts(opts, buf->buf); | |
2842 | } | |
2843 | ||
5adf9bdc | 2844 | static int read_populate_opts(struct replay_opts *opts) |
043a4492 | 2845 | { |
a1c75762 JS |
2846 | if (is_rebase_i(opts)) { |
2847 | struct strbuf buf = STRBUF_INIT; | |
65c425a2 | 2848 | int ret = 0; |
a1c75762 | 2849 | |
3442c3d1 DL |
2850 | if (read_oneliner(&buf, rebase_path_gpg_sign_opt(), |
2851 | READ_ONELINER_SKIP_IF_EMPTY)) { | |
a1c75762 JS |
2852 | if (!starts_with(buf.buf, "-S")) |
2853 | strbuf_reset(&buf); | |
2854 | else { | |
2855 | free(opts->gpg_sign); | |
2856 | opts->gpg_sign = xstrdup(buf.buf + 2); | |
2857 | } | |
9b6d7a62 PW |
2858 | strbuf_reset(&buf); |
2859 | } | |
2860 | ||
3442c3d1 DL |
2861 | if (read_oneliner(&buf, rebase_path_allow_rerere_autoupdate(), |
2862 | READ_ONELINER_SKIP_IF_EMPTY)) { | |
9b6d7a62 PW |
2863 | if (!strcmp(buf.buf, "--rerere-autoupdate")) |
2864 | opts->allow_rerere_auto = RERERE_AUTOUPDATE; | |
2865 | else if (!strcmp(buf.buf, "--no-rerere-autoupdate")) | |
2866 | opts->allow_rerere_auto = RERERE_NOAUTOUPDATE; | |
2867 | strbuf_reset(&buf); | |
a1c75762 | 2868 | } |
a1c75762 | 2869 | |
556907f1 JS |
2870 | if (file_exists(rebase_path_verbose())) |
2871 | opts->verbose = 1; | |
2872 | ||
899b49c4 EN |
2873 | if (file_exists(rebase_path_quiet())) |
2874 | opts->quiet = 1; | |
2875 | ||
a852ec7f PW |
2876 | if (file_exists(rebase_path_signoff())) { |
2877 | opts->allow_ff = 0; | |
2878 | opts->signoff = 1; | |
2879 | } | |
2880 | ||
7573cec5 PW |
2881 | if (file_exists(rebase_path_cdate_is_adate())) { |
2882 | opts->allow_ff = 0; | |
2883 | opts->committer_date_is_author_date = 1; | |
2884 | } | |
2885 | ||
a3894aad PW |
2886 | if (file_exists(rebase_path_ignore_date())) { |
2887 | opts->allow_ff = 0; | |
2888 | opts->ignore_date = 1; | |
2889 | } | |
2890 | ||
d421afa0 JS |
2891 | if (file_exists(rebase_path_reschedule_failed_exec())) |
2892 | opts->reschedule_failed_exec = 1; | |
e5b32bff ÆAB |
2893 | else if (file_exists(rebase_path_no_reschedule_failed_exec())) |
2894 | opts->reschedule_failed_exec = 0; | |
d421afa0 | 2895 | |
e98c4269 EN |
2896 | if (file_exists(rebase_path_drop_redundant_commits())) |
2897 | opts->drop_redundant_commits = 1; | |
2898 | ||
2899 | if (file_exists(rebase_path_keep_redundant_commits())) | |
2900 | opts->keep_redundant_commits = 1; | |
2901 | ||
ca6c6b45 | 2902 | read_strategy_opts(opts, &buf); |
65c425a2 | 2903 | strbuf_reset(&buf); |
ca6c6b45 | 2904 | |
e12a7ef5 | 2905 | if (read_oneliner(&opts->current_fixups, |
3442c3d1 DL |
2906 | rebase_path_current_fixups(), |
2907 | READ_ONELINER_SKIP_IF_EMPTY)) { | |
e12a7ef5 JS |
2908 | const char *p = opts->current_fixups.buf; |
2909 | opts->current_fixup_count = 1; | |
2910 | while ((p = strchr(p, '\n'))) { | |
2911 | opts->current_fixup_count++; | |
2912 | p++; | |
2913 | } | |
2914 | } | |
2915 | ||
d87d48b2 | 2916 | if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) { |
c7793861 | 2917 | if (get_oid_committish(buf.buf, &opts->squash_onto) < 0) { |
65c425a2 DL |
2918 | ret = error(_("unusable squash-onto")); |
2919 | goto done_rebase_i; | |
2920 | } | |
d87d48b2 JS |
2921 | opts->have_squash_onto = 1; |
2922 | } | |
2923 | ||
65c425a2 DL |
2924 | done_rebase_i: |
2925 | strbuf_release(&buf); | |
2926 | return ret; | |
a1c75762 | 2927 | } |
b5a67045 | 2928 | |
f932729c | 2929 | if (!file_exists(git_path_opts_file())) |
0d00da7b JS |
2930 | return 0; |
2931 | /* | |
2932 | * The function git_parse_source(), called from git_config_from_file(), | |
2933 | * may die() in case of a syntactically incorrect file. We do not care | |
2934 | * about this case, though, because we wrote that file ourselves, so we | |
2935 | * are pretty certain that it is syntactically correct. | |
2936 | */ | |
5adf9bdc | 2937 | if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0) |
93b3df6f | 2938 | return error(_("malformed options sheet: '%s'"), |
0d00da7b JS |
2939 | git_path_opts_file()); |
2940 | return 0; | |
043a4492 RR |
2941 | } |
2942 | ||
65850686 AG |
2943 | static void write_strategy_opts(struct replay_opts *opts) |
2944 | { | |
2945 | int i; | |
2946 | struct strbuf buf = STRBUF_INIT; | |
2947 | ||
2948 | for (i = 0; i < opts->xopts_nr; ++i) | |
2949 | strbuf_addf(&buf, " --%s", opts->xopts[i]); | |
2950 | ||
2951 | write_file(rebase_path_strategy_opts(), "%s\n", buf.buf); | |
2952 | strbuf_release(&buf); | |
2953 | } | |
2954 | ||
2955 | int write_basic_state(struct replay_opts *opts, const char *head_name, | |
a2bb10d0 | 2956 | struct commit *onto, const struct object_id *orig_head) |
65850686 | 2957 | { |
65850686 AG |
2958 | if (head_name) |
2959 | write_file(rebase_path_head_name(), "%s\n", head_name); | |
2960 | if (onto) | |
7d3488eb PW |
2961 | write_file(rebase_path_onto(), "%s\n", |
2962 | oid_to_hex(&onto->object.oid)); | |
65850686 | 2963 | if (orig_head) |
a2bb10d0 PW |
2964 | write_file(rebase_path_orig_head(), "%s\n", |
2965 | oid_to_hex(orig_head)); | |
65850686 | 2966 | |
8a997ed1 EN |
2967 | if (opts->quiet) |
2968 | write_file(rebase_path_quiet(), "%s", ""); | |
65850686 | 2969 | if (opts->verbose) |
4af51741 | 2970 | write_file(rebase_path_verbose(), "%s", ""); |
65850686 AG |
2971 | if (opts->strategy) |
2972 | write_file(rebase_path_strategy(), "%s\n", opts->strategy); | |
2973 | if (opts->xopts_nr > 0) | |
2974 | write_strategy_opts(opts); | |
2975 | ||
2976 | if (opts->allow_rerere_auto == RERERE_AUTOUPDATE) | |
2977 | write_file(rebase_path_allow_rerere_autoupdate(), "--rerere-autoupdate\n"); | |
2978 | else if (opts->allow_rerere_auto == RERERE_NOAUTOUPDATE) | |
2979 | write_file(rebase_path_allow_rerere_autoupdate(), "--no-rerere-autoupdate\n"); | |
2980 | ||
2981 | if (opts->gpg_sign) | |
2982 | write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign); | |
2983 | if (opts->signoff) | |
2984 | write_file(rebase_path_signoff(), "--signoff\n"); | |
e98c4269 EN |
2985 | if (opts->drop_redundant_commits) |
2986 | write_file(rebase_path_drop_redundant_commits(), "%s", ""); | |
2987 | if (opts->keep_redundant_commits) | |
2988 | write_file(rebase_path_keep_redundant_commits(), "%s", ""); | |
7573cec5 PW |
2989 | if (opts->committer_date_is_author_date) |
2990 | write_file(rebase_path_cdate_is_adate(), "%s", ""); | |
a3894aad PW |
2991 | if (opts->ignore_date) |
2992 | write_file(rebase_path_ignore_date(), "%s", ""); | |
d421afa0 JS |
2993 | if (opts->reschedule_failed_exec) |
2994 | write_file(rebase_path_reschedule_failed_exec(), "%s", ""); | |
e5b32bff ÆAB |
2995 | else |
2996 | write_file(rebase_path_no_reschedule_failed_exec(), "%s", ""); | |
65850686 AG |
2997 | |
2998 | return 0; | |
2999 | } | |
3000 | ||
004fefa7 | 3001 | static int walk_revs_populate_todo(struct todo_list *todo_list, |
043a4492 RR |
3002 | struct replay_opts *opts) |
3003 | { | |
004fefa7 JS |
3004 | enum todo_command command = opts->action == REPLAY_PICK ? |
3005 | TODO_PICK : TODO_REVERT; | |
414697a9 | 3006 | const char *command_string = todo_command_info[command].str; |
019a9d83 | 3007 | const char *encoding; |
043a4492 | 3008 | struct commit *commit; |
043a4492 | 3009 | |
34b0528b JS |
3010 | if (prepare_revs(opts)) |
3011 | return -1; | |
043a4492 | 3012 | |
019a9d83 ĐTCD |
3013 | encoding = get_log_output_encoding(); |
3014 | ||
004fefa7 JS |
3015 | while ((commit = get_revision(opts->revs))) { |
3016 | struct todo_item *item = append_new_todo(todo_list); | |
019a9d83 | 3017 | const char *commit_buffer = logmsg_reencode(commit, NULL, encoding); |
004fefa7 JS |
3018 | const char *subject; |
3019 | int subject_len; | |
3020 | ||
3021 | item->command = command; | |
3022 | item->commit = commit; | |
6ad656db | 3023 | item->arg_offset = 0; |
c22f7dfb | 3024 | item->arg_len = 0; |
004fefa7 JS |
3025 | item->offset_in_buf = todo_list->buf.len; |
3026 | subject_len = find_commit_subject(commit_buffer, &subject); | |
3027 | strbuf_addf(&todo_list->buf, "%s %s %.*s\n", command_string, | |
3028 | short_commit_name(commit), subject_len, subject); | |
3029 | unuse_commit_buffer(commit, commit_buffer); | |
3030 | } | |
8530c739 JK |
3031 | |
3032 | if (!todo_list->nr) | |
3033 | return error(_("empty commit set passed")); | |
3034 | ||
34b0528b | 3035 | return 0; |
043a4492 RR |
3036 | } |
3037 | ||
6a1f9046 | 3038 | static int create_seq_dir(struct repository *r) |
043a4492 | 3039 | { |
6a1f9046 RA |
3040 | enum replay_action action; |
3041 | const char *in_progress_error = NULL; | |
3042 | const char *in_progress_advice = NULL; | |
c8e4159e | 3043 | unsigned int advise_skip = |
b8825ef2 | 3044 | refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") || |
c8e4159e | 3045 | refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD"); |
6a1f9046 RA |
3046 | |
3047 | if (!sequencer_get_last_command(r, &action)) { | |
3048 | switch (action) { | |
3049 | case REPLAY_REVERT: | |
3050 | in_progress_error = _("revert is already in progress"); | |
3051 | in_progress_advice = | |
dcb500dc | 3052 | _("try \"git revert (--continue | %s--abort | --quit)\""); |
6a1f9046 RA |
3053 | break; |
3054 | case REPLAY_PICK: | |
3055 | in_progress_error = _("cherry-pick is already in progress"); | |
3056 | in_progress_advice = | |
dcb500dc | 3057 | _("try \"git cherry-pick (--continue | %s--abort | --quit)\""); |
6a1f9046 RA |
3058 | break; |
3059 | default: | |
3060 | BUG("unexpected action in create_seq_dir"); | |
3061 | } | |
3062 | } | |
3063 | if (in_progress_error) { | |
3064 | error("%s", in_progress_error); | |
ed9bff08 | 3065 | if (advice_enabled(ADVICE_SEQUENCER_IN_USE)) |
dcb500dc RA |
3066 | advise(in_progress_advice, |
3067 | advise_skip ? "--skip | " : ""); | |
043a4492 | 3068 | return -1; |
6a1f9046 RA |
3069 | } |
3070 | if (mkdir(git_path_seq_dir(), 0777) < 0) | |
93b3df6f | 3071 | return error_errno(_("could not create sequencer directory '%s'"), |
f6e82b0d | 3072 | git_path_seq_dir()); |
6a1f9046 | 3073 | |
043a4492 RR |
3074 | return 0; |
3075 | } | |
3076 | ||
311fd397 | 3077 | static int save_head(const char *head) |
043a4492 | 3078 | { |
14bca6c6 | 3079 | struct lock_file head_lock = LOCK_INIT; |
043a4492 RR |
3080 | struct strbuf buf = STRBUF_INIT; |
3081 | int fd; | |
ed3f9a12 | 3082 | ssize_t written; |
043a4492 | 3083 | |
311fd397 | 3084 | fd = hold_lock_file_for_update(&head_lock, git_path_head_file(), 0); |
350292a1 | 3085 | if (fd < 0) |
93b3df6f | 3086 | return error_errno(_("could not lock HEAD")); |
043a4492 | 3087 | strbuf_addf(&buf, "%s\n", head); |
ed3f9a12 RS |
3088 | written = write_in_full(fd, buf.buf, buf.len); |
3089 | strbuf_release(&buf); | |
3090 | if (written < 0) { | |
bf5c0571 | 3091 | error_errno(_("could not write to '%s'"), git_path_head_file()); |
311fd397 | 3092 | rollback_lock_file(&head_lock); |
bf5c0571 | 3093 | return -1; |
311fd397 | 3094 | } |
350292a1 MÅ |
3095 | if (commit_lock_file(&head_lock) < 0) |
3096 | return error(_("failed to finalize '%s'"), git_path_head_file()); | |
311fd397 | 3097 | return 0; |
043a4492 RR |
3098 | } |
3099 | ||
1e41229d SB |
3100 | static int rollback_is_safe(void) |
3101 | { | |
3102 | struct strbuf sb = STRBUF_INIT; | |
3103 | struct object_id expected_head, actual_head; | |
3104 | ||
3105 | if (strbuf_read_file(&sb, git_path_abort_safety_file(), 0) >= 0) { | |
3106 | strbuf_trim(&sb); | |
3107 | if (get_oid_hex(sb.buf, &expected_head)) { | |
3108 | strbuf_release(&sb); | |
3109 | die(_("could not parse %s"), git_path_abort_safety_file()); | |
3110 | } | |
3111 | strbuf_release(&sb); | |
3112 | } | |
3113 | else if (errno == ENOENT) | |
3114 | oidclr(&expected_head); | |
3115 | else | |
3116 | die_errno(_("could not read '%s'"), git_path_abort_safety_file()); | |
3117 | ||
3118 | if (get_oid("HEAD", &actual_head)) | |
3119 | oidclr(&actual_head); | |
3120 | ||
4a7e27e9 | 3121 | return oideq(&actual_head, &expected_head); |
1e41229d SB |
3122 | } |
3123 | ||
918d1e6e | 3124 | static int reset_merge(const struct object_id *oid) |
043a4492 | 3125 | { |
265ab48f | 3126 | int ret; |
c972bf4c | 3127 | struct strvec argv = STRVEC_INIT; |
1e41229d | 3128 | |
c972bf4c | 3129 | strvec_pushl(&argv, "reset", "--merge", NULL); |
265ab48f RA |
3130 | |
3131 | if (!is_null_oid(oid)) | |
c972bf4c | 3132 | strvec_push(&argv, oid_to_hex(oid)); |
1e41229d | 3133 | |
d70a9eb6 | 3134 | ret = run_command_v_opt(argv.v, RUN_GIT_CMD); |
c972bf4c | 3135 | strvec_clear(&argv); |
265ab48f RA |
3136 | |
3137 | return ret; | |
043a4492 RR |
3138 | } |
3139 | ||
005af339 | 3140 | static int rollback_single_pick(struct repository *r) |
043a4492 | 3141 | { |
092bbcdf | 3142 | struct object_id head_oid; |
043a4492 | 3143 | |
c8e4159e | 3144 | if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && |
b8825ef2 | 3145 | !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) |
043a4492 | 3146 | return error(_("no cherry-pick or revert in progress")); |
34c290a6 | 3147 | if (read_ref_full("HEAD", 0, &head_oid, NULL)) |
043a4492 | 3148 | return error(_("cannot resolve HEAD")); |
092bbcdf | 3149 | if (is_null_oid(&head_oid)) |
043a4492 | 3150 | return error(_("cannot abort from a branch yet to be born")); |
918d1e6e | 3151 | return reset_merge(&head_oid); |
043a4492 RR |
3152 | } |
3153 | ||
de81ca3f RA |
3154 | static int skip_single_pick(void) |
3155 | { | |
3156 | struct object_id head; | |
3157 | ||
3158 | if (read_ref_full("HEAD", 0, &head, NULL)) | |
3159 | return error(_("cannot resolve HEAD")); | |
3160 | return reset_merge(&head); | |
043a4492 RR |
3161 | } |
3162 | ||
005af339 | 3163 | int sequencer_rollback(struct repository *r, struct replay_opts *opts) |
043a4492 | 3164 | { |
043a4492 | 3165 | FILE *f; |
092bbcdf | 3166 | struct object_id oid; |
043a4492 | 3167 | struct strbuf buf = STRBUF_INIT; |
092bbcdf | 3168 | const char *p; |
043a4492 | 3169 | |
f932729c | 3170 | f = fopen(git_path_head_file(), "r"); |
043a4492 RR |
3171 | if (!f && errno == ENOENT) { |
3172 | /* | |
3173 | * There is no multiple-cherry-pick in progress. | |
3174 | * If CHERRY_PICK_HEAD or REVERT_HEAD indicates | |
3175 | * a single-cherry-pick in progress, abort that. | |
3176 | */ | |
005af339 | 3177 | return rollback_single_pick(r); |
043a4492 RR |
3178 | } |
3179 | if (!f) | |
f7ed1953 | 3180 | return error_errno(_("cannot open '%s'"), git_path_head_file()); |
8f309aeb | 3181 | if (strbuf_getline_lf(&buf, f)) { |
f7ed1953 | 3182 | error(_("cannot read '%s': %s"), git_path_head_file(), |
f932729c | 3183 | ferror(f) ? strerror(errno) : _("unexpected end of file")); |
043a4492 RR |
3184 | fclose(f); |
3185 | goto fail; | |
3186 | } | |
3187 | fclose(f); | |
092bbcdf | 3188 | if (parse_oid_hex(buf.buf, &oid, &p) || *p != '\0') { |
043a4492 | 3189 | error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"), |
f932729c | 3190 | git_path_head_file()); |
043a4492 RR |
3191 | goto fail; |
3192 | } | |
092bbcdf | 3193 | if (is_null_oid(&oid)) { |
0f974e21 MG |
3194 | error(_("cannot abort from a branch yet to be born")); |
3195 | goto fail; | |
3196 | } | |
1e41229d SB |
3197 | |
3198 | if (!rollback_is_safe()) { | |
3199 | /* Do not error, just do not rollback */ | |
3200 | warning(_("You seem to have moved HEAD. " | |
3201 | "Not rewinding, check your HEAD!")); | |
3202 | } else | |
918d1e6e | 3203 | if (reset_merge(&oid)) |
043a4492 | 3204 | goto fail; |
043a4492 | 3205 | strbuf_release(&buf); |
2863584f | 3206 | return sequencer_remove_state(opts); |
043a4492 RR |
3207 | fail: |
3208 | strbuf_release(&buf); | |
3209 | return -1; | |
3210 | } | |
3211 | ||
de81ca3f RA |
3212 | int sequencer_skip(struct repository *r, struct replay_opts *opts) |
3213 | { | |
3214 | enum replay_action action = -1; | |
3215 | sequencer_get_last_command(r, &action); | |
3216 | ||
3217 | /* | |
3218 | * Check whether the subcommand requested to skip the commit is actually | |
3219 | * in progress and that it's safe to skip the commit. | |
3220 | * | |
3221 | * opts->action tells us which subcommand requested to skip the commit. | |
3222 | * If the corresponding .git/<ACTION>_HEAD exists, we know that the | |
3223 | * action is in progress and we can skip the commit. | |
3224 | * | |
3225 | * Otherwise we check that the last instruction was related to the | |
3226 | * particular subcommand we're trying to execute and barf if that's not | |
3227 | * the case. | |
3228 | * | |
3229 | * Finally we check that the rollback is "safe", i.e., has the HEAD | |
3230 | * moved? In this case, it doesn't make sense to "reset the merge" and | |
3231 | * "skip the commit" as the user already handled this by committing. But | |
3232 | * we'd not want to barf here, instead give advice on how to proceed. We | |
3233 | * only need to check that when .git/<ACTION>_HEAD doesn't exist because | |
3234 | * it gets removed when the user commits, so if it still exists we're | |
3235 | * sure the user can't have committed before. | |
3236 | */ | |
3237 | switch (opts->action) { | |
3238 | case REPLAY_REVERT: | |
b8825ef2 | 3239 | if (!refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { |
de81ca3f RA |
3240 | if (action != REPLAY_REVERT) |
3241 | return error(_("no revert in progress")); | |
3242 | if (!rollback_is_safe()) | |
3243 | goto give_advice; | |
3244 | } | |
3245 | break; | |
3246 | case REPLAY_PICK: | |
c8e4159e HWN |
3247 | if (!refs_ref_exists(get_main_ref_store(r), |
3248 | "CHERRY_PICK_HEAD")) { | |
de81ca3f RA |
3249 | if (action != REPLAY_PICK) |
3250 | return error(_("no cherry-pick in progress")); | |
3251 | if (!rollback_is_safe()) | |
3252 | goto give_advice; | |
3253 | } | |
3254 | break; | |
3255 | default: | |
3256 | BUG("unexpected action in sequencer_skip"); | |
3257 | } | |
3258 | ||
3259 | if (skip_single_pick()) | |
3260 | return error(_("failed to skip the commit")); | |
3261 | if (!is_directory(git_path_seq_dir())) | |
3262 | return 0; | |
3263 | ||
3264 | return sequencer_continue(r, opts); | |
3265 | ||
3266 | give_advice: | |
3267 | error(_("there is nothing to skip")); | |
3268 | ||
ed9bff08 | 3269 | if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) { |
de81ca3f RA |
3270 | advise(_("have you committed already?\n" |
3271 | "try \"git %s --continue\""), | |
3272 | action == REPLAY_REVERT ? "revert" : "cherry-pick"); | |
3273 | } | |
3274 | return -1; | |
3275 | } | |
3276 | ||
004fefa7 | 3277 | static int save_todo(struct todo_list *todo_list, struct replay_opts *opts) |
043a4492 | 3278 | { |
14bca6c6 | 3279 | struct lock_file todo_lock = LOCK_INIT; |
004fefa7 JS |
3280 | const char *todo_path = get_todo_path(opts); |
3281 | int next = todo_list->current, offset, fd; | |
043a4492 | 3282 | |
84583957 JS |
3283 | /* |
3284 | * rebase -i writes "git-rebase-todo" without the currently executing | |
3285 | * command, appending it to "done" instead. | |
3286 | */ | |
3287 | if (is_rebase_i(opts)) | |
3288 | next++; | |
3289 | ||
004fefa7 | 3290 | fd = hold_lock_file_for_update(&todo_lock, todo_path, 0); |
221675de | 3291 | if (fd < 0) |
93b3df6f | 3292 | return error_errno(_("could not lock '%s'"), todo_path); |
a01c2a5f | 3293 | offset = get_item_line_offset(todo_list, next); |
004fefa7 JS |
3294 | if (write_in_full(fd, todo_list->buf.buf + offset, |
3295 | todo_list->buf.len - offset) < 0) | |
93b3df6f | 3296 | return error_errno(_("could not write to '%s'"), todo_path); |
004fefa7 | 3297 | if (commit_lock_file(&todo_lock) < 0) |
350292a1 | 3298 | return error(_("failed to finalize '%s'"), todo_path); |
1df6df0c | 3299 | |
a01c2a5f JS |
3300 | if (is_rebase_i(opts) && next > 0) { |
3301 | const char *done = rebase_path_done(); | |
3302 | int fd = open(done, O_CREAT | O_WRONLY | O_APPEND, 0666); | |
3303 | int ret = 0; | |
1df6df0c | 3304 | |
a01c2a5f JS |
3305 | if (fd < 0) |
3306 | return 0; | |
3307 | if (write_in_full(fd, get_item_line(todo_list, next - 1), | |
3308 | get_item_line_length(todo_list, next - 1)) | |
3309 | < 0) | |
3310 | ret = error_errno(_("could not write to '%s'"), done); | |
3311 | if (close(fd) < 0) | |
3312 | ret = error_errno(_("failed to finalize '%s'"), done); | |
3313 | return ret; | |
1df6df0c | 3314 | } |
221675de | 3315 | return 0; |
043a4492 RR |
3316 | } |
3317 | ||
88d5a271 | 3318 | static int save_opts(struct replay_opts *opts) |
043a4492 | 3319 | { |
f932729c | 3320 | const char *opts_file = git_path_opts_file(); |
88d5a271 | 3321 | int res = 0; |
043a4492 RR |
3322 | |
3323 | if (opts->no_commit) | |
f59199d5 PW |
3324 | res |= git_config_set_in_file_gently(opts_file, |
3325 | "options.no-commit", "true"); | |
39edfd5c EN |
3326 | if (opts->edit >= 0) |
3327 | res |= git_config_set_in_file_gently(opts_file, "options.edit", | |
3328 | opts->edit ? "true" : "false"); | |
6860ce5d PW |
3329 | if (opts->allow_empty) |
3330 | res |= git_config_set_in_file_gently(opts_file, | |
3331 | "options.allow-empty", "true"); | |
3332 | if (opts->allow_empty_message) | |
3333 | res |= git_config_set_in_file_gently(opts_file, | |
3334 | "options.allow-empty-message", "true"); | |
3335 | if (opts->keep_redundant_commits) | |
3336 | res |= git_config_set_in_file_gently(opts_file, | |
3337 | "options.keep-redundant-commits", "true"); | |
043a4492 | 3338 | if (opts->signoff) |
f59199d5 PW |
3339 | res |= git_config_set_in_file_gently(opts_file, |
3340 | "options.signoff", "true"); | |
043a4492 | 3341 | if (opts->record_origin) |
f59199d5 PW |
3342 | res |= git_config_set_in_file_gently(opts_file, |
3343 | "options.record-origin", "true"); | |
043a4492 | 3344 | if (opts->allow_ff) |
f59199d5 PW |
3345 | res |= git_config_set_in_file_gently(opts_file, |
3346 | "options.allow-ff", "true"); | |
043a4492 RR |
3347 | if (opts->mainline) { |
3348 | struct strbuf buf = STRBUF_INIT; | |
3349 | strbuf_addf(&buf, "%d", opts->mainline); | |
f59199d5 PW |
3350 | res |= git_config_set_in_file_gently(opts_file, |
3351 | "options.mainline", buf.buf); | |
043a4492 RR |
3352 | strbuf_release(&buf); |
3353 | } | |
3354 | if (opts->strategy) | |
f59199d5 PW |
3355 | res |= git_config_set_in_file_gently(opts_file, |
3356 | "options.strategy", opts->strategy); | |
3253553e | 3357 | if (opts->gpg_sign) |
f59199d5 PW |
3358 | res |= git_config_set_in_file_gently(opts_file, |
3359 | "options.gpg-sign", opts->gpg_sign); | |
043a4492 RR |
3360 | if (opts->xopts) { |
3361 | int i; | |
3362 | for (i = 0; i < opts->xopts_nr; i++) | |
88d5a271 | 3363 | res |= git_config_set_multivar_in_file_gently(opts_file, |
f59199d5 PW |
3364 | "options.strategy-option", |
3365 | opts->xopts[i], "^$", 0); | |
043a4492 | 3366 | } |
8d8cb4b0 | 3367 | if (opts->allow_rerere_auto) |
f59199d5 PW |
3368 | res |= git_config_set_in_file_gently(opts_file, |
3369 | "options.allow-rerere-auto", | |
3370 | opts->allow_rerere_auto == RERERE_AUTOUPDATE ? | |
3371 | "true" : "false"); | |
dc42e9a8 PW |
3372 | |
3373 | if (opts->explicit_cleanup) | |
3374 | res |= git_config_set_in_file_gently(opts_file, | |
3375 | "options.default-msg-cleanup", | |
3376 | describe_cleanup_mode(opts->default_msg_cleanup)); | |
88d5a271 | 3377 | return res; |
043a4492 RR |
3378 | } |
3379 | ||
f11c9580 NTND |
3380 | static int make_patch(struct repository *r, |
3381 | struct commit *commit, | |
3382 | struct replay_opts *opts) | |
56dc3ab0 JS |
3383 | { |
3384 | struct strbuf buf = STRBUF_INIT; | |
3385 | struct rev_info log_tree_opt; | |
0512eabd JH |
3386 | const char *subject; |
3387 | char hex[GIT_MAX_HEXSZ + 1]; | |
56dc3ab0 JS |
3388 | int res = 0; |
3389 | ||
0512eabd JH |
3390 | oid_to_hex_r(hex, &commit->object.oid); |
3391 | if (write_message(hex, strlen(hex), rebase_path_stopped_sha(), 1) < 0) | |
56dc3ab0 | 3392 | return -1; |
430b75f7 | 3393 | res |= write_rebase_head(&commit->object.oid); |
56dc3ab0 JS |
3394 | |
3395 | strbuf_addf(&buf, "%s/patch", get_dir(opts)); | |
3396 | memset(&log_tree_opt, 0, sizeof(log_tree_opt)); | |
f11c9580 | 3397 | repo_init_revisions(r, &log_tree_opt, NULL); |
56dc3ab0 JS |
3398 | log_tree_opt.abbrev = 0; |
3399 | log_tree_opt.diff = 1; | |
3400 | log_tree_opt.diffopt.output_format = DIFF_FORMAT_PATCH; | |
3401 | log_tree_opt.disable_stdin = 1; | |
3402 | log_tree_opt.no_commit_id = 1; | |
3403 | log_tree_opt.diffopt.file = fopen(buf.buf, "w"); | |
3404 | log_tree_opt.diffopt.use_color = GIT_COLOR_NEVER; | |
3405 | if (!log_tree_opt.diffopt.file) | |
3406 | res |= error_errno(_("could not open '%s'"), buf.buf); | |
3407 | else { | |
3408 | res |= log_tree_commit(&log_tree_opt, commit); | |
3409 | fclose(log_tree_opt.diffopt.file); | |
3410 | } | |
3411 | strbuf_reset(&buf); | |
3412 | ||
3413 | strbuf_addf(&buf, "%s/message", get_dir(opts)); | |
3414 | if (!file_exists(buf.buf)) { | |
52f52e5a ĐTCD |
3415 | const char *encoding = get_commit_output_encoding(); |
3416 | const char *commit_buffer = logmsg_reencode(commit, NULL, encoding); | |
56dc3ab0 JS |
3417 | find_commit_subject(commit_buffer, &subject); |
3418 | res |= write_message(subject, strlen(subject), buf.buf, 1); | |
3419 | unuse_commit_buffer(commit, commit_buffer); | |
3420 | } | |
3421 | strbuf_release(&buf); | |
3422 | ||
3423 | return res; | |
3424 | } | |
3425 | ||
3426 | static int intend_to_amend(void) | |
3427 | { | |
092bbcdf | 3428 | struct object_id head; |
56dc3ab0 JS |
3429 | char *p; |
3430 | ||
092bbcdf | 3431 | if (get_oid("HEAD", &head)) |
56dc3ab0 JS |
3432 | return error(_("cannot read HEAD")); |
3433 | ||
092bbcdf | 3434 | p = oid_to_hex(&head); |
56dc3ab0 JS |
3435 | return write_message(p, strlen(p), rebase_path_amend(), 1); |
3436 | } | |
3437 | ||
f11c9580 NTND |
3438 | static int error_with_patch(struct repository *r, |
3439 | struct commit *commit, | |
3440 | const char *subject, int subject_len, | |
3441 | struct replay_opts *opts, | |
3442 | int exit_code, int to_amend) | |
56dc3ab0 | 3443 | { |
bc9238bb | 3444 | if (commit) { |
f11c9580 | 3445 | if (make_patch(r, commit, opts)) |
bc9238bb | 3446 | return -1; |
5a5c5e95 | 3447 | } else if (copy_file(rebase_path_message(), |
f11c9580 | 3448 | git_path_merge_msg(r), 0666)) |
bc9238bb | 3449 | return error(_("unable to copy '%s' to '%s'"), |
f11c9580 | 3450 | git_path_merge_msg(r), rebase_path_message()); |
56dc3ab0 JS |
3451 | |
3452 | if (to_amend) { | |
3453 | if (intend_to_amend()) | |
3454 | return -1; | |
3455 | ||
02127c63 NTND |
3456 | fprintf(stderr, |
3457 | _("You can amend the commit now, with\n" | |
3458 | "\n" | |
3459 | " git commit --amend %s\n" | |
3460 | "\n" | |
3461 | "Once you are satisfied with your changes, run\n" | |
3462 | "\n" | |
3463 | " git rebase --continue\n"), | |
3464 | gpg_sign_opt_quoted(opts)); | |
bc9238bb PW |
3465 | } else if (exit_code) { |
3466 | if (commit) | |
5a5c5e95 JH |
3467 | fprintf_ln(stderr, _("Could not apply %s... %.*s"), |
3468 | short_commit_name(commit), subject_len, subject); | |
bc9238bb PW |
3469 | else |
3470 | /* | |
3471 | * We don't have the hash of the parent so | |
3472 | * just print the line from the todo file. | |
3473 | */ | |
5a5c5e95 JH |
3474 | fprintf_ln(stderr, _("Could not merge %.*s"), |
3475 | subject_len, subject); | |
bc9238bb | 3476 | } |
56dc3ab0 JS |
3477 | |
3478 | return exit_code; | |
3479 | } | |
3480 | ||
f11c9580 NTND |
3481 | static int error_failed_squash(struct repository *r, |
3482 | struct commit *commit, | |
3483 | struct replay_opts *opts, | |
3484 | int subject_len, | |
3485 | const char *subject) | |
6e98de72 | 3486 | { |
e12a7ef5 JS |
3487 | if (copy_file(rebase_path_message(), rebase_path_squash_msg(), 0666)) |
3488 | return error(_("could not copy '%s' to '%s'"), | |
6e98de72 | 3489 | rebase_path_squash_msg(), rebase_path_message()); |
f11c9580 NTND |
3490 | unlink(git_path_merge_msg(r)); |
3491 | if (copy_file(git_path_merge_msg(r), rebase_path_message(), 0666)) | |
6e98de72 | 3492 | return error(_("could not copy '%s' to '%s'"), |
102de880 | 3493 | rebase_path_message(), |
f11c9580 NTND |
3494 | git_path_merge_msg(r)); |
3495 | return error_with_patch(r, commit, subject, subject_len, opts, 1, 0); | |
6e98de72 JS |
3496 | } |
3497 | ||
f11c9580 | 3498 | static int do_exec(struct repository *r, const char *command_line) |
311af526 JS |
3499 | { |
3500 | const char *child_argv[] = { NULL, NULL }; | |
3501 | int dirty, status; | |
3502 | ||
4d55d63b | 3503 | fprintf(stderr, _("Executing: %s\n"), command_line); |
311af526 | 3504 | child_argv[0] = command_line; |
434e0636 | 3505 | status = run_command_v_opt(child_argv, RUN_USING_SHELL); |
311af526 JS |
3506 | |
3507 | /* force re-reading of the cache */ | |
e1ff0a32 | 3508 | if (discard_index(r->index) < 0 || repo_read_index(r) < 0) |
311af526 JS |
3509 | return error(_("could not read index")); |
3510 | ||
f11c9580 | 3511 | dirty = require_clean_work_tree(r, "rebase", NULL, 1, 1); |
311af526 JS |
3512 | |
3513 | if (status) { | |
3514 | warning(_("execution failed: %s\n%s" | |
3515 | "You can fix the problem, and then run\n" | |
3516 | "\n" | |
3517 | " git rebase --continue\n" | |
3518 | "\n"), | |
3519 | command_line, | |
3520 | dirty ? N_("and made changes to the index and/or the " | |
3521 | "working tree\n") : ""); | |
3522 | if (status == 127) | |
3523 | /* command not found */ | |
3524 | status = 1; | |
3525 | } else if (dirty) { | |
3526 | warning(_("execution succeeded: %s\nbut " | |
3527 | "left changes to the index and/or the working tree\n" | |
3528 | "Commit or stash your changes, and then run\n" | |
3529 | "\n" | |
3530 | " git rebase --continue\n" | |
3531 | "\n"), command_line); | |
3532 | status = 1; | |
3533 | } | |
3534 | ||
3535 | return status; | |
3536 | } | |
3537 | ||
48ca53ca | 3538 | __attribute__((format (printf, 2, 3))) |
9055e401 JS |
3539 | static int safe_append(const char *filename, const char *fmt, ...) |
3540 | { | |
3541 | va_list ap; | |
3542 | struct lock_file lock = LOCK_INIT; | |
3543 | int fd = hold_lock_file_for_update(&lock, filename, | |
3544 | LOCK_REPORT_ON_ERROR); | |
3545 | struct strbuf buf = STRBUF_INIT; | |
3546 | ||
3547 | if (fd < 0) | |
3548 | return -1; | |
3549 | ||
3550 | if (strbuf_read_file(&buf, filename, 0) < 0 && errno != ENOENT) { | |
3551 | error_errno(_("could not read '%s'"), filename); | |
3552 | rollback_lock_file(&lock); | |
3553 | return -1; | |
3554 | } | |
3555 | strbuf_complete(&buf, '\n'); | |
3556 | va_start(ap, fmt); | |
3557 | strbuf_vaddf(&buf, fmt, ap); | |
3558 | va_end(ap); | |
3559 | ||
3560 | if (write_in_full(fd, buf.buf, buf.len) < 0) { | |
3561 | error_errno(_("could not write to '%s'"), filename); | |
3562 | strbuf_release(&buf); | |
3563 | rollback_lock_file(&lock); | |
3564 | return -1; | |
3565 | } | |
3566 | if (commit_lock_file(&lock) < 0) { | |
3567 | strbuf_release(&buf); | |
3568 | rollback_lock_file(&lock); | |
3569 | return error(_("failed to finalize '%s'"), filename); | |
3570 | } | |
3571 | ||
3572 | strbuf_release(&buf); | |
3573 | return 0; | |
3574 | } | |
3575 | ||
f11c9580 | 3576 | static int do_label(struct repository *r, const char *name, int len) |
9055e401 | 3577 | { |
f11c9580 | 3578 | struct ref_store *refs = get_main_ref_store(r); |
9055e401 JS |
3579 | struct ref_transaction *transaction; |
3580 | struct strbuf ref_name = STRBUF_INIT, err = STRBUF_INIT; | |
3581 | struct strbuf msg = STRBUF_INIT; | |
3582 | int ret = 0; | |
3583 | struct object_id head_oid; | |
3584 | ||
3585 | if (len == 1 && *name == '#') | |
02127c63 | 3586 | return error(_("illegal label name: '%.*s'"), len, name); |
9055e401 JS |
3587 | |
3588 | strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name); | |
c2417d3a | 3589 | strbuf_addf(&msg, "rebase (label) '%.*s'", len, name); |
9055e401 JS |
3590 | |
3591 | transaction = ref_store_transaction_begin(refs, &err); | |
3592 | if (!transaction) { | |
3593 | error("%s", err.buf); | |
3594 | ret = -1; | |
3595 | } else if (get_oid("HEAD", &head_oid)) { | |
3596 | error(_("could not read HEAD")); | |
3597 | ret = -1; | |
3598 | } else if (ref_transaction_update(transaction, ref_name.buf, &head_oid, | |
3599 | NULL, 0, msg.buf, &err) < 0 || | |
3600 | ref_transaction_commit(transaction, &err)) { | |
3601 | error("%s", err.buf); | |
3602 | ret = -1; | |
3603 | } | |
3604 | ref_transaction_free(transaction); | |
3605 | strbuf_release(&err); | |
3606 | strbuf_release(&msg); | |
3607 | ||
3608 | if (!ret) | |
3609 | ret = safe_append(rebase_path_refs_to_delete(), | |
3610 | "%s\n", ref_name.buf); | |
3611 | strbuf_release(&ref_name); | |
3612 | ||
3613 | return ret; | |
3614 | } | |
3615 | ||
48ca53ca | 3616 | __attribute__((format (printf, 3, 4))) |
9055e401 | 3617 | static const char *reflog_message(struct replay_opts *opts, |
d4ac3050 ÆAB |
3618 | const char *sub_action, const char *fmt, ...) |
3619 | { | |
3620 | va_list ap; | |
3621 | static struct strbuf buf = STRBUF_INIT; | |
3622 | char *reflog_action = getenv(GIT_REFLOG_ACTION); | |
3623 | ||
3624 | va_start(ap, fmt); | |
3625 | strbuf_reset(&buf); | |
3626 | strbuf_addstr(&buf, reflog_action ? reflog_action : action_name(opts)); | |
3627 | if (sub_action) | |
3628 | strbuf_addf(&buf, " (%s)", sub_action); | |
3629 | if (fmt) { | |
3630 | strbuf_addstr(&buf, ": "); | |
3631 | strbuf_vaddf(&buf, fmt, ap); | |
3632 | } | |
3633 | va_end(ap); | |
3634 | ||
3635 | return buf.buf; | |
3636 | } | |
9055e401 | 3637 | |
f11c9580 NTND |
3638 | static int do_reset(struct repository *r, |
3639 | const char *name, int len, | |
3640 | struct replay_opts *opts) | |
9055e401 JS |
3641 | { |
3642 | struct strbuf ref_name = STRBUF_INIT; | |
3643 | struct object_id oid; | |
3644 | struct lock_file lock = LOCK_INIT; | |
0c52cf8e | 3645 | struct tree_desc desc = { 0 }; |
9055e401 | 3646 | struct tree *tree; |
6e658547 | 3647 | struct unpack_trees_options unpack_tree_opts = { 0 }; |
71571cd7 | 3648 | int ret = 0; |
9055e401 | 3649 | |
3a95f31d | 3650 | if (repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0) |
9055e401 JS |
3651 | return -1; |
3652 | ||
ebddf393 JS |
3653 | if (len == 10 && !strncmp("[new root]", name, len)) { |
3654 | if (!opts->have_squash_onto) { | |
3655 | const char *hex; | |
3656 | if (commit_tree("", 0, the_hash_algo->empty_tree, | |
3657 | NULL, &opts->squash_onto, | |
3658 | NULL, NULL)) | |
3659 | return error(_("writing fake root commit")); | |
3660 | opts->have_squash_onto = 1; | |
3661 | hex = oid_to_hex(&opts->squash_onto); | |
3662 | if (write_message(hex, strlen(hex), | |
3663 | rebase_path_squash_onto(), 0)) | |
3664 | return error(_("writing squash-onto")); | |
3665 | } | |
3666 | oidcpy(&oid, &opts->squash_onto); | |
3667 | } else { | |
71571cd7 MÅ |
3668 | int i; |
3669 | ||
ebddf393 JS |
3670 | /* Determine the length of the label */ |
3671 | for (i = 0; i < len; i++) | |
3672 | if (isspace(name[i])) | |
71571cd7 MÅ |
3673 | break; |
3674 | len = i; | |
ebddf393 JS |
3675 | |
3676 | strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name); | |
3677 | if (get_oid(ref_name.buf, &oid) && | |
3678 | get_oid(ref_name.buf + strlen("refs/rewritten/"), &oid)) { | |
0c52cf8e ÆAB |
3679 | ret = error(_("could not read '%s'"), ref_name.buf); |
3680 | goto cleanup; | |
ebddf393 | 3681 | } |
9055e401 JS |
3682 | } |
3683 | ||
9055e401 JS |
3684 | setup_unpack_trees_porcelain(&unpack_tree_opts, "reset"); |
3685 | unpack_tree_opts.head_idx = 1; | |
f11c9580 NTND |
3686 | unpack_tree_opts.src_index = r->index; |
3687 | unpack_tree_opts.dst_index = r->index; | |
9055e401 JS |
3688 | unpack_tree_opts.fn = oneway_merge; |
3689 | unpack_tree_opts.merge = 1; | |
3690 | unpack_tree_opts.update = 1; | |
1b5f3733 | 3691 | unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */ |
3f267856 | 3692 | init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL); |
9055e401 | 3693 | |
e1ff0a32 | 3694 | if (repo_read_index_unmerged(r)) { |
0c52cf8e ÆAB |
3695 | ret = error_resolve_conflict(_(action_name(opts))); |
3696 | goto cleanup; | |
9055e401 JS |
3697 | } |
3698 | ||
5e575807 | 3699 | if (!fill_tree_descriptor(r, &desc, &oid)) { |
0c52cf8e ÆAB |
3700 | ret = error(_("failed to find tree of %s"), oid_to_hex(&oid)); |
3701 | goto cleanup; | |
9055e401 JS |
3702 | } |
3703 | ||
3704 | if (unpack_trees(1, &desc, &unpack_tree_opts)) { | |
0c52cf8e ÆAB |
3705 | ret = -1; |
3706 | goto cleanup; | |
9055e401 JS |
3707 | } |
3708 | ||
3709 | tree = parse_tree_indirect(&oid); | |
c207e9e1 | 3710 | prime_cache_tree(r, r->index, tree); |
9055e401 | 3711 | |
f11c9580 | 3712 | if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0) |
9055e401 | 3713 | ret = error(_("could not write index")); |
9055e401 JS |
3714 | |
3715 | if (!ret) | |
3716 | ret = update_ref(reflog_message(opts, "reset", "'%.*s'", | |
3717 | len, name), "HEAD", &oid, | |
3718 | NULL, 0, UPDATE_REFS_MSG_ON_ERR); | |
0c52cf8e ÆAB |
3719 | cleanup: |
3720 | free((void *)desc.buffer); | |
3721 | if (ret < 0) | |
3722 | rollback_lock_file(&lock); | |
9055e401 | 3723 | strbuf_release(&ref_name); |
6e658547 | 3724 | clear_unpack_trees_porcelain(&unpack_tree_opts); |
9055e401 JS |
3725 | return ret; |
3726 | } | |
3727 | ||
2b6ad0f4 JS |
3728 | static struct commit *lookup_label(const char *label, int len, |
3729 | struct strbuf *buf) | |
3730 | { | |
3731 | struct commit *commit; | |
3732 | ||
3733 | strbuf_reset(buf); | |
3734 | strbuf_addf(buf, "refs/rewritten/%.*s", len, label); | |
3735 | commit = lookup_commit_reference_by_name(buf->buf); | |
3736 | if (!commit) { | |
3737 | /* fall back to non-rewritten ref or commit */ | |
3738 | strbuf_splice(buf, 0, strlen("refs/rewritten/"), "", 0); | |
3739 | commit = lookup_commit_reference_by_name(buf->buf); | |
3740 | } | |
3741 | ||
3742 | if (!commit) | |
3743 | error(_("could not resolve '%s'"), buf->buf); | |
3744 | ||
3745 | return commit; | |
3746 | } | |
3747 | ||
f11c9580 NTND |
3748 | static int do_merge(struct repository *r, |
3749 | struct commit *commit, | |
3750 | const char *arg, int arg_len, | |
2be6b6f4 | 3751 | int flags, int *check_todo, struct replay_opts *opts) |
4c68e7dd | 3752 | { |
2be6b6f4 | 3753 | int run_commit_flags = 0; |
4c68e7dd JS |
3754 | struct strbuf ref_name = STRBUF_INIT; |
3755 | struct commit *head_commit, *merge_commit, *i; | |
3756 | struct commit_list *bases, *j, *reversed = NULL; | |
2b6ad0f4 | 3757 | struct commit_list *to_merge = NULL, **tail = &to_merge; |
e145d993 | 3758 | const char *strategy = !opts->xopts_nr && |
14c4586c EN |
3759 | (!opts->strategy || |
3760 | !strcmp(opts->strategy, "recursive") || | |
3761 | !strcmp(opts->strategy, "ort")) ? | |
e145d993 | 3762 | NULL : opts->strategy; |
4c68e7dd | 3763 | struct merge_options o; |
2b6ad0f4 | 3764 | int merge_arg_len, oneline_offset, can_fast_forward, ret, k; |
4c68e7dd JS |
3765 | static struct lock_file lock; |
3766 | const char *p; | |
3767 | ||
3a95f31d | 3768 | if (repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0) { |
4c68e7dd JS |
3769 | ret = -1; |
3770 | goto leave_merge; | |
3771 | } | |
3772 | ||
3773 | head_commit = lookup_commit_reference_by_name("HEAD"); | |
3774 | if (!head_commit) { | |
3775 | ret = error(_("cannot merge without a current revision")); | |
3776 | goto leave_merge; | |
3777 | } | |
3778 | ||
2b6ad0f4 JS |
3779 | /* |
3780 | * For octopus merges, the arg starts with the list of revisions to be | |
3781 | * merged. The list is optionally followed by '#' and the oneline. | |
3782 | */ | |
3783 | merge_arg_len = oneline_offset = arg_len; | |
3784 | for (p = arg; p - arg < arg_len; p += strspn(p, " \t\n")) { | |
3785 | if (!*p) | |
3786 | break; | |
3787 | if (*p == '#' && (!p[1] || isspace(p[1]))) { | |
3788 | p += 1 + strspn(p + 1, " \t\n"); | |
3789 | oneline_offset = p - arg; | |
3790 | break; | |
3791 | } | |
3792 | k = strcspn(p, " \t\n"); | |
3793 | if (!k) | |
3794 | continue; | |
3795 | merge_commit = lookup_label(p, k, &ref_name); | |
3796 | if (!merge_commit) { | |
3797 | ret = error(_("unable to parse '%.*s'"), k, p); | |
3798 | goto leave_merge; | |
3799 | } | |
3800 | tail = &commit_list_insert(merge_commit, tail)->next; | |
3801 | p += k; | |
3802 | merge_arg_len = p - arg; | |
4c68e7dd JS |
3803 | } |
3804 | ||
2b6ad0f4 JS |
3805 | if (!to_merge) { |
3806 | ret = error(_("nothing to merge: '%.*s'"), arg_len, arg); | |
4c68e7dd JS |
3807 | goto leave_merge; |
3808 | } | |
3809 | ||
9c85a1c2 | 3810 | if (opts->have_squash_onto && |
4a7e27e9 | 3811 | oideq(&head_commit->object.oid, &opts->squash_onto)) { |
9c85a1c2 JS |
3812 | /* |
3813 | * When the user tells us to "merge" something into a | |
3814 | * "[new root]", let's simply fast-forward to the merge head. | |
3815 | */ | |
3816 | rollback_lock_file(&lock); | |
2b6ad0f4 JS |
3817 | if (to_merge->next) |
3818 | ret = error(_("octopus merge cannot be executed on " | |
3819 | "top of a [new root]")); | |
3820 | else | |
f11c9580 | 3821 | ret = fast_forward_to(r, &to_merge->item->object.oid, |
2b6ad0f4 JS |
3822 | &head_commit->object.oid, 0, |
3823 | opts); | |
9c85a1c2 JS |
3824 | goto leave_merge; |
3825 | } | |
3826 | ||
baf8ec8d PW |
3827 | /* |
3828 | * If HEAD is not identical to the first parent of the original merge | |
3829 | * commit, we cannot fast-forward. | |
3830 | */ | |
3831 | can_fast_forward = opts->allow_ff && commit && commit->parents && | |
3832 | oideq(&commit->parents->item->object.oid, | |
3833 | &head_commit->object.oid); | |
3834 | ||
3835 | /* | |
3836 | * If any merge head is different from the original one, we cannot | |
3837 | * fast-forward. | |
3838 | */ | |
3839 | if (can_fast_forward) { | |
3840 | struct commit_list *p = commit->parents->next; | |
3841 | ||
3842 | for (j = to_merge; j && p; j = j->next, p = p->next) | |
3843 | if (!oideq(&j->item->object.oid, | |
3844 | &p->item->object.oid)) { | |
3845 | can_fast_forward = 0; | |
3846 | break; | |
3847 | } | |
3848 | /* | |
3849 | * If the number of merge heads differs from the original merge | |
3850 | * commit, we cannot fast-forward. | |
3851 | */ | |
3852 | if (j || p) | |
3853 | can_fast_forward = 0; | |
3854 | } | |
3855 | ||
3856 | if (can_fast_forward) { | |
3857 | rollback_lock_file(&lock); | |
3858 | ret = fast_forward_to(r, &commit->object.oid, | |
3859 | &head_commit->object.oid, 0, opts); | |
3860 | if (flags & TODO_EDIT_MERGE_MSG) | |
3861 | goto fast_forward_edit; | |
3862 | ||
3863 | goto leave_merge; | |
3864 | } | |
3865 | ||
4c68e7dd | 3866 | if (commit) { |
5772b0c7 ĐTCD |
3867 | const char *encoding = get_commit_output_encoding(); |
3868 | const char *message = logmsg_reencode(commit, NULL, encoding); | |
4c68e7dd JS |
3869 | const char *body; |
3870 | int len; | |
3871 | ||
3872 | if (!message) { | |
3873 | ret = error(_("could not get commit message of '%s'"), | |
3874 | oid_to_hex(&commit->object.oid)); | |
3875 | goto leave_merge; | |
3876 | } | |
3877 | write_author_script(message); | |
3878 | find_commit_subject(message, &body); | |
3879 | len = strlen(body); | |
f11c9580 | 3880 | ret = write_message(body, len, git_path_merge_msg(r), 0); |
4c68e7dd JS |
3881 | unuse_commit_buffer(commit, message); |
3882 | if (ret) { | |
3883 | error_errno(_("could not write '%s'"), | |
f11c9580 | 3884 | git_path_merge_msg(r)); |
4c68e7dd JS |
3885 | goto leave_merge; |
3886 | } | |
3887 | } else { | |
3888 | struct strbuf buf = STRBUF_INIT; | |
3889 | int len; | |
3890 | ||
3891 | strbuf_addf(&buf, "author %s", git_author_info(0)); | |
3892 | write_author_script(buf.buf); | |
3893 | strbuf_reset(&buf); | |
3894 | ||
3895 | if (oneline_offset < arg_len) { | |
3896 | p = arg + oneline_offset; | |
3897 | len = arg_len - oneline_offset; | |
3898 | } else { | |
2b6ad0f4 JS |
3899 | strbuf_addf(&buf, "Merge %s '%.*s'", |
3900 | to_merge->next ? "branches" : "branch", | |
4c68e7dd JS |
3901 | merge_arg_len, arg); |
3902 | p = buf.buf; | |
3903 | len = buf.len; | |
3904 | } | |
3905 | ||
f11c9580 | 3906 | ret = write_message(p, len, git_path_merge_msg(r), 0); |
4c68e7dd JS |
3907 | strbuf_release(&buf); |
3908 | if (ret) { | |
3909 | error_errno(_("could not write '%s'"), | |
f11c9580 | 3910 | git_path_merge_msg(r)); |
4c68e7dd JS |
3911 | goto leave_merge; |
3912 | } | |
3913 | } | |
3914 | ||
e145d993 | 3915 | if (strategy || to_merge->next) { |
2b6ad0f4 JS |
3916 | /* Octopus merge */ |
3917 | struct child_process cmd = CHILD_PROCESS_INIT; | |
3918 | ||
3919 | if (read_env_script(&cmd.env_array)) { | |
3920 | const char *gpg_opt = gpg_sign_opt_quoted(opts); | |
3921 | ||
3922 | ret = error(_(staged_changes_advice), gpg_opt, gpg_opt); | |
3923 | goto leave_merge; | |
3924 | } | |
3925 | ||
7573cec5 | 3926 | if (opts->committer_date_is_author_date) |
9c31b19d JH |
3927 | strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s", |
3928 | opts->ignore_date ? | |
3929 | "" : | |
3930 | author_date_from_env_array(&cmd.env_array)); | |
a3894aad | 3931 | if (opts->ignore_date) |
9c31b19d | 3932 | strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE="); |
7573cec5 | 3933 | |
2b6ad0f4 | 3934 | cmd.git_cmd = 1; |
c972bf4c JK |
3935 | strvec_push(&cmd.args, "merge"); |
3936 | strvec_push(&cmd.args, "-s"); | |
e145d993 | 3937 | if (!strategy) |
c972bf4c | 3938 | strvec_push(&cmd.args, "octopus"); |
e145d993 | 3939 | else { |
c972bf4c | 3940 | strvec_push(&cmd.args, strategy); |
e145d993 | 3941 | for (k = 0; k < opts->xopts_nr; k++) |
c972bf4c | 3942 | strvec_pushf(&cmd.args, |
f6d8942b | 3943 | "-X%s", opts->xopts[k]); |
e145d993 | 3944 | } |
f2563c9e PW |
3945 | if (!(flags & TODO_EDIT_MERGE_MSG)) |
3946 | strvec_push(&cmd.args, "--no-edit"); | |
3947 | else | |
3948 | strvec_push(&cmd.args, "--edit"); | |
c972bf4c JK |
3949 | strvec_push(&cmd.args, "--no-ff"); |
3950 | strvec_push(&cmd.args, "--no-log"); | |
3951 | strvec_push(&cmd.args, "--no-stat"); | |
3952 | strvec_push(&cmd.args, "-F"); | |
3953 | strvec_push(&cmd.args, git_path_merge_msg(r)); | |
2b6ad0f4 | 3954 | if (opts->gpg_sign) |
ae03c97a | 3955 | strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign); |
19dad040 SČ |
3956 | else |
3957 | strvec_push(&cmd.args, "--no-gpg-sign"); | |
2b6ad0f4 JS |
3958 | |
3959 | /* Add the tips to be merged */ | |
3960 | for (j = to_merge; j; j = j->next) | |
c972bf4c | 3961 | strvec_push(&cmd.args, |
f6d8942b | 3962 | oid_to_hex(&j->item->object.oid)); |
2b6ad0f4 JS |
3963 | |
3964 | strbuf_release(&ref_name); | |
c8e4159e HWN |
3965 | refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", |
3966 | NULL, 0); | |
2b6ad0f4 JS |
3967 | rollback_lock_file(&lock); |
3968 | ||
2b6ad0f4 JS |
3969 | ret = run_command(&cmd); |
3970 | ||
3971 | /* force re-reading of the cache */ | |
f11c9580 | 3972 | if (!ret && (discard_index(r->index) < 0 || |
e1ff0a32 | 3973 | repo_read_index(r) < 0)) |
2b6ad0f4 JS |
3974 | ret = error(_("could not read index")); |
3975 | goto leave_merge; | |
3976 | } | |
3977 | ||
3978 | merge_commit = to_merge->item; | |
4c68e7dd | 3979 | bases = get_merge_bases(head_commit, merge_commit); |
4a7e27e9 JK |
3980 | if (bases && oideq(&merge_commit->object.oid, |
3981 | &bases->item->object.oid)) { | |
7ccdf65b JS |
3982 | ret = 0; |
3983 | /* skip merging an ancestor of HEAD */ | |
3984 | goto leave_merge; | |
3985 | } | |
3986 | ||
4439c7a3 | 3987 | write_message(oid_to_hex(&merge_commit->object.oid), the_hash_algo->hexsz, |
cde55548 JH |
3988 | git_path_merge_head(r), 0); |
3989 | write_message("no-ff", 5, git_path_merge_mode(r), 0); | |
85f8d9da | 3990 | |
4c68e7dd JS |
3991 | for (j = bases; j; j = j->next) |
3992 | commit_list_insert(j->item, &reversed); | |
3993 | free_commit_list(bases); | |
3994 | ||
e1ff0a32 | 3995 | repo_read_index(r); |
0d6caa2d | 3996 | init_merge_options(&o, r); |
4c68e7dd JS |
3997 | o.branch1 = "HEAD"; |
3998 | o.branch2 = ref_name.buf; | |
3999 | o.buffer_output = 2; | |
4000 | ||
6a5fb966 | 4001 | if (!opts->strategy || !strcmp(opts->strategy, "ort")) { |
14c4586c EN |
4002 | /* |
4003 | * TODO: Should use merge_incore_recursive() and | |
4004 | * merge_switch_to_result(), skipping the call to | |
4005 | * merge_switch_to_result() when we don't actually need to | |
4006 | * update the index and working copy immediately. | |
4007 | */ | |
4008 | ret = merge_ort_recursive(&o, | |
4009 | head_commit, merge_commit, reversed, | |
4010 | &i); | |
4011 | } else { | |
4012 | ret = merge_recursive(&o, head_commit, merge_commit, reversed, | |
4013 | &i); | |
4014 | } | |
4c68e7dd JS |
4015 | if (ret <= 0) |
4016 | fputs(o.obuf.buf, stdout); | |
4017 | strbuf_release(&o.obuf); | |
4018 | if (ret < 0) { | |
4019 | error(_("could not even attempt to merge '%.*s'"), | |
4020 | merge_arg_len, arg); | |
4021 | goto leave_merge; | |
4022 | } | |
4023 | /* | |
4024 | * The return value of merge_recursive() is 1 on clean, and 0 on | |
4025 | * unclean merge. | |
4026 | * | |
4027 | * Let's reverse that, so that do_merge() returns 0 upon success and | |
4028 | * 1 upon failed merge (keeping the return value -1 for the cases where | |
4029 | * we will want to reschedule the `merge` command). | |
4030 | */ | |
4031 | ret = !ret; | |
4032 | ||
f11c9580 NTND |
4033 | if (r->index->cache_changed && |
4034 | write_locked_index(r->index, &lock, COMMIT_LOCK)) { | |
4c68e7dd JS |
4035 | ret = error(_("merge: Unable to write new index file")); |
4036 | goto leave_merge; | |
4037 | } | |
4038 | ||
4039 | rollback_lock_file(&lock); | |
4040 | if (ret) | |
f11c9580 | 4041 | repo_rerere(r, opts->allow_rerere_auto); |
4c68e7dd JS |
4042 | else |
4043 | /* | |
4044 | * In case of problems, we now want to return a positive | |
4045 | * value (a negative one would indicate that the `merge` | |
4046 | * command needs to be rescheduled). | |
4047 | */ | |
20f4b044 | 4048 | ret = !!run_git_commit(git_path_merge_msg(r), opts, |
f11c9580 | 4049 | run_commit_flags); |
4c68e7dd | 4050 | |
2be6b6f4 PW |
4051 | if (!ret && flags & TODO_EDIT_MERGE_MSG) { |
4052 | fast_forward_edit: | |
4053 | *check_todo = 1; | |
4054 | run_commit_flags |= AMEND_MSG | EDIT_MSG | VERIFY_MSG; | |
4055 | ret = !!run_git_commit(NULL, opts, run_commit_flags); | |
4056 | } | |
4057 | ||
4058 | ||
4c68e7dd JS |
4059 | leave_merge: |
4060 | strbuf_release(&ref_name); | |
4061 | rollback_lock_file(&lock); | |
2b6ad0f4 | 4062 | free_commit_list(to_merge); |
4c68e7dd JS |
4063 | return ret; |
4064 | } | |
4065 | ||
6e98de72 JS |
4066 | static int is_final_fixup(struct todo_list *todo_list) |
4067 | { | |
4068 | int i = todo_list->current; | |
4069 | ||
4070 | if (!is_fixup(todo_list->items[i].command)) | |
4071 | return 0; | |
4072 | ||
4073 | while (++i < todo_list->nr) | |
4074 | if (is_fixup(todo_list->items[i].command)) | |
4075 | return 0; | |
4076 | else if (!is_noop(todo_list->items[i].command)) | |
4077 | break; | |
4078 | return 1; | |
4079 | } | |
4080 | ||
25cb8df9 JS |
4081 | static enum todo_command peek_command(struct todo_list *todo_list, int offset) |
4082 | { | |
4083 | int i; | |
4084 | ||
4085 | for (i = todo_list->current + offset; i < todo_list->nr; i++) | |
4086 | if (!is_noop(todo_list->items[i].command)) | |
4087 | return todo_list->items[i].command; | |
4088 | ||
4089 | return -1; | |
4090 | } | |
4091 | ||
0816f1df DL |
4092 | void create_autostash(struct repository *r, const char *path, |
4093 | const char *default_reflog_action) | |
4094 | { | |
4095 | struct strbuf buf = STRBUF_INIT; | |
4096 | struct lock_file lock_file = LOCK_INIT; | |
4097 | int fd; | |
4098 | ||
4099 | fd = repo_hold_locked_index(r, &lock_file, 0); | |
4100 | refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL); | |
4101 | if (0 <= fd) | |
4102 | repo_update_index_if_able(r, &lock_file); | |
4103 | rollback_lock_file(&lock_file); | |
4104 | ||
4105 | if (has_unstaged_changes(r, 1) || | |
4106 | has_uncommitted_changes(r, 1)) { | |
4107 | struct child_process stash = CHILD_PROCESS_INIT; | |
4108 | struct object_id oid; | |
4109 | ||
c972bf4c | 4110 | strvec_pushl(&stash.args, |
f6d8942b | 4111 | "stash", "create", "autostash", NULL); |
0816f1df DL |
4112 | stash.git_cmd = 1; |
4113 | stash.no_stdin = 1; | |
4114 | strbuf_reset(&buf); | |
4115 | if (capture_command(&stash, &buf, GIT_MAX_HEXSZ)) | |
4116 | die(_("Cannot autostash")); | |
4117 | strbuf_trim_trailing_newline(&buf); | |
4118 | if (get_oid(buf.buf, &oid)) | |
4119 | die(_("Unexpected stash response: '%s'"), | |
4120 | buf.buf); | |
4121 | strbuf_reset(&buf); | |
4122 | strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV); | |
4123 | ||
4124 | if (safe_create_leading_directories_const(path)) | |
4125 | die(_("Could not create directory for '%s'"), | |
4126 | path); | |
4127 | write_file(path, "%s", oid_to_hex(&oid)); | |
4128 | printf(_("Created autostash: %s\n"), buf.buf); | |
4129 | if (reset_head(r, NULL, "reset --hard", | |
4130 | NULL, RESET_HEAD_HARD, NULL, NULL, | |
4131 | default_reflog_action) < 0) | |
4132 | die(_("could not reset --hard")); | |
4133 | ||
4134 | if (discard_index(r->index) < 0 || | |
4135 | repo_read_index(r) < 0) | |
4136 | die(_("could not read index")); | |
4137 | } | |
4138 | strbuf_release(&buf); | |
4139 | } | |
4140 | ||
804fe315 | 4141 | static int apply_save_autostash_oid(const char *stash_oid, int attempt_apply) |
796c7972 | 4142 | { |
796c7972 JS |
4143 | struct child_process child = CHILD_PROCESS_INIT; |
4144 | int ret = 0; | |
4145 | ||
12b6e136 DL |
4146 | if (attempt_apply) { |
4147 | child.git_cmd = 1; | |
4148 | child.no_stdout = 1; | |
4149 | child.no_stderr = 1; | |
c972bf4c JK |
4150 | strvec_push(&child.args, "stash"); |
4151 | strvec_push(&child.args, "apply"); | |
4152 | strvec_push(&child.args, stash_oid); | |
12b6e136 | 4153 | ret = run_command(&child); |
796c7972 | 4154 | } |
796c7972 | 4155 | |
12b6e136 | 4156 | if (attempt_apply && !ret) |
cdb866b3 | 4157 | fprintf(stderr, _("Applied autostash.\n")); |
796c7972 JS |
4158 | else { |
4159 | struct child_process store = CHILD_PROCESS_INIT; | |
4160 | ||
4161 | store.git_cmd = 1; | |
c972bf4c JK |
4162 | strvec_push(&store.args, "stash"); |
4163 | strvec_push(&store.args, "store"); | |
4164 | strvec_push(&store.args, "-m"); | |
4165 | strvec_push(&store.args, "autostash"); | |
4166 | strvec_push(&store.args, "-q"); | |
4167 | strvec_push(&store.args, stash_oid); | |
796c7972 | 4168 | if (run_command(&store)) |
804fe315 | 4169 | ret = error(_("cannot store %s"), stash_oid); |
796c7972 | 4170 | else |
cdb866b3 | 4171 | fprintf(stderr, |
12b6e136 | 4172 | _("%s\n" |
cdb866b3 JS |
4173 | "Your changes are safe in the stash.\n" |
4174 | "You can run \"git stash pop\" or" | |
12b6e136 DL |
4175 | " \"git stash drop\" at any time.\n"), |
4176 | attempt_apply ? | |
4177 | _("Applying autostash resulted in conflicts.") : | |
4178 | _("Autostash exists; creating a new stash entry.")); | |
796c7972 JS |
4179 | } |
4180 | ||
796c7972 JS |
4181 | return ret; |
4182 | } | |
4183 | ||
804fe315 DL |
4184 | static int apply_save_autostash(const char *path, int attempt_apply) |
4185 | { | |
4186 | struct strbuf stash_oid = STRBUF_INIT; | |
4187 | int ret = 0; | |
4188 | ||
4189 | if (!read_oneliner(&stash_oid, path, | |
4190 | READ_ONELINER_SKIP_IF_EMPTY)) { | |
4191 | strbuf_release(&stash_oid); | |
4192 | return 0; | |
4193 | } | |
4194 | strbuf_trim(&stash_oid); | |
4195 | ||
4196 | ret = apply_save_autostash_oid(stash_oid.buf, attempt_apply); | |
4197 | ||
0dd562e0 | 4198 | unlink(path); |
facca7f0 | 4199 | strbuf_release(&stash_oid); |
796c7972 JS |
4200 | return ret; |
4201 | } | |
4202 | ||
12b6e136 DL |
4203 | int save_autostash(const char *path) |
4204 | { | |
4205 | return apply_save_autostash(path, 0); | |
4206 | } | |
4207 | ||
4208 | int apply_autostash(const char *path) | |
4209 | { | |
4210 | return apply_save_autostash(path, 1); | |
4211 | } | |
4212 | ||
804fe315 DL |
4213 | int apply_autostash_oid(const char *stash_oid) |
4214 | { | |
4215 | return apply_save_autostash_oid(stash_oid, 1); | |
4216 | } | |
4217 | ||
fc4a6735 PW |
4218 | static int run_git_checkout(struct repository *r, struct replay_opts *opts, |
4219 | const char *commit, const char *action) | |
2c58483a AG |
4220 | { |
4221 | struct child_process cmd = CHILD_PROCESS_INIT; | |
fc4a6735 | 4222 | int ret; |
2c58483a AG |
4223 | |
4224 | cmd.git_cmd = 1; | |
4225 | ||
bc3ae46b EN |
4226 | if (startup_info->original_cwd) |
4227 | cmd.dir = startup_info->original_cwd; | |
c972bf4c JK |
4228 | strvec_push(&cmd.args, "checkout"); |
4229 | strvec_push(&cmd.args, commit); | |
4230 | strvec_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action); | |
2c58483a AG |
4231 | |
4232 | if (opts->verbose) | |
fc4a6735 | 4233 | ret = run_command(&cmd); |
2c58483a | 4234 | else |
fc4a6735 PW |
4235 | ret = run_command_silent_on_success(&cmd); |
4236 | ||
4237 | if (!ret) | |
4238 | discard_index(r->index); | |
4239 | ||
4240 | return ret; | |
2c58483a AG |
4241 | } |
4242 | ||
fc4a6735 | 4243 | static int checkout_onto(struct repository *r, struct replay_opts *opts, |
7d3488eb | 4244 | const char *onto_name, const struct object_id *onto, |
f3e27a02 | 4245 | const struct object_id *orig_head) |
4df66c40 | 4246 | { |
4df66c40 AG |
4247 | const char *action = reflog_message(opts, "start", "checkout %s", onto_name); |
4248 | ||
7d3488eb | 4249 | if (run_git_checkout(r, opts, oid_to_hex(onto), action)) { |
be1bb600 | 4250 | apply_autostash(rebase_path_autostash()); |
4df66c40 AG |
4251 | sequencer_remove_state(opts); |
4252 | return error(_("could not detach HEAD")); | |
4253 | } | |
4254 | ||
f3e27a02 | 4255 | return update_ref(NULL, "ORIG_HEAD", orig_head, NULL, 0, UPDATE_REFS_MSG_ON_ERR); |
4df66c40 AG |
4256 | } |
4257 | ||
005af339 | 4258 | static int stopped_at_head(struct repository *r) |
71f82465 JS |
4259 | { |
4260 | struct object_id head; | |
4261 | struct commit *commit; | |
4262 | struct commit_message message; | |
4263 | ||
789b1f70 | 4264 | if (get_oid("HEAD", &head) || |
005af339 | 4265 | !(commit = lookup_commit(r, &head)) || |
71f82465 JS |
4266 | parse_commit(commit) || get_message(commit, &message)) |
4267 | fprintf(stderr, _("Stopped at HEAD\n")); | |
4268 | else { | |
4269 | fprintf(stderr, _("Stopped at %s\n"), message.label); | |
4270 | free_message(commit, &message); | |
4271 | } | |
4272 | return 0; | |
4273 | ||
4274 | } | |
4275 | ||
dfa8bae5 PW |
4276 | static int reread_todo_if_changed(struct repository *r, |
4277 | struct todo_list *todo_list, | |
4278 | struct replay_opts *opts) | |
4279 | { | |
2b88fe06 PW |
4280 | int offset; |
4281 | struct strbuf buf = STRBUF_INIT; | |
dfa8bae5 | 4282 | |
2b88fe06 PW |
4283 | if (strbuf_read_file_or_whine(&buf, get_todo_path(opts)) < 0) |
4284 | return -1; | |
4285 | offset = get_item_line_offset(todo_list, todo_list->current + 1); | |
4286 | if (buf.len != todo_list->buf.len - offset || | |
4287 | memcmp(buf.buf, todo_list->buf.buf + offset, buf.len)) { | |
dfa8bae5 PW |
4288 | /* Reread the todo file if it has changed. */ |
4289 | todo_list_release(todo_list); | |
4290 | if (read_populate_todo(r, todo_list, opts)) | |
4291 | return -1; /* message was printed */ | |
4292 | /* `current` will be incremented on return */ | |
4293 | todo_list->current = -1; | |
4294 | } | |
2b88fe06 | 4295 | strbuf_release(&buf); |
dfa8bae5 PW |
4296 | |
4297 | return 0; | |
4298 | } | |
4299 | ||
cb5206ea JS |
4300 | static const char rescheduled_advice[] = |
4301 | N_("Could not execute the todo command\n" | |
4302 | "\n" | |
4303 | " %.*s" | |
4304 | "\n" | |
4305 | "It has been rescheduled; To edit the command before continuing, please\n" | |
4306 | "edit the todo list first:\n" | |
4307 | "\n" | |
4308 | " git rebase --edit-todo\n" | |
4309 | " git rebase --continue\n"); | |
4310 | ||
f11c9580 NTND |
4311 | static int pick_commits(struct repository *r, |
4312 | struct todo_list *todo_list, | |
4313 | struct replay_opts *opts) | |
043a4492 | 4314 | { |
9055e401 | 4315 | int res = 0, reschedule = 0; |
1f6965f9 | 4316 | char *prev_reflog_action; |
043a4492 | 4317 | |
1f6965f9 | 4318 | /* Note that 0 for 3rd parameter of setenv means set only if not set */ |
043a4492 | 4319 | setenv(GIT_REFLOG_ACTION, action_name(opts), 0); |
1f6965f9 | 4320 | prev_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION)); |
043a4492 RR |
4321 | if (opts->allow_ff) |
4322 | assert(!(opts->signoff || opts->no_commit || | |
39edfd5c | 4323 | opts->record_origin || should_edit(opts) || |
a3894aad PW |
4324 | opts->committer_date_is_author_date || |
4325 | opts->ignore_date)); | |
f11c9580 | 4326 | if (read_and_refresh_cache(r, opts)) |
0d9c6dc9 | 4327 | return -1; |
043a4492 | 4328 | |
004fefa7 JS |
4329 | while (todo_list->current < todo_list->nr) { |
4330 | struct todo_item *item = todo_list->items + todo_list->current; | |
6ad656db | 4331 | const char *arg = todo_item_get_arg(todo_list, item); |
a47ba3c7 | 4332 | int check_todo = 0; |
6ad656db | 4333 | |
004fefa7 | 4334 | if (save_todo(todo_list, opts)) |
221675de | 4335 | return -1; |
6e98de72 | 4336 | if (is_rebase_i(opts)) { |
ef80069a JS |
4337 | if (item->command != TODO_COMMENT) { |
4338 | FILE *f = fopen(rebase_path_msgnum(), "w"); | |
4339 | ||
4340 | todo_list->done_nr++; | |
4341 | ||
4342 | if (f) { | |
4343 | fprintf(f, "%d\n", todo_list->done_nr); | |
4344 | fclose(f); | |
4345 | } | |
899b49c4 | 4346 | if (!opts->quiet) |
4d55d63b | 4347 | fprintf(stderr, _("Rebasing (%d/%d)%s"), |
899b49c4 EN |
4348 | todo_list->done_nr, |
4349 | todo_list->total_nr, | |
4350 | opts->verbose ? "\n" : "\r"); | |
ef80069a | 4351 | } |
6e98de72 JS |
4352 | unlink(rebase_path_message()); |
4353 | unlink(rebase_path_author_script()); | |
4354 | unlink(rebase_path_stopped_sha()); | |
4355 | unlink(rebase_path_amend()); | |
34e7771b | 4356 | unlink(git_path_merge_head(r)); |
5291828d | 4357 | unlink(git_path_auto_merge(r)); |
fbd7a232 | 4358 | delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); |
71f82465 | 4359 | |
d7d90885 SG |
4360 | if (item->command == TODO_BREAK) { |
4361 | if (!opts->verbose) | |
4362 | term_clear_line(); | |
005af339 | 4363 | return stopped_at_head(r); |
d7d90885 | 4364 | } |
6e98de72 JS |
4365 | } |
4366 | if (item->command <= TODO_SQUASH) { | |
8ab37ef2 | 4367 | if (is_rebase_i(opts)) |
1f6965f9 | 4368 | setenv(GIT_REFLOG_ACTION, reflog_message(opts, |
8ab37ef2 JS |
4369 | command_to_string(item->command), NULL), |
4370 | 1); | |
ae70e34f CM |
4371 | res = do_pick_commit(r, item, opts, |
4372 | is_final_fixup(todo_list), | |
a47ba3c7 | 4373 | &check_todo); |
1f6965f9 EN |
4374 | if (is_rebase_i(opts)) |
4375 | setenv(GIT_REFLOG_ACTION, prev_reflog_action, 1); | |
9d7bf3cf JS |
4376 | if (is_rebase_i(opts) && res < 0) { |
4377 | /* Reschedule */ | |
cb5206ea JS |
4378 | advise(_(rescheduled_advice), |
4379 | get_item_line_length(todo_list, | |
4380 | todo_list->current), | |
4381 | get_item_line(todo_list, | |
4382 | todo_list->current)); | |
9d7bf3cf JS |
4383 | todo_list->current--; |
4384 | if (save_todo(todo_list, opts)) | |
4385 | return -1; | |
4386 | } | |
56dc3ab0 JS |
4387 | if (item->command == TODO_EDIT) { |
4388 | struct commit *commit = item->commit; | |
d7d90885 SG |
4389 | if (!res) { |
4390 | if (!opts->verbose) | |
4391 | term_clear_line(); | |
99429213 | 4392 | fprintf(stderr, |
a42e1b41 | 4393 | _("Stopped at %s... %.*s\n"), |
56dc3ab0 | 4394 | short_commit_name(commit), |
6ad656db | 4395 | item->arg_len, arg); |
d7d90885 | 4396 | } |
f11c9580 | 4397 | return error_with_patch(r, commit, |
6ad656db | 4398 | arg, item->arg_len, opts, res, !res); |
56dc3ab0 | 4399 | } |
25cb8df9 JS |
4400 | if (is_rebase_i(opts) && !res) |
4401 | record_in_rewritten(&item->commit->object.oid, | |
4402 | peek_command(todo_list, 1)); | |
6e98de72 JS |
4403 | if (res && is_fixup(item->command)) { |
4404 | if (res == 1) | |
4405 | intend_to_amend(); | |
f11c9580 | 4406 | return error_failed_squash(r, item->commit, opts, |
6ad656db | 4407 | item->arg_len, arg); |
a9279c67 PW |
4408 | } else if (res && is_rebase_i(opts) && item->commit) { |
4409 | int to_amend = 0; | |
4410 | struct object_id oid; | |
4411 | ||
4412 | /* | |
4413 | * If we are rewording and have either | |
4414 | * fast-forwarded already, or are about to | |
4415 | * create a new root commit, we want to amend, | |
4416 | * otherwise we do not. | |
4417 | */ | |
4418 | if (item->command == TODO_REWORD && | |
4419 | !get_oid("HEAD", &oid) && | |
4a7e27e9 | 4420 | (oideq(&item->commit->object.oid, &oid) || |
a9279c67 | 4421 | (opts->have_squash_onto && |
4a7e27e9 | 4422 | oideq(&opts->squash_onto, &oid)))) |
a9279c67 PW |
4423 | to_amend = 1; |
4424 | ||
f11c9580 | 4425 | return res | error_with_patch(r, item->commit, |
6ad656db | 4426 | arg, item->arg_len, opts, |
a9279c67 PW |
4427 | res, to_amend); |
4428 | } | |
311af526 | 4429 | } else if (item->command == TODO_EXEC) { |
6ad656db | 4430 | char *end_of_arg = (char *)(arg + item->arg_len); |
311af526 JS |
4431 | int saved = *end_of_arg; |
4432 | ||
d7d90885 SG |
4433 | if (!opts->verbose) |
4434 | term_clear_line(); | |
311af526 | 4435 | *end_of_arg = '\0'; |
6ad656db | 4436 | res = do_exec(r, arg); |
311af526 | 4437 | *end_of_arg = saved; |
54fd3243 | 4438 | |
d421afa0 JS |
4439 | if (res) { |
4440 | if (opts->reschedule_failed_exec) | |
4441 | reschedule = 1; | |
54fd3243 | 4442 | } |
a47ba3c7 | 4443 | check_todo = 1; |
9055e401 | 4444 | } else if (item->command == TODO_LABEL) { |
6ad656db | 4445 | if ((res = do_label(r, arg, item->arg_len))) |
9055e401 JS |
4446 | reschedule = 1; |
4447 | } else if (item->command == TODO_RESET) { | |
6ad656db | 4448 | if ((res = do_reset(r, arg, item->arg_len, opts))) |
9055e401 | 4449 | reschedule = 1; |
4c68e7dd | 4450 | } else if (item->command == TODO_MERGE) { |
2be6b6f4 PW |
4451 | if ((res = do_merge(r, item->commit, arg, item->arg_len, |
4452 | item->flags, &check_todo, opts)) < 0) | |
4c68e7dd | 4453 | reschedule = 1; |
537e7d61 JS |
4454 | else if (item->commit) |
4455 | record_in_rewritten(&item->commit->object.oid, | |
4456 | peek_command(todo_list, 1)); | |
4457 | if (res > 0) | |
4c68e7dd | 4458 | /* failed with merge conflicts */ |
f11c9580 | 4459 | return error_with_patch(r, item->commit, |
6ad656db AG |
4460 | arg, item->arg_len, |
4461 | opts, res, 0); | |
56dc3ab0 | 4462 | } else if (!is_noop(item->command)) |
25c43667 JS |
4463 | return error(_("unknown command %d"), item->command); |
4464 | ||
9055e401 JS |
4465 | if (reschedule) { |
4466 | advise(_(rescheduled_advice), | |
4467 | get_item_line_length(todo_list, | |
4468 | todo_list->current), | |
4469 | get_item_line(todo_list, todo_list->current)); | |
4470 | todo_list->current--; | |
4471 | if (save_todo(todo_list, opts)) | |
4472 | return -1; | |
4c68e7dd | 4473 | if (item->commit) |
f11c9580 NTND |
4474 | return error_with_patch(r, |
4475 | item->commit, | |
6ad656db AG |
4476 | arg, item->arg_len, |
4477 | opts, res, 0); | |
dfa8bae5 PW |
4478 | } else if (is_rebase_i(opts) && check_todo && !res && |
4479 | reread_todo_if_changed(r, todo_list, opts)) { | |
4480 | return -1; | |
9055e401 JS |
4481 | } |
4482 | ||
004fefa7 | 4483 | todo_list->current++; |
043a4492 RR |
4484 | if (res) |
4485 | return res; | |
4486 | } | |
4487 | ||
56dc3ab0 | 4488 | if (is_rebase_i(opts)) { |
4b83ce9f | 4489 | struct strbuf head_ref = STRBUF_INIT, buf = STRBUF_INIT; |
25cb8df9 | 4490 | struct stat st; |
556907f1 | 4491 | |
56dc3ab0 JS |
4492 | /* Stopped in the middle, as planned? */ |
4493 | if (todo_list->current < todo_list->nr) | |
4494 | return 0; | |
556907f1 | 4495 | |
4b83ce9f JS |
4496 | if (read_oneliner(&head_ref, rebase_path_head_name(), 0) && |
4497 | starts_with(head_ref.buf, "refs/")) { | |
96e832a5 | 4498 | const char *msg; |
092bbcdf | 4499 | struct object_id head, orig; |
4b83ce9f JS |
4500 | int res; |
4501 | ||
092bbcdf | 4502 | if (get_oid("HEAD", &head)) { |
4b83ce9f JS |
4503 | res = error(_("cannot read HEAD")); |
4504 | cleanup_head_ref: | |
4505 | strbuf_release(&head_ref); | |
4506 | strbuf_release(&buf); | |
4507 | return res; | |
4508 | } | |
4509 | if (!read_oneliner(&buf, rebase_path_orig_head(), 0) || | |
092bbcdf | 4510 | get_oid_hex(buf.buf, &orig)) { |
4b83ce9f JS |
4511 | res = error(_("could not read orig-head")); |
4512 | goto cleanup_head_ref; | |
4513 | } | |
4ab867b8 | 4514 | strbuf_reset(&buf); |
4b83ce9f JS |
4515 | if (!read_oneliner(&buf, rebase_path_onto(), 0)) { |
4516 | res = error(_("could not read 'onto'")); | |
4517 | goto cleanup_head_ref; | |
4518 | } | |
96e832a5 JS |
4519 | msg = reflog_message(opts, "finish", "%s onto %s", |
4520 | head_ref.buf, buf.buf); | |
ae077771 | 4521 | if (update_ref(msg, head_ref.buf, &head, &orig, |
91774afc | 4522 | REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) { |
4b83ce9f JS |
4523 | res = error(_("could not update %s"), |
4524 | head_ref.buf); | |
4525 | goto cleanup_head_ref; | |
4526 | } | |
96e832a5 | 4527 | msg = reflog_message(opts, "finish", "returning to %s", |
4b83ce9f | 4528 | head_ref.buf); |
96e832a5 | 4529 | if (create_symref("HEAD", head_ref.buf, msg)) { |
4b83ce9f JS |
4530 | res = error(_("could not update HEAD to %s"), |
4531 | head_ref.buf); | |
4532 | goto cleanup_head_ref; | |
4533 | } | |
4534 | strbuf_reset(&buf); | |
4535 | } | |
4536 | ||
556907f1 JS |
4537 | if (opts->verbose) { |
4538 | struct rev_info log_tree_opt; | |
4539 | struct object_id orig, head; | |
4540 | ||
4541 | memset(&log_tree_opt, 0, sizeof(log_tree_opt)); | |
f11c9580 | 4542 | repo_init_revisions(r, &log_tree_opt, NULL); |
556907f1 JS |
4543 | log_tree_opt.diff = 1; |
4544 | log_tree_opt.diffopt.output_format = | |
4545 | DIFF_FORMAT_DIFFSTAT; | |
4546 | log_tree_opt.disable_stdin = 1; | |
4547 | ||
4548 | if (read_oneliner(&buf, rebase_path_orig_head(), 0) && | |
e82caf38 | 4549 | !get_oid(buf.buf, &orig) && |
4550 | !get_oid("HEAD", &head)) { | |
66f414f8 BW |
4551 | diff_tree_oid(&orig, &head, "", |
4552 | &log_tree_opt.diffopt); | |
556907f1 JS |
4553 | log_tree_diff_flush(&log_tree_opt); |
4554 | } | |
4555 | } | |
25cb8df9 JS |
4556 | flush_rewritten_pending(); |
4557 | if (!stat(rebase_path_rewritten_list(), &st) && | |
4558 | st.st_size > 0) { | |
4559 | struct child_process child = CHILD_PROCESS_INIT; | |
79516045 JS |
4560 | const char *post_rewrite_hook = |
4561 | find_hook("post-rewrite"); | |
25cb8df9 JS |
4562 | |
4563 | child.in = open(rebase_path_rewritten_list(), O_RDONLY); | |
4564 | child.git_cmd = 1; | |
c972bf4c JK |
4565 | strvec_push(&child.args, "notes"); |
4566 | strvec_push(&child.args, "copy"); | |
4567 | strvec_push(&child.args, "--for-rewrite=rebase"); | |
25cb8df9 JS |
4568 | /* we don't care if this copying failed */ |
4569 | run_command(&child); | |
79516045 JS |
4570 | |
4571 | if (post_rewrite_hook) { | |
4572 | struct child_process hook = CHILD_PROCESS_INIT; | |
4573 | ||
4574 | hook.in = open(rebase_path_rewritten_list(), | |
4575 | O_RDONLY); | |
4576 | hook.stdout_to_stderr = 1; | |
6206286e | 4577 | hook.trace2_hook_name = "post-rewrite"; |
c972bf4c JK |
4578 | strvec_push(&hook.args, post_rewrite_hook); |
4579 | strvec_push(&hook.args, "rebase"); | |
79516045 JS |
4580 | /* we don't care if this hook failed */ |
4581 | run_command(&hook); | |
4582 | } | |
25cb8df9 | 4583 | } |
be1bb600 | 4584 | apply_autostash(rebase_path_autostash()); |
25cb8df9 | 4585 | |
d7d90885 SG |
4586 | if (!opts->quiet) { |
4587 | if (!opts->verbose) | |
4588 | term_clear_line(); | |
899b49c4 | 4589 | fprintf(stderr, |
4d55d63b | 4590 | _("Successfully rebased and updated %s.\n"), |
899b49c4 | 4591 | head_ref.buf); |
d7d90885 | 4592 | } |
5da4966f | 4593 | |
556907f1 | 4594 | strbuf_release(&buf); |
4b83ce9f | 4595 | strbuf_release(&head_ref); |
56dc3ab0 JS |
4596 | } |
4597 | ||
043a4492 RR |
4598 | /* |
4599 | * Sequence of picks finished successfully; cleanup by | |
4600 | * removing the .git/sequencer directory | |
4601 | */ | |
2863584f | 4602 | return sequencer_remove_state(opts); |
043a4492 RR |
4603 | } |
4604 | ||
39edfd5c | 4605 | static int continue_single_pick(struct repository *r, struct replay_opts *opts) |
043a4492 | 4606 | { |
39edfd5c EN |
4607 | struct strvec argv = STRVEC_INIT; |
4608 | int ret; | |
043a4492 | 4609 | |
c8e4159e | 4610 | if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && |
b8825ef2 | 4611 | !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) |
043a4492 | 4612 | return error(_("no cherry-pick or revert in progress")); |
39edfd5c EN |
4613 | |
4614 | strvec_push(&argv, "commit"); | |
4615 | ||
4616 | /* | |
4617 | * continue_single_pick() handles the case of recovering from a | |
4618 | * conflict. should_edit() doesn't handle that case; for a conflict, | |
4619 | * we want to edit if the user asked for it, or if they didn't specify | |
4620 | * and stdin is a tty. | |
4621 | */ | |
4622 | if (!opts->edit || (opts->edit < 0 && !isatty(0))) | |
4623 | /* | |
4624 | * Include --cleanup=strip as well because we don't want the | |
4625 | * "# Conflicts:" messages. | |
4626 | */ | |
4627 | strvec_pushl(&argv, "--no-edit", "--cleanup=strip", NULL); | |
4628 | ||
4629 | ret = run_command_v_opt(argv.v, RUN_GIT_CMD); | |
4630 | strvec_clear(&argv); | |
4631 | return ret; | |
043a4492 RR |
4632 | } |
4633 | ||
f11c9580 NTND |
4634 | static int commit_staged_changes(struct repository *r, |
4635 | struct replay_opts *opts, | |
15ef6931 | 4636 | struct todo_list *todo_list) |
9d93ccd1 | 4637 | { |
789b3eff | 4638 | unsigned int flags = ALLOW_EMPTY | EDIT_MSG; |
15ef6931 | 4639 | unsigned int final_fixup = 0, is_clean; |
9d93ccd1 | 4640 | |
f11c9580 | 4641 | if (has_unstaged_changes(r, 1)) |
9d93ccd1 | 4642 | return error(_("cannot rebase: You have unstaged changes.")); |
52632209 | 4643 | |
f11c9580 | 4644 | is_clean = !has_uncommitted_changes(r, 0); |
9d93ccd1 JS |
4645 | |
4646 | if (file_exists(rebase_path_amend())) { | |
4647 | struct strbuf rev = STRBUF_INIT; | |
092bbcdf | 4648 | struct object_id head, to_amend; |
9d93ccd1 | 4649 | |
092bbcdf | 4650 | if (get_oid("HEAD", &head)) |
9d93ccd1 JS |
4651 | return error(_("cannot amend non-existing commit")); |
4652 | if (!read_oneliner(&rev, rebase_path_amend(), 0)) | |
4653 | return error(_("invalid file: '%s'"), rebase_path_amend()); | |
092bbcdf | 4654 | if (get_oid_hex(rev.buf, &to_amend)) |
9d93ccd1 JS |
4655 | return error(_("invalid contents: '%s'"), |
4656 | rebase_path_amend()); | |
9001dc2a | 4657 | if (!is_clean && !oideq(&head, &to_amend)) |
9d93ccd1 JS |
4658 | return error(_("\nYou have uncommitted changes in your " |
4659 | "working tree. Please, commit them\n" | |
4660 | "first and then run 'git rebase " | |
4661 | "--continue' again.")); | |
15ef6931 JS |
4662 | /* |
4663 | * When skipping a failed fixup/squash, we need to edit the | |
4664 | * commit message, the current fixup list and count, and if it | |
4665 | * was the last fixup/squash in the chain, we need to clean up | |
4666 | * the commit message and if there was a squash, let the user | |
4667 | * edit it. | |
4668 | */ | |
10d2f354 JS |
4669 | if (!is_clean || !opts->current_fixup_count) |
4670 | ; /* this is not the final fixup */ | |
87ae8a1a | 4671 | else if (!oideq(&head, &to_amend) || |
10d2f354 JS |
4672 | !file_exists(rebase_path_stopped_sha())) { |
4673 | /* was a final fixup or squash done manually? */ | |
4674 | if (!is_fixup(peek_command(todo_list, 0))) { | |
4675 | unlink(rebase_path_fixup_msg()); | |
4676 | unlink(rebase_path_squash_msg()); | |
4677 | unlink(rebase_path_current_fixups()); | |
4678 | strbuf_reset(&opts->current_fixups); | |
4679 | opts->current_fixup_count = 0; | |
4680 | } | |
4681 | } else { | |
4682 | /* we are in a fixup/squash chain */ | |
15ef6931 JS |
4683 | const char *p = opts->current_fixups.buf; |
4684 | int len = opts->current_fixups.len; | |
4685 | ||
4686 | opts->current_fixup_count--; | |
4687 | if (!len) | |
4688 | BUG("Incorrect current_fixups:\n%s", p); | |
4689 | while (len && p[len - 1] != '\n') | |
4690 | len--; | |
4691 | strbuf_setlen(&opts->current_fixups, len); | |
4692 | if (write_message(p, len, rebase_path_current_fixups(), | |
4693 | 0) < 0) | |
4694 | return error(_("could not write file: '%s'"), | |
4695 | rebase_path_current_fixups()); | |
4696 | ||
4697 | /* | |
4698 | * If a fixup/squash in a fixup/squash chain failed, the | |
4699 | * commit message is already correct, no need to commit | |
4700 | * it again. | |
4701 | * | |
4702 | * Only if it is the final command in the fixup/squash | |
4703 | * chain, and only if the chain is longer than a single | |
4704 | * fixup/squash command (which was just skipped), do we | |
4705 | * actually need to re-commit with a cleaned up commit | |
4706 | * message. | |
4707 | */ | |
4708 | if (opts->current_fixup_count > 0 && | |
4709 | !is_fixup(peek_command(todo_list, 0))) { | |
4710 | final_fixup = 1; | |
4711 | /* | |
4712 | * If there was not a single "squash" in the | |
4713 | * chain, we only need to clean up the commit | |
4714 | * message, no need to bother the user with | |
4715 | * opening the commit message in the editor. | |
4716 | */ | |
4717 | if (!starts_with(p, "squash ") && | |
4718 | !strstr(p, "\nsquash ")) | |
4719 | flags = (flags & ~EDIT_MSG) | CLEANUP_MSG; | |
4720 | } else if (is_fixup(peek_command(todo_list, 0))) { | |
4721 | /* | |
4722 | * We need to update the squash message to skip | |
4723 | * the latest commit message. | |
4724 | */ | |
4725 | struct commit *commit; | |
4726 | const char *path = rebase_path_squash_msg(); | |
b3757442 | 4727 | const char *encoding = get_commit_output_encoding(); |
15ef6931 | 4728 | |
005af339 | 4729 | if (parse_head(r, &commit) || |
b3757442 | 4730 | !(p = logmsg_reencode(commit, NULL, encoding)) || |
15ef6931 JS |
4731 | write_message(p, strlen(p), path, 0)) { |
4732 | unuse_commit_buffer(commit, p); | |
4733 | return error(_("could not write file: " | |
4734 | "'%s'"), path); | |
4735 | } | |
4736 | unuse_commit_buffer(commit, p); | |
4737 | } | |
4738 | } | |
9d93ccd1 JS |
4739 | |
4740 | strbuf_release(&rev); | |
789b3eff | 4741 | flags |= AMEND_MSG; |
9d93ccd1 JS |
4742 | } |
4743 | ||
15ef6931 | 4744 | if (is_clean) { |
c8e4159e HWN |
4745 | if (refs_ref_exists(get_main_ref_store(r), |
4746 | "CHERRY_PICK_HEAD") && | |
4747 | refs_delete_ref(get_main_ref_store(r), "", | |
4748 | "CHERRY_PICK_HEAD", NULL, 0)) | |
15ef6931 | 4749 | return error(_("could not remove CHERRY_PICK_HEAD")); |
e5ee33e8 PW |
4750 | if (unlink(git_path_merge_msg(r)) && errno != ENOENT) |
4751 | return error_errno(_("could not remove '%s'"), | |
4752 | git_path_merge_msg(r)); | |
15ef6931 JS |
4753 | if (!final_fixup) |
4754 | return 0; | |
4755 | } | |
4756 | ||
20f4b044 | 4757 | if (run_git_commit(final_fixup ? NULL : rebase_path_message(), |
15ef6931 | 4758 | opts, flags)) |
9d93ccd1 JS |
4759 | return error(_("could not commit staged changes.")); |
4760 | unlink(rebase_path_amend()); | |
34e7771b | 4761 | unlink(git_path_merge_head(r)); |
5291828d | 4762 | unlink(git_path_auto_merge(r)); |
15ef6931 JS |
4763 | if (final_fixup) { |
4764 | unlink(rebase_path_fixup_msg()); | |
4765 | unlink(rebase_path_squash_msg()); | |
4766 | } | |
4767 | if (opts->current_fixup_count > 0) { | |
4768 | /* | |
4769 | * Whether final fixup or not, we just cleaned up the commit | |
4770 | * message... | |
4771 | */ | |
4772 | unlink(rebase_path_current_fixups()); | |
4773 | strbuf_reset(&opts->current_fixups); | |
4774 | opts->current_fixup_count = 0; | |
4775 | } | |
9d93ccd1 JS |
4776 | return 0; |
4777 | } | |
4778 | ||
f11c9580 | 4779 | int sequencer_continue(struct repository *r, struct replay_opts *opts) |
043a4492 | 4780 | { |
004fefa7 JS |
4781 | struct todo_list todo_list = TODO_LIST_INIT; |
4782 | int res; | |
043a4492 | 4783 | |
f11c9580 | 4784 | if (read_and_refresh_cache(r, opts)) |
2863584f JS |
4785 | return -1; |
4786 | ||
15ef6931 JS |
4787 | if (read_populate_opts(opts)) |
4788 | return -1; | |
9d93ccd1 | 4789 | if (is_rebase_i(opts)) { |
005af339 | 4790 | if ((res = read_populate_todo(r, &todo_list, opts))) |
15ef6931 | 4791 | goto release_todo_list; |
5a5445d8 AG |
4792 | |
4793 | if (file_exists(rebase_path_dropped())) { | |
4794 | if ((res = todo_list_check_against_backup(r, &todo_list))) | |
4795 | goto release_todo_list; | |
4796 | ||
4797 | unlink(rebase_path_dropped()); | |
4798 | } | |
4799 | ||
f6b9413b AG |
4800 | if (commit_staged_changes(r, opts, &todo_list)) { |
4801 | res = -1; | |
4802 | goto release_todo_list; | |
4803 | } | |
4258a6da | 4804 | } else if (!file_exists(get_todo_path(opts))) |
39edfd5c | 4805 | return continue_single_pick(r, opts); |
005af339 | 4806 | else if ((res = read_populate_todo(r, &todo_list, opts))) |
004fefa7 | 4807 | goto release_todo_list; |
043a4492 | 4808 | |
4258a6da JS |
4809 | if (!is_rebase_i(opts)) { |
4810 | /* Verify that the conflict has been resolved */ | |
c8e4159e HWN |
4811 | if (refs_ref_exists(get_main_ref_store(r), |
4812 | "CHERRY_PICK_HEAD") || | |
b8825ef2 | 4813 | refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { |
39edfd5c | 4814 | res = continue_single_pick(r, opts); |
4258a6da JS |
4815 | if (res) |
4816 | goto release_todo_list; | |
4817 | } | |
ffc00a48 | 4818 | if (index_differs_from(r, "HEAD", NULL, 0)) { |
e1ff0a32 | 4819 | res = error_dirty_index(r, opts); |
004fefa7 | 4820 | goto release_todo_list; |
4258a6da JS |
4821 | } |
4822 | todo_list.current++; | |
ca98c6d4 JS |
4823 | } else if (file_exists(rebase_path_stopped_sha())) { |
4824 | struct strbuf buf = STRBUF_INIT; | |
4825 | struct object_id oid; | |
4826 | ||
3442c3d1 DL |
4827 | if (read_oneliner(&buf, rebase_path_stopped_sha(), |
4828 | READ_ONELINER_SKIP_IF_EMPTY) && | |
0512eabd | 4829 | !get_oid_hex(buf.buf, &oid)) |
ca98c6d4 JS |
4830 | record_in_rewritten(&oid, peek_command(&todo_list, 0)); |
4831 | strbuf_release(&buf); | |
043a4492 | 4832 | } |
4258a6da | 4833 | |
f11c9580 | 4834 | res = pick_commits(r, &todo_list, opts); |
004fefa7 JS |
4835 | release_todo_list: |
4836 | todo_list_release(&todo_list); | |
4837 | return res; | |
043a4492 RR |
4838 | } |
4839 | ||
f11c9580 NTND |
4840 | static int single_pick(struct repository *r, |
4841 | struct commit *cmit, | |
4842 | struct replay_opts *opts) | |
043a4492 | 4843 | { |
a47ba3c7 | 4844 | int check_todo; |
ae70e34f CM |
4845 | struct todo_item item; |
4846 | ||
4847 | item.command = opts->action == REPLAY_PICK ? | |
4848 | TODO_PICK : TODO_REVERT; | |
4849 | item.commit = cmit; | |
a47ba3c7 | 4850 | |
043a4492 | 4851 | setenv(GIT_REFLOG_ACTION, action_name(opts), 0); |
ae70e34f | 4852 | return do_pick_commit(r, &item, opts, 0, &check_todo); |
043a4492 RR |
4853 | } |
4854 | ||
f11c9580 NTND |
4855 | int sequencer_pick_revisions(struct repository *r, |
4856 | struct replay_opts *opts) | |
043a4492 | 4857 | { |
004fefa7 | 4858 | struct todo_list todo_list = TODO_LIST_INIT; |
1e43ed98 | 4859 | struct object_id oid; |
004fefa7 | 4860 | int i, res; |
043a4492 | 4861 | |
2863584f | 4862 | assert(opts->revs); |
f11c9580 | 4863 | if (read_and_refresh_cache(r, opts)) |
0d9c6dc9 | 4864 | return -1; |
043a4492 | 4865 | |
21246dbb | 4866 | for (i = 0; i < opts->revs->pending.nr; i++) { |
1e43ed98 | 4867 | struct object_id oid; |
21246dbb MV |
4868 | const char *name = opts->revs->pending.objects[i].name; |
4869 | ||
4870 | /* This happens when using --stdin. */ | |
4871 | if (!strlen(name)) | |
4872 | continue; | |
4873 | ||
1e43ed98 | 4874 | if (!get_oid(name, &oid)) { |
f11c9580 NTND |
4875 | if (!lookup_commit_reference_gently(r, &oid, 1)) { |
4876 | enum object_type type = oid_object_info(r, | |
0df8e965 | 4877 | &oid, |
abef9020 | 4878 | NULL); |
b9b946d4 | 4879 | return error(_("%s: can't cherry-pick a %s"), |
debca9d2 | 4880 | name, type_name(type)); |
7c0b0d8d | 4881 | } |
21246dbb | 4882 | } else |
b9b946d4 | 4883 | return error(_("%s: bad revision"), name); |
21246dbb MV |
4884 | } |
4885 | ||
043a4492 RR |
4886 | /* |
4887 | * If we were called as "git cherry-pick <commit>", just | |
4888 | * cherry-pick/revert it, set CHERRY_PICK_HEAD / | |
4889 | * REVERT_HEAD, and don't touch the sequencer state. | |
4890 | * This means it is possible to cherry-pick in the middle | |
4891 | * of a cherry-pick sequence. | |
4892 | */ | |
4893 | if (opts->revs->cmdline.nr == 1 && | |
4894 | opts->revs->cmdline.rev->whence == REV_CMD_REV && | |
4895 | opts->revs->no_walk && | |
4896 | !opts->revs->cmdline.rev->flags) { | |
4897 | struct commit *cmit; | |
4898 | if (prepare_revision_walk(opts->revs)) | |
b9b946d4 | 4899 | return error(_("revision walk setup failed")); |
043a4492 | 4900 | cmit = get_revision(opts->revs); |
c5e358d0 JK |
4901 | if (!cmit) |
4902 | return error(_("empty commit set passed")); | |
4903 | if (get_revision(opts->revs)) | |
4904 | BUG("unexpected extra commit from walk"); | |
f11c9580 | 4905 | return single_pick(r, cmit, opts); |
043a4492 RR |
4906 | } |
4907 | ||
4908 | /* | |
4909 | * Start a new cherry-pick/ revert sequence; but | |
4910 | * first, make sure that an existing one isn't in | |
4911 | * progress | |
4912 | */ | |
4913 | ||
34b0528b | 4914 | if (walk_revs_populate_todo(&todo_list, opts) || |
6a1f9046 | 4915 | create_seq_dir(r) < 0) |
043a4492 | 4916 | return -1; |
1e43ed98 | 4917 | if (get_oid("HEAD", &oid) && (opts->action == REPLAY_REVERT)) |
93b3df6f | 4918 | return error(_("can't revert as initial commit")); |
1e43ed98 | 4919 | if (save_head(oid_to_hex(&oid))) |
311fd397 | 4920 | return -1; |
88d5a271 JS |
4921 | if (save_opts(opts)) |
4922 | return -1; | |
1e41229d | 4923 | update_abort_safety_file(); |
f11c9580 | 4924 | res = pick_commits(r, &todo_list, opts); |
004fefa7 JS |
4925 | todo_list_release(&todo_list); |
4926 | return res; | |
043a4492 | 4927 | } |
5ed75e2a | 4928 | |
66e83d9b | 4929 | void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag) |
5ed75e2a | 4930 | { |
bab4d109 | 4931 | unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP; |
5ed75e2a | 4932 | struct strbuf sob = STRBUF_INIT; |
bab4d109 | 4933 | int has_footer; |
5ed75e2a MV |
4934 | |
4935 | strbuf_addstr(&sob, sign_off_header); | |
39ab4d09 | 4936 | strbuf_addstr(&sob, fmt_name(WANT_COMMITTER_IDENT)); |
5ed75e2a | 4937 | strbuf_addch(&sob, '\n'); |
bab4d109 | 4938 | |
44dc738a JT |
4939 | if (!ignore_footer) |
4940 | strbuf_complete_line(msgbuf); | |
4941 | ||
bab4d109 BC |
4942 | /* |
4943 | * If the whole message buffer is equal to the sob, pretend that we | |
4944 | * found a conforming footer with a matching sob | |
4945 | */ | |
4946 | if (msgbuf->len - ignore_footer == sob.len && | |
4947 | !strncmp(msgbuf->buf, sob.buf, sob.len)) | |
4948 | has_footer = 3; | |
4949 | else | |
4950 | has_footer = has_conforming_footer(msgbuf, &sob, ignore_footer); | |
4951 | ||
33f2f9ab BC |
4952 | if (!has_footer) { |
4953 | const char *append_newlines = NULL; | |
4954 | size_t len = msgbuf->len - ignore_footer; | |
4955 | ||
8c613fd5 BC |
4956 | if (!len) { |
4957 | /* | |
4958 | * The buffer is completely empty. Leave foom for | |
4959 | * the title and body to be filled in by the user. | |
4960 | */ | |
33f2f9ab | 4961 | append_newlines = "\n\n"; |
8c613fd5 BC |
4962 | } else if (len == 1) { |
4963 | /* | |
4964 | * Buffer contains a single newline. Add another | |
4965 | * so that we leave room for the title and body. | |
4966 | */ | |
4967 | append_newlines = "\n"; | |
4968 | } else if (msgbuf->buf[len - 2] != '\n') { | |
4969 | /* | |
4970 | * Buffer ends with a single newline. Add another | |
4971 | * so that there is an empty line between the message | |
4972 | * body and the sob. | |
4973 | */ | |
33f2f9ab | 4974 | append_newlines = "\n"; |
8c613fd5 | 4975 | } /* else, the buffer already ends with two newlines. */ |
33f2f9ab BC |
4976 | |
4977 | if (append_newlines) | |
4978 | strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, | |
4979 | append_newlines, strlen(append_newlines)); | |
5ed75e2a | 4980 | } |
bab4d109 BC |
4981 | |
4982 | if (has_footer != 3 && (!no_dup_sob || has_footer != 2)) | |
4983 | strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, | |
4984 | sob.buf, sob.len); | |
4985 | ||
5ed75e2a MV |
4986 | strbuf_release(&sob); |
4987 | } | |
62db5247 | 4988 | |
1644c73c JS |
4989 | struct labels_entry { |
4990 | struct hashmap_entry entry; | |
4991 | char label[FLEX_ARRAY]; | |
4992 | }; | |
4993 | ||
939af16e EW |
4994 | static int labels_cmp(const void *fndata, const struct hashmap_entry *eptr, |
4995 | const struct hashmap_entry *entry_or_key, const void *key) | |
1644c73c | 4996 | { |
939af16e EW |
4997 | const struct labels_entry *a, *b; |
4998 | ||
4999 | a = container_of(eptr, const struct labels_entry, entry); | |
5000 | b = container_of(entry_or_key, const struct labels_entry, entry); | |
5001 | ||
1644c73c JS |
5002 | return key ? strcmp(a->label, key) : strcmp(a->label, b->label); |
5003 | } | |
5004 | ||
5005 | struct string_entry { | |
5006 | struct oidmap_entry entry; | |
5007 | char string[FLEX_ARRAY]; | |
5008 | }; | |
5009 | ||
5010 | struct label_state { | |
5011 | struct oidmap commit2label; | |
5012 | struct hashmap labels; | |
5013 | struct strbuf buf; | |
5014 | }; | |
5015 | ||
5016 | static const char *label_oid(struct object_id *oid, const char *label, | |
5017 | struct label_state *state) | |
5018 | { | |
5019 | struct labels_entry *labels_entry; | |
5020 | struct string_entry *string_entry; | |
5021 | struct object_id dummy; | |
1644c73c JS |
5022 | int i; |
5023 | ||
5024 | string_entry = oidmap_get(&state->commit2label, oid); | |
5025 | if (string_entry) | |
5026 | return string_entry->string; | |
5027 | ||
5028 | /* | |
5029 | * For "uninteresting" commits, i.e. commits that are not to be | |
5030 | * rebased, and which can therefore not be labeled, we use a unique | |
5031 | * abbreviation of the commit name. This is slightly more complicated | |
5032 | * than calling find_unique_abbrev() because we also need to make | |
5033 | * sure that the abbreviation does not conflict with any other | |
5034 | * label. | |
5035 | * | |
5036 | * We disallow "interesting" commits to be labeled by a string that | |
5037 | * is a valid full-length hash, to ensure that we always can find an | |
5038 | * abbreviation for any uninteresting commit's names that does not | |
5039 | * clash with any other label. | |
5040 | */ | |
867bc1d2 | 5041 | strbuf_reset(&state->buf); |
1644c73c JS |
5042 | if (!label) { |
5043 | char *p; | |
5044 | ||
4439c7a3 | 5045 | strbuf_grow(&state->buf, GIT_MAX_HEXSZ); |
1644c73c JS |
5046 | label = p = state->buf.buf; |
5047 | ||
5048 | find_unique_abbrev_r(p, oid, default_abbrev); | |
5049 | ||
5050 | /* | |
5051 | * We may need to extend the abbreviated hash so that there is | |
5052 | * no conflicting label. | |
5053 | */ | |
5054 | if (hashmap_get_from_hash(&state->labels, strihash(p), p)) { | |
5055 | size_t i = strlen(p) + 1; | |
5056 | ||
5057 | oid_to_hex_r(p, oid); | |
4439c7a3 | 5058 | for (; i < the_hash_algo->hexsz; i++) { |
1644c73c JS |
5059 | char save = p[i]; |
5060 | p[i] = '\0'; | |
5061 | if (!hashmap_get_from_hash(&state->labels, | |
5062 | strihash(p), p)) | |
5063 | break; | |
5064 | p[i] = save; | |
5065 | } | |
5066 | } | |
867bc1d2 | 5067 | } else { |
1644c73c JS |
5068 | struct strbuf *buf = &state->buf; |
5069 | ||
1644c73c | 5070 | /* |
cd552227 MR |
5071 | * Sanitize labels by replacing non-alpha-numeric characters |
5072 | * (including white-space ones) by dashes, as they might be | |
5073 | * illegal in file names (and hence in ref names). | |
5074 | * | |
5075 | * Note that we retain non-ASCII UTF-8 characters (identified | |
5076 | * via the most significant bit). They should be all acceptable | |
5077 | * in file names. We do not validate the UTF-8 here, that's not | |
5078 | * the job of this function. | |
1644c73c | 5079 | */ |
867bc1d2 | 5080 | for (; *label; label++) |
cd552227 MR |
5081 | if ((*label & 0x80) || isalnum(*label)) |
5082 | strbuf_addch(buf, *label); | |
5083 | /* avoid leading dash and double-dashes */ | |
5084 | else if (buf->len && buf->buf[buf->len - 1] != '-') | |
5085 | strbuf_addch(buf, '-'); | |
5086 | if (!buf->len) { | |
5087 | strbuf_addstr(buf, "rev-"); | |
5088 | strbuf_add_unique_abbrev(buf, oid, default_abbrev); | |
5089 | } | |
867bc1d2 | 5090 | label = buf->buf; |
1644c73c | 5091 | |
867bc1d2 JS |
5092 | if ((buf->len == the_hash_algo->hexsz && |
5093 | !get_oid_hex(label, &dummy)) || | |
5094 | (buf->len == 1 && *label == '#') || | |
5095 | hashmap_get_from_hash(&state->labels, | |
5096 | strihash(label), label)) { | |
5097 | /* | |
5098 | * If the label already exists, or if the label is a | |
5099 | * valid full OID, or the label is a '#' (which we use | |
5100 | * as a separator between merge heads and oneline), we | |
5101 | * append a dash and a number to make it unique. | |
5102 | */ | |
5103 | size_t len = buf->len; | |
1644c73c | 5104 | |
867bc1d2 JS |
5105 | for (i = 2; ; i++) { |
5106 | strbuf_setlen(buf, len); | |
5107 | strbuf_addf(buf, "-%d", i); | |
5108 | if (!hashmap_get_from_hash(&state->labels, | |
5109 | strihash(buf->buf), | |
5110 | buf->buf)) | |
5111 | break; | |
5112 | } | |
1644c73c | 5113 | |
867bc1d2 JS |
5114 | label = buf->buf; |
5115 | } | |
1644c73c JS |
5116 | } |
5117 | ||
5118 | FLEX_ALLOC_STR(labels_entry, label, label); | |
d22245a2 | 5119 | hashmap_entry_init(&labels_entry->entry, strihash(label)); |
b94e5c1d | 5120 | hashmap_add(&state->labels, &labels_entry->entry); |
1644c73c JS |
5121 | |
5122 | FLEX_ALLOC_STR(string_entry, string, label); | |
5123 | oidcpy(&string_entry->entry.oid, oid); | |
5124 | oidmap_put(&state->commit2label, string_entry); | |
5125 | ||
5126 | return string_entry->string; | |
5127 | } | |
5128 | ||
5129 | static int make_script_with_merges(struct pretty_print_context *pp, | |
d358fc28 | 5130 | struct rev_info *revs, struct strbuf *out, |
1644c73c JS |
5131 | unsigned flags) |
5132 | { | |
b9cbd295 | 5133 | int keep_empty = flags & TODO_LIST_KEEP_EMPTY; |
7543f6f4 | 5134 | int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS; |
e1fac531 | 5135 | int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO; |
767a4ca6 | 5136 | int skipped_commit = 0; |
1644c73c JS |
5137 | struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT; |
5138 | struct strbuf label = STRBUF_INIT; | |
5139 | struct commit_list *commits = NULL, **tail = &commits, *iter; | |
5140 | struct commit_list *tips = NULL, **tips_tail = &tips; | |
5141 | struct commit *commit; | |
5142 | struct oidmap commit2todo = OIDMAP_INIT; | |
5143 | struct string_entry *entry; | |
5144 | struct oidset interesting = OIDSET_INIT, child_seen = OIDSET_INIT, | |
5145 | shown = OIDSET_INIT; | |
5146 | struct label_state state = { OIDMAP_INIT, { NULL }, STRBUF_INIT }; | |
5147 | ||
5148 | int abbr = flags & TODO_LIST_ABBREVIATE_CMDS; | |
5149 | const char *cmd_pick = abbr ? "p" : "pick", | |
5150 | *cmd_label = abbr ? "l" : "label", | |
5151 | *cmd_reset = abbr ? "t" : "reset", | |
5152 | *cmd_merge = abbr ? "m" : "merge"; | |
5153 | ||
5154 | oidmap_init(&commit2todo, 0); | |
5155 | oidmap_init(&state.commit2label, 0); | |
939af16e | 5156 | hashmap_init(&state.labels, labels_cmp, NULL, 0); |
1644c73c JS |
5157 | strbuf_init(&state.buf, 32); |
5158 | ||
5159 | if (revs->cmdline.nr && (revs->cmdline.rev[0].flags & BOTTOM)) { | |
e02058a7 | 5160 | struct labels_entry *onto_label_entry; |
1644c73c JS |
5161 | struct object_id *oid = &revs->cmdline.rev[0].item->oid; |
5162 | FLEX_ALLOC_STR(entry, string, "onto"); | |
5163 | oidcpy(&entry->entry.oid, oid); | |
5164 | oidmap_put(&state.commit2label, entry); | |
e02058a7 ĐTCD |
5165 | |
5166 | FLEX_ALLOC_STR(onto_label_entry, label, "onto"); | |
5167 | hashmap_entry_init(&onto_label_entry->entry, strihash("onto")); | |
5168 | hashmap_add(&state.labels, &onto_label_entry->entry); | |
1644c73c JS |
5169 | } |
5170 | ||
5171 | /* | |
5172 | * First phase: | |
5173 | * - get onelines for all commits | |
5174 | * - gather all branch tips (i.e. 2nd or later parents of merges) | |
5175 | * - label all branch tips | |
5176 | */ | |
5177 | while ((commit = get_revision(revs))) { | |
5178 | struct commit_list *to_merge; | |
1644c73c JS |
5179 | const char *p1, *p2; |
5180 | struct object_id *oid; | |
5181 | int is_empty; | |
5182 | ||
5183 | tail = &commit_list_insert(commit, tail)->next; | |
5184 | oidset_insert(&interesting, &commit->object.oid); | |
5185 | ||
5186 | is_empty = is_original_commit_empty(commit); | |
767a4ca6 JS |
5187 | if (!is_empty && (commit->object.flags & PATCHSAME)) { |
5188 | if (flags & TODO_LIST_WARN_SKIPPED_CHERRY_PICKS) | |
5189 | warning(_("skipped previously applied commit %s"), | |
5190 | short_commit_name(commit)); | |
5191 | skipped_commit = 1; | |
1644c73c | 5192 | continue; |
767a4ca6 | 5193 | } |
b9cbd295 EN |
5194 | if (is_empty && !keep_empty) |
5195 | continue; | |
1644c73c JS |
5196 | |
5197 | strbuf_reset(&oneline); | |
5198 | pretty_print_commit(pp, commit, &oneline); | |
5199 | ||
5200 | to_merge = commit->parents ? commit->parents->next : NULL; | |
5201 | if (!to_merge) { | |
5202 | /* non-merge commit: easy case */ | |
5203 | strbuf_reset(&buf); | |
1644c73c JS |
5204 | strbuf_addf(&buf, "%s %s %s", cmd_pick, |
5205 | oid_to_hex(&commit->object.oid), | |
5206 | oneline.buf); | |
1b5735f7 EN |
5207 | if (is_empty) |
5208 | strbuf_addf(&buf, " %c empty", | |
5209 | comment_line_char); | |
1644c73c JS |
5210 | |
5211 | FLEX_ALLOC_STR(entry, string, buf.buf); | |
5212 | oidcpy(&entry->entry.oid, &commit->object.oid); | |
5213 | oidmap_put(&commit2todo, entry); | |
5214 | ||
5215 | continue; | |
5216 | } | |
5217 | ||
1644c73c JS |
5218 | /* Create a label */ |
5219 | strbuf_reset(&label); | |
5220 | if (skip_prefix(oneline.buf, "Merge ", &p1) && | |
5221 | (p1 = strchr(p1, '\'')) && | |
5222 | (p2 = strchr(++p1, '\''))) | |
5223 | strbuf_add(&label, p1, p2 - p1); | |
5224 | else if (skip_prefix(oneline.buf, "Merge pull request ", | |
5225 | &p1) && | |
5226 | (p1 = strstr(p1, " from "))) | |
5227 | strbuf_addstr(&label, p1 + strlen(" from ")); | |
5228 | else | |
5229 | strbuf_addbuf(&label, &oneline); | |
5230 | ||
1644c73c JS |
5231 | strbuf_reset(&buf); |
5232 | strbuf_addf(&buf, "%s -C %s", | |
5233 | cmd_merge, oid_to_hex(&commit->object.oid)); | |
5234 | ||
2b6ad0f4 JS |
5235 | /* label the tips of merged branches */ |
5236 | for (; to_merge; to_merge = to_merge->next) { | |
5237 | oid = &to_merge->item->object.oid; | |
5238 | strbuf_addch(&buf, ' '); | |
5239 | ||
5240 | if (!oidset_contains(&interesting, oid)) { | |
5241 | strbuf_addstr(&buf, label_oid(oid, NULL, | |
5242 | &state)); | |
5243 | continue; | |
5244 | } | |
1644c73c | 5245 | |
1644c73c JS |
5246 | tips_tail = &commit_list_insert(to_merge->item, |
5247 | tips_tail)->next; | |
5248 | ||
5249 | strbuf_addstr(&buf, label_oid(oid, label.buf, &state)); | |
5250 | } | |
5251 | strbuf_addf(&buf, " # %s", oneline.buf); | |
5252 | ||
5253 | FLEX_ALLOC_STR(entry, string, buf.buf); | |
5254 | oidcpy(&entry->entry.oid, &commit->object.oid); | |
5255 | oidmap_put(&commit2todo, entry); | |
5256 | } | |
767a4ca6 JS |
5257 | if (skipped_commit) |
5258 | advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS, | |
5259 | _("use --reapply-cherry-picks to include skipped commits")); | |
1644c73c JS |
5260 | |
5261 | /* | |
5262 | * Second phase: | |
5263 | * - label branch points | |
5264 | * - add HEAD to the branch tips | |
5265 | */ | |
5266 | for (iter = commits; iter; iter = iter->next) { | |
5267 | struct commit_list *parent = iter->item->parents; | |
5268 | for (; parent; parent = parent->next) { | |
5269 | struct object_id *oid = &parent->item->object.oid; | |
5270 | if (!oidset_contains(&interesting, oid)) | |
5271 | continue; | |
6e8fc70f | 5272 | if (oidset_insert(&child_seen, oid)) |
1644c73c JS |
5273 | label_oid(oid, "branch-point", &state); |
5274 | } | |
5275 | ||
15beaaa3 | 5276 | /* Add HEAD as implicit "tip of branch" */ |
1644c73c JS |
5277 | if (!iter->next) |
5278 | tips_tail = &commit_list_insert(iter->item, | |
5279 | tips_tail)->next; | |
5280 | } | |
5281 | ||
5282 | /* | |
5283 | * Third phase: output the todo list. This is a bit tricky, as we | |
5284 | * want to avoid jumping back and forth between revisions. To | |
5285 | * accomplish that goal, we walk backwards from the branch tips, | |
5286 | * gathering commits not yet shown, reversing the list on the fly, | |
5287 | * then outputting that list (labeling revisions as needed). | |
5288 | */ | |
d358fc28 | 5289 | strbuf_addf(out, "%s onto\n", cmd_label); |
1644c73c JS |
5290 | for (iter = tips; iter; iter = iter->next) { |
5291 | struct commit_list *list = NULL, *iter2; | |
5292 | ||
5293 | commit = iter->item; | |
5294 | if (oidset_contains(&shown, &commit->object.oid)) | |
5295 | continue; | |
5296 | entry = oidmap_get(&state.commit2label, &commit->object.oid); | |
5297 | ||
5298 | if (entry) | |
d358fc28 | 5299 | strbuf_addf(out, "\n%c Branch %s\n", comment_line_char, entry->string); |
1644c73c | 5300 | else |
d358fc28 | 5301 | strbuf_addch(out, '\n'); |
1644c73c JS |
5302 | |
5303 | while (oidset_contains(&interesting, &commit->object.oid) && | |
5304 | !oidset_contains(&shown, &commit->object.oid)) { | |
5305 | commit_list_insert(commit, &list); | |
5306 | if (!commit->parents) { | |
5307 | commit = NULL; | |
5308 | break; | |
5309 | } | |
5310 | commit = commit->parents->item; | |
5311 | } | |
5312 | ||
5313 | if (!commit) | |
d358fc28 | 5314 | strbuf_addf(out, "%s %s\n", cmd_reset, |
e1fac531 JS |
5315 | rebase_cousins || root_with_onto ? |
5316 | "onto" : "[new root]"); | |
1644c73c JS |
5317 | else { |
5318 | const char *to = NULL; | |
5319 | ||
5320 | entry = oidmap_get(&state.commit2label, | |
5321 | &commit->object.oid); | |
5322 | if (entry) | |
5323 | to = entry->string; | |
7543f6f4 JS |
5324 | else if (!rebase_cousins) |
5325 | to = label_oid(&commit->object.oid, NULL, | |
5326 | &state); | |
1644c73c JS |
5327 | |
5328 | if (!to || !strcmp(to, "onto")) | |
d358fc28 | 5329 | strbuf_addf(out, "%s onto\n", cmd_reset); |
1644c73c JS |
5330 | else { |
5331 | strbuf_reset(&oneline); | |
5332 | pretty_print_commit(pp, commit, &oneline); | |
d358fc28 AG |
5333 | strbuf_addf(out, "%s %s # %s\n", |
5334 | cmd_reset, to, oneline.buf); | |
1644c73c JS |
5335 | } |
5336 | } | |
5337 | ||
5338 | for (iter2 = list; iter2; iter2 = iter2->next) { | |
5339 | struct object_id *oid = &iter2->item->object.oid; | |
5340 | entry = oidmap_get(&commit2todo, oid); | |
5341 | /* only show if not already upstream */ | |
5342 | if (entry) | |
d358fc28 | 5343 | strbuf_addf(out, "%s\n", entry->string); |
1644c73c JS |
5344 | entry = oidmap_get(&state.commit2label, oid); |
5345 | if (entry) | |
d358fc28 AG |
5346 | strbuf_addf(out, "%s %s\n", |
5347 | cmd_label, entry->string); | |
1644c73c JS |
5348 | oidset_insert(&shown, oid); |
5349 | } | |
5350 | ||
5351 | free_commit_list(list); | |
5352 | } | |
5353 | ||
5354 | free_commit_list(commits); | |
5355 | free_commit_list(tips); | |
5356 | ||
5357 | strbuf_release(&label); | |
5358 | strbuf_release(&oneline); | |
5359 | strbuf_release(&buf); | |
5360 | ||
5361 | oidmap_free(&commit2todo, 1); | |
5362 | oidmap_free(&state.commit2label, 1); | |
6da1a258 | 5363 | hashmap_clear_and_free(&state.labels, struct labels_entry, entry); |
1644c73c JS |
5364 | strbuf_release(&state.buf); |
5365 | ||
5366 | return 0; | |
5367 | } | |
5368 | ||
d358fc28 AG |
5369 | int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, |
5370 | const char **argv, unsigned flags) | |
62db5247 JS |
5371 | { |
5372 | char *format = NULL; | |
5373 | struct pretty_print_context pp = {0}; | |
62db5247 JS |
5374 | struct rev_info revs; |
5375 | struct commit *commit; | |
b9cbd295 | 5376 | int keep_empty = flags & TODO_LIST_KEEP_EMPTY; |
d8ae6c84 | 5377 | const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick"; |
1644c73c | 5378 | int rebase_merges = flags & TODO_LIST_REBASE_MERGES; |
0fcb4f6b | 5379 | int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS; |
767a4ca6 | 5380 | int skipped_commit = 0; |
62db5247 | 5381 | |
f11c9580 | 5382 | repo_init_revisions(r, &revs, NULL); |
62db5247 | 5383 | revs.verbose_header = 1; |
1644c73c JS |
5384 | if (!rebase_merges) |
5385 | revs.max_parents = 1; | |
0fcb4f6b | 5386 | revs.cherry_mark = !reapply_cherry_picks; |
62db5247 JS |
5387 | revs.limited = 1; |
5388 | revs.reverse = 1; | |
5389 | revs.right_only = 1; | |
5390 | revs.sort_order = REV_SORT_IN_GRAPH_ORDER; | |
5391 | revs.topo_order = 1; | |
5392 | ||
5393 | revs.pretty_given = 1; | |
5394 | git_config_get_string("rebase.instructionFormat", &format); | |
5395 | if (!format || !*format) { | |
5396 | free(format); | |
5397 | format = xstrdup("%s"); | |
5398 | } | |
5399 | get_commit_format(format, &revs); | |
5400 | free(format); | |
5401 | pp.fmt = revs.commit_format; | |
5402 | pp.output_encoding = get_log_output_encoding(); | |
5403 | ||
5404 | if (setup_revisions(argc, argv, &revs, NULL) > 1) | |
5405 | return error(_("make_script: unhandled options")); | |
5406 | ||
5407 | if (prepare_revision_walk(&revs) < 0) | |
5408 | return error(_("make_script: error preparing revisions")); | |
5409 | ||
1644c73c JS |
5410 | if (rebase_merges) |
5411 | return make_script_with_merges(&pp, &revs, out, flags); | |
5412 | ||
62db5247 | 5413 | while ((commit = get_revision(&revs))) { |
d48e5e21 | 5414 | int is_empty = is_original_commit_empty(commit); |
76ea2358 | 5415 | |
767a4ca6 JS |
5416 | if (!is_empty && (commit->object.flags & PATCHSAME)) { |
5417 | if (flags & TODO_LIST_WARN_SKIPPED_CHERRY_PICKS) | |
5418 | warning(_("skipped previously applied commit %s"), | |
5419 | short_commit_name(commit)); | |
5420 | skipped_commit = 1; | |
76ea2358 | 5421 | continue; |
767a4ca6 | 5422 | } |
b9cbd295 EN |
5423 | if (is_empty && !keep_empty) |
5424 | continue; | |
d358fc28 | 5425 | strbuf_addf(out, "%s %s ", insn, |
d8ae6c84 | 5426 | oid_to_hex(&commit->object.oid)); |
d358fc28 | 5427 | pretty_print_commit(&pp, commit, out); |
1b5735f7 EN |
5428 | if (is_empty) |
5429 | strbuf_addf(out, " %c empty", comment_line_char); | |
d358fc28 | 5430 | strbuf_addch(out, '\n'); |
62db5247 | 5431 | } |
767a4ca6 JS |
5432 | if (skipped_commit) |
5433 | advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS, | |
5434 | _("use --reapply-cherry-picks to include skipped commits")); | |
62db5247 JS |
5435 | return 0; |
5436 | } | |
3546c8d9 | 5437 | |
0cce4a27 LB |
5438 | /* |
5439 | * Add commands after pick and (series of) squash/fixup commands | |
5440 | * in the todo list. | |
5441 | */ | |
17919c35 JS |
5442 | static void todo_list_add_exec_commands(struct todo_list *todo_list, |
5443 | struct string_list *commands) | |
3546c8d9 | 5444 | { |
683153a4 AG |
5445 | struct strbuf *buf = &todo_list->buf; |
5446 | size_t base_offset = buf->len; | |
5447 | int i, insert, nr = 0, alloc = 0; | |
5448 | struct todo_item *items = NULL, *base_items = NULL; | |
3546c8d9 | 5449 | |
ca56dadb | 5450 | CALLOC_ARRAY(base_items, commands->nr); |
683153a4 AG |
5451 | for (i = 0; i < commands->nr; i++) { |
5452 | size_t command_len = strlen(commands->items[i].string); | |
3546c8d9 | 5453 | |
683153a4 AG |
5454 | strbuf_addstr(buf, commands->items[i].string); |
5455 | strbuf_addch(buf, '\n'); | |
3546c8d9 | 5456 | |
683153a4 AG |
5457 | base_items[i].command = TODO_EXEC; |
5458 | base_items[i].offset_in_buf = base_offset; | |
5459 | base_items[i].arg_offset = base_offset + strlen("exec "); | |
5460 | base_items[i].arg_len = command_len - strlen("exec "); | |
3546c8d9 | 5461 | |
683153a4 | 5462 | base_offset += command_len + 1; |
3546c8d9 JS |
5463 | } |
5464 | ||
1ace63bc JS |
5465 | /* |
5466 | * Insert <commands> after every pick. Here, fixup/squash chains | |
5467 | * are considered part of the pick, so we insert the commands *after* | |
5468 | * those chains if there are any. | |
683153a4 | 5469 | * |
15beaaa3 | 5470 | * As we insert the exec commands immediately after rearranging |
683153a4 AG |
5471 | * any fixups and before the user edits the list, a fixup chain |
5472 | * can never contain comments (any comments are empty picks that | |
5473 | * have been commented out because the user did not specify | |
5474 | * --keep-empty). So, it is safe to insert an exec command | |
5475 | * without looking at the command following a comment. | |
1ace63bc | 5476 | */ |
683153a4 AG |
5477 | insert = 0; |
5478 | for (i = 0; i < todo_list->nr; i++) { | |
5479 | enum todo_command command = todo_list->items[i].command; | |
5480 | if (insert && !is_fixup(command)) { | |
5481 | ALLOC_GROW(items, nr + commands->nr, alloc); | |
5482 | COPY_ARRAY(items + nr, base_items, commands->nr); | |
5483 | nr += commands->nr; | |
5484 | ||
5485 | insert = 0; | |
0cce4a27 | 5486 | } |
1ace63bc | 5487 | |
683153a4 AG |
5488 | ALLOC_GROW(items, nr + 1, alloc); |
5489 | items[nr++] = todo_list->items[i]; | |
5490 | ||
1ace63bc | 5491 | if (command == TODO_PICK || command == TODO_MERGE) |
683153a4 | 5492 | insert = 1; |
0cce4a27 LB |
5493 | } |
5494 | ||
1ace63bc | 5495 | /* insert or append final <commands> */ |
cc9dcdee | 5496 | if (insert) { |
683153a4 AG |
5497 | ALLOC_GROW(items, nr + commands->nr, alloc); |
5498 | COPY_ARRAY(items + nr, base_items, commands->nr); | |
5499 | nr += commands->nr; | |
5500 | } | |
0cce4a27 | 5501 | |
683153a4 AG |
5502 | free(base_items); |
5503 | FREE_AND_NULL(todo_list->items); | |
5504 | todo_list->items = items; | |
5505 | todo_list->nr = nr; | |
5506 | todo_list->alloc = alloc; | |
0cce4a27 | 5507 | } |
3546c8d9 | 5508 | |
616d7740 AG |
5509 | static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_list, |
5510 | struct strbuf *buf, int num, unsigned flags) | |
3546c8d9 | 5511 | { |
8dccc7a6 | 5512 | struct todo_item *item; |
616d7740 | 5513 | int i, max = todo_list->nr; |
3546c8d9 | 5514 | |
616d7740 AG |
5515 | if (num > 0 && num < max) |
5516 | max = num; | |
3546c8d9 | 5517 | |
616d7740 | 5518 | for (item = todo_list->items, i = 0; i < max; i++, item++) { |
68e7090f AG |
5519 | char cmd; |
5520 | ||
8dccc7a6 LB |
5521 | /* if the item is not a command write it and continue */ |
5522 | if (item->command >= TODO_COMMENT) { | |
616d7740 | 5523 | strbuf_addf(buf, "%.*s\n", item->arg_len, |
cbef27d6 | 5524 | todo_item_get_arg(todo_list, item)); |
8dccc7a6 | 5525 | continue; |
3546c8d9 | 5526 | } |
8dccc7a6 LB |
5527 | |
5528 | /* add command to the buffer */ | |
68e7090f AG |
5529 | cmd = command_to_char(item->command); |
5530 | if ((flags & TODO_LIST_ABBREVIATE_CMDS) && cmd) | |
5531 | strbuf_addch(buf, cmd); | |
d8ae6c84 | 5532 | else |
616d7740 | 5533 | strbuf_addstr(buf, command_to_string(item->command)); |
8dccc7a6 LB |
5534 | |
5535 | /* add commit id */ | |
5536 | if (item->commit) { | |
313a48ea | 5537 | const char *oid = flags & TODO_LIST_SHORTEN_IDS ? |
8dccc7a6 LB |
5538 | short_commit_name(item->commit) : |
5539 | oid_to_hex(&item->commit->object.oid); | |
5540 | ||
9e3cebd9 CM |
5541 | if (item->command == TODO_FIXUP) { |
5542 | if (item->flags & TODO_EDIT_FIXUP_MSG) | |
5543 | strbuf_addstr(buf, " -c"); | |
5544 | else if (item->flags & TODO_REPLACE_FIXUP_MSG) { | |
5545 | strbuf_addstr(buf, " -C"); | |
5546 | } | |
5547 | } | |
5548 | ||
4c68e7dd JS |
5549 | if (item->command == TODO_MERGE) { |
5550 | if (item->flags & TODO_EDIT_MERGE_MSG) | |
616d7740 | 5551 | strbuf_addstr(buf, " -c"); |
4c68e7dd | 5552 | else |
616d7740 | 5553 | strbuf_addstr(buf, " -C"); |
4c68e7dd JS |
5554 | } |
5555 | ||
616d7740 | 5556 | strbuf_addf(buf, " %s", oid); |
3546c8d9 | 5557 | } |
4c68e7dd | 5558 | |
8dccc7a6 | 5559 | /* add all the rest */ |
c7b4d79c | 5560 | if (!item->arg_len) |
616d7740 | 5561 | strbuf_addch(buf, '\n'); |
c7b4d79c | 5562 | else |
616d7740 | 5563 | strbuf_addf(buf, " %.*s\n", item->arg_len, |
cbef27d6 | 5564 | todo_item_get_arg(todo_list, item)); |
3546c8d9 | 5565 | } |
3546c8d9 | 5566 | } |
94399949 | 5567 | |
616d7740 AG |
5568 | int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list, |
5569 | const char *file, const char *shortrevisions, | |
5570 | const char *shortonto, int num, unsigned flags) | |
94399949 | 5571 | { |
af1fc3ad | 5572 | int res; |
616d7740 | 5573 | struct strbuf buf = STRBUF_INIT; |
94399949 | 5574 | |
616d7740 | 5575 | todo_list_to_strbuf(r, todo_list, &buf, num, flags); |
af1fc3ad | 5576 | if (flags & TODO_LIST_APPEND_TODO_HELP) |
d48e5e21 | 5577 | append_todo_help(count_commands(todo_list), |
af1fc3ad | 5578 | shortrevisions, shortonto, &buf); |
94399949 | 5579 | |
616d7740 | 5580 | res = write_message(buf.buf, buf.len, file, 0); |
cbef27d6 | 5581 | strbuf_release(&buf); |
8315bd20 | 5582 | |
616d7740 | 5583 | return res; |
cbef27d6 | 5584 | } |
94399949 | 5585 | |
cdac2b01 | 5586 | /* skip picking commits whose parents are unchanged */ |
6bfeb7f1 AG |
5587 | static int skip_unnecessary_picks(struct repository *r, |
5588 | struct todo_list *todo_list, | |
5589 | struct object_id *base_oid) | |
cdac2b01 | 5590 | { |
d4ed5d77 | 5591 | struct object_id *parent_oid; |
6bfeb7f1 | 5592 | int i; |
cdac2b01 | 5593 | |
6bfeb7f1 AG |
5594 | for (i = 0; i < todo_list->nr; i++) { |
5595 | struct todo_item *item = todo_list->items + i; | |
cdac2b01 JS |
5596 | |
5597 | if (item->command >= TODO_NOOP) | |
5598 | continue; | |
5599 | if (item->command != TODO_PICK) | |
5600 | break; | |
5601 | if (parse_commit(item->commit)) { | |
cdac2b01 JS |
5602 | return error(_("could not parse commit '%s'"), |
5603 | oid_to_hex(&item->commit->object.oid)); | |
5604 | } | |
5605 | if (!item->commit->parents) | |
5606 | break; /* root commit */ | |
5607 | if (item->commit->parents->next) | |
5608 | break; /* merge commit */ | |
5609 | parent_oid = &item->commit->parents->item->object.oid; | |
6bfeb7f1 | 5610 | if (!oideq(parent_oid, base_oid)) |
cdac2b01 | 5611 | break; |
6bfeb7f1 | 5612 | oidcpy(base_oid, &item->commit->object.oid); |
cdac2b01 JS |
5613 | } |
5614 | if (i > 0) { | |
cdac2b01 JS |
5615 | const char *done_path = rebase_path_done(); |
5616 | ||
6bfeb7f1 | 5617 | if (todo_list_write_to_file(r, todo_list, done_path, NULL, NULL, i, 0)) { |
cdac2b01 | 5618 | error_errno(_("could not write to '%s'"), done_path); |
cdac2b01 JS |
5619 | return -1; |
5620 | } | |
cdac2b01 | 5621 | |
6bfeb7f1 AG |
5622 | MOVE_ARRAY(todo_list->items, todo_list->items + i, todo_list->nr - i); |
5623 | todo_list->nr -= i; | |
5624 | todo_list->current = 0; | |
34065541 | 5625 | todo_list->done_nr += i; |
cdac2b01 | 5626 | |
6bfeb7f1 AG |
5627 | if (is_fixup(peek_command(todo_list, 0))) |
5628 | record_in_rewritten(base_oid, peek_command(todo_list, 0)); | |
cdac2b01 JS |
5629 | } |
5630 | ||
cdac2b01 JS |
5631 | return 0; |
5632 | } | |
c44a4c65 | 5633 | |
005af339 | 5634 | int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags, |
b97e1873 | 5635 | const char *shortrevisions, const char *onto_name, |
f3e27a02 | 5636 | struct commit *onto, const struct object_id *orig_head, |
7d3488eb PW |
5637 | struct string_list *commands, unsigned autosquash, |
5638 | struct todo_list *todo_list) | |
b97e1873 | 5639 | { |
5da69c0d AK |
5640 | char shortonto[GIT_MAX_HEXSZ + 1]; |
5641 | const char *todo_file = rebase_path_todo(); | |
94bcad79 | 5642 | struct todo_list new_todo = TODO_LIST_INIT; |
b6992261 | 5643 | struct strbuf *buf = &todo_list->buf, buf2 = STRBUF_INIT; |
7d3488eb | 5644 | struct object_id oid = onto->object.oid; |
1451d0f6 | 5645 | int res; |
b97e1873 | 5646 | |
5da69c0d | 5647 | find_unique_abbrev_r(shortonto, &oid, DEFAULT_ABBREV); |
b97e1873 | 5648 | |
94bcad79 AG |
5649 | if (buf->len == 0) { |
5650 | struct todo_item *item = append_new_todo(todo_list); | |
5651 | item->command = TODO_NOOP; | |
5652 | item->commit = NULL; | |
5653 | item->arg_len = item->arg_offset = item->flags = item->offset_in_buf = 0; | |
5654 | } | |
b97e1873 | 5655 | |
94bcad79 | 5656 | if (autosquash && todo_list_rearrange_squash(todo_list)) |
b97e1873 AG |
5657 | return -1; |
5658 | ||
683153a4 | 5659 | if (commands->nr) |
94bcad79 | 5660 | todo_list_add_exec_commands(todo_list, commands); |
b97e1873 | 5661 | |
94bcad79 | 5662 | if (count_commands(todo_list) == 0) { |
be1bb600 | 5663 | apply_autostash(rebase_path_autostash()); |
b97e1873 | 5664 | sequencer_remove_state(opts); |
b97e1873 AG |
5665 | |
5666 | return error(_("nothing to do")); | |
5667 | } | |
5668 | ||
1451d0f6 AG |
5669 | res = edit_todo_list(r, todo_list, &new_todo, shortrevisions, |
5670 | shortonto, flags); | |
5671 | if (res == -1) | |
b97e1873 | 5672 | return -1; |
1451d0f6 | 5673 | else if (res == -2) { |
be1bb600 | 5674 | apply_autostash(rebase_path_autostash()); |
b97e1873 | 5675 | sequencer_remove_state(opts); |
b97e1873 AG |
5676 | |
5677 | return -1; | |
1451d0f6 | 5678 | } else if (res == -3) { |
be1bb600 | 5679 | apply_autostash(rebase_path_autostash()); |
b97e1873 | 5680 | sequencer_remove_state(opts); |
94bcad79 | 5681 | todo_list_release(&new_todo); |
b97e1873 AG |
5682 | |
5683 | return error(_("nothing to do")); | |
5a5445d8 | 5684 | } else if (res == -4) { |
7d3488eb | 5685 | checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head); |
94bcad79 AG |
5686 | todo_list_release(&new_todo); |
5687 | ||
b97e1873 AG |
5688 | return -1; |
5689 | } | |
5690 | ||
b6992261 JS |
5691 | /* Expand the commit IDs */ |
5692 | todo_list_to_strbuf(r, &new_todo, &buf2, -1, 0); | |
5693 | strbuf_swap(&new_todo.buf, &buf2); | |
5694 | strbuf_release(&buf2); | |
5695 | new_todo.total_nr -= new_todo.nr; | |
5696 | if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) < 0) | |
5697 | BUG("invalid todo list after expanding IDs:\n%s", | |
5698 | new_todo.buf.buf); | |
5699 | ||
6bfeb7f1 AG |
5700 | if (opts->allow_ff && skip_unnecessary_picks(r, &new_todo, &oid)) { |
5701 | todo_list_release(&new_todo); | |
b97e1873 | 5702 | return error(_("could not skip unnecessary pick commands")); |
6bfeb7f1 AG |
5703 | } |
5704 | ||
94bcad79 AG |
5705 | if (todo_list_write_to_file(r, &new_todo, todo_file, NULL, NULL, -1, |
5706 | flags & ~(TODO_LIST_SHORTEN_IDS))) { | |
5707 | todo_list_release(&new_todo); | |
5708 | return error_errno(_("could not write '%s'"), todo_file); | |
5709 | } | |
5710 | ||
393adf7a | 5711 | res = -1; |
b97e1873 | 5712 | |
7d3488eb | 5713 | if (checkout_onto(r, opts, onto_name, &oid, orig_head)) |
393adf7a | 5714 | goto cleanup; |
29d51e21 | 5715 | |
005af339 | 5716 | if (require_clean_work_tree(r, "rebase", "", 1, 1)) |
393adf7a | 5717 | goto cleanup; |
b97e1873 | 5718 | |
393adf7a AG |
5719 | todo_list_write_total_nr(&new_todo); |
5720 | res = pick_commits(r, &new_todo, opts); | |
5721 | ||
5722 | cleanup: | |
5723 | todo_list_release(&new_todo); | |
5724 | ||
5725 | return res; | |
b97e1873 AG |
5726 | } |
5727 | ||
c44a4c65 JS |
5728 | struct subject2item_entry { |
5729 | struct hashmap_entry entry; | |
5730 | int i; | |
5731 | char subject[FLEX_ARRAY]; | |
5732 | }; | |
5733 | ||
5734 | static int subject2item_cmp(const void *fndata, | |
939af16e EW |
5735 | const struct hashmap_entry *eptr, |
5736 | const struct hashmap_entry *entry_or_key, | |
5737 | const void *key) | |
c44a4c65 | 5738 | { |
939af16e EW |
5739 | const struct subject2item_entry *a, *b; |
5740 | ||
5741 | a = container_of(eptr, const struct subject2item_entry, entry); | |
5742 | b = container_of(entry_or_key, const struct subject2item_entry, entry); | |
5743 | ||
c44a4c65 JS |
5744 | return key ? strcmp(a->subject, key) : strcmp(a->subject, b->subject); |
5745 | } | |
5746 | ||
3cc0287b NTND |
5747 | define_commit_slab(commit_todo_item, struct todo_item *); |
5748 | ||
1f969601 | 5749 | static int skip_fixupish(const char *subject, const char **p) { |
bae5b4ae CM |
5750 | return skip_prefix(subject, "fixup! ", p) || |
5751 | skip_prefix(subject, "amend! ", p) || | |
5752 | skip_prefix(subject, "squash! ", p); | |
5753 | } | |
5754 | ||
c44a4c65 JS |
5755 | /* |
5756 | * Rearrange the todo list that has both "pick commit-id msg" and "pick | |
5757 | * commit-id fixup!/squash! msg" in it so that the latter is put immediately | |
5758 | * after the former, and change "pick" to "fixup"/"squash". | |
5759 | * | |
5760 | * Note that if the config has specified a custom instruction format, each log | |
5761 | * message will have to be retrieved from the commit (as the oneline in the | |
5762 | * script cannot be trusted) in order to normalize the autosquash arrangement. | |
5763 | */ | |
79d7e883 | 5764 | int todo_list_rearrange_squash(struct todo_list *todo_list) |
c44a4c65 | 5765 | { |
c44a4c65 | 5766 | struct hashmap subject2item; |
f2a04904 | 5767 | int rearranged = 0, *next, *tail, i, nr = 0, alloc = 0; |
c44a4c65 | 5768 | char **subjects; |
3cc0287b | 5769 | struct commit_todo_item commit_todo; |
f2a04904 | 5770 | struct todo_item *items = NULL; |
c44a4c65 | 5771 | |
3cc0287b | 5772 | init_commit_todo_item(&commit_todo); |
c44a4c65 JS |
5773 | /* |
5774 | * The hashmap maps onelines to the respective todo list index. | |
5775 | * | |
5776 | * If any items need to be rearranged, the next[i] value will indicate | |
5777 | * which item was moved directly after the i'th. | |
5778 | * | |
5779 | * In that case, last[i] will indicate the index of the latest item to | |
5780 | * be moved to appear after the i'th. | |
5781 | */ | |
939af16e | 5782 | hashmap_init(&subject2item, subject2item_cmp, NULL, todo_list->nr); |
f2a04904 AG |
5783 | ALLOC_ARRAY(next, todo_list->nr); |
5784 | ALLOC_ARRAY(tail, todo_list->nr); | |
5785 | ALLOC_ARRAY(subjects, todo_list->nr); | |
5786 | for (i = 0; i < todo_list->nr; i++) { | |
c44a4c65 | 5787 | struct strbuf buf = STRBUF_INIT; |
f2a04904 | 5788 | struct todo_item *item = todo_list->items + i; |
c44a4c65 JS |
5789 | const char *commit_buffer, *subject, *p; |
5790 | size_t subject_len; | |
5791 | int i2 = -1; | |
5792 | struct subject2item_entry *entry; | |
5793 | ||
5794 | next[i] = tail[i] = -1; | |
2f6b1d13 | 5795 | if (!item->commit || item->command == TODO_DROP) { |
c44a4c65 JS |
5796 | subjects[i] = NULL; |
5797 | continue; | |
5798 | } | |
5799 | ||
5800 | if (is_fixup(item->command)) { | |
3cc0287b | 5801 | clear_commit_todo_item(&commit_todo); |
c44a4c65 JS |
5802 | return error(_("the script was already rearranged.")); |
5803 | } | |
5804 | ||
3cc0287b | 5805 | *commit_todo_item_at(&commit_todo, item->commit) = item; |
c44a4c65 JS |
5806 | |
5807 | parse_commit(item->commit); | |
0798d16f | 5808 | commit_buffer = logmsg_reencode(item->commit, NULL, "UTF-8"); |
c44a4c65 JS |
5809 | find_commit_subject(commit_buffer, &subject); |
5810 | format_subject(&buf, subject, " "); | |
5811 | subject = subjects[i] = strbuf_detach(&buf, &subject_len); | |
5812 | unuse_commit_buffer(item->commit, commit_buffer); | |
1f969601 | 5813 | if (skip_fixupish(subject, &p)) { |
c44a4c65 JS |
5814 | struct commit *commit2; |
5815 | ||
5816 | for (;;) { | |
5817 | while (isspace(*p)) | |
5818 | p++; | |
1f969601 | 5819 | if (!skip_fixupish(p, &p)) |
c44a4c65 JS |
5820 | break; |
5821 | } | |
5822 | ||
f23a4651 EW |
5823 | entry = hashmap_get_entry_from_hash(&subject2item, |
5824 | strhash(p), p, | |
5825 | struct subject2item_entry, | |
5826 | entry); | |
5827 | if (entry) | |
c44a4c65 JS |
5828 | /* found by title */ |
5829 | i2 = entry->i; | |
5830 | else if (!strchr(p, ' ') && | |
5831 | (commit2 = | |
5832 | lookup_commit_reference_by_name(p)) && | |
3cc0287b | 5833 | *commit_todo_item_at(&commit_todo, commit2)) |
c44a4c65 | 5834 | /* found by commit name */ |
3cc0287b | 5835 | i2 = *commit_todo_item_at(&commit_todo, commit2) |
f2a04904 | 5836 | - todo_list->items; |
c44a4c65 JS |
5837 | else { |
5838 | /* copy can be a prefix of the commit subject */ | |
5839 | for (i2 = 0; i2 < i; i2++) | |
5840 | if (subjects[i2] && | |
5841 | starts_with(subjects[i2], p)) | |
5842 | break; | |
5843 | if (i2 == i) | |
5844 | i2 = -1; | |
5845 | } | |
5846 | } | |
5847 | if (i2 >= 0) { | |
5848 | rearranged = 1; | |
bae5b4ae CM |
5849 | if (starts_with(subject, "fixup!")) { |
5850 | todo_list->items[i].command = TODO_FIXUP; | |
5851 | } else if (starts_with(subject, "amend!")) { | |
5852 | todo_list->items[i].command = TODO_FIXUP; | |
5853 | todo_list->items[i].flags = TODO_REPLACE_FIXUP_MSG; | |
5854 | } else { | |
5855 | todo_list->items[i].command = TODO_SQUASH; | |
5856 | } | |
02471e7e JS |
5857 | if (tail[i2] < 0) { |
5858 | next[i] = next[i2]; | |
c44a4c65 | 5859 | next[i2] = i; |
02471e7e JS |
5860 | } else { |
5861 | next[i] = next[tail[i2]]; | |
c44a4c65 | 5862 | next[tail[i2]] = i; |
02471e7e | 5863 | } |
c44a4c65 JS |
5864 | tail[i2] = i; |
5865 | } else if (!hashmap_get_from_hash(&subject2item, | |
5866 | strhash(subject), subject)) { | |
5867 | FLEX_ALLOC_MEM(entry, subject, subject, subject_len); | |
5868 | entry->i = i; | |
d22245a2 EW |
5869 | hashmap_entry_init(&entry->entry, |
5870 | strhash(entry->subject)); | |
26b455f2 | 5871 | hashmap_put(&subject2item, &entry->entry); |
c44a4c65 JS |
5872 | } |
5873 | } | |
5874 | ||
5875 | if (rearranged) { | |
f2a04904 AG |
5876 | for (i = 0; i < todo_list->nr; i++) { |
5877 | enum todo_command command = todo_list->items[i].command; | |
c44a4c65 JS |
5878 | int cur = i; |
5879 | ||
5880 | /* | |
5881 | * Initially, all commands are 'pick's. If it is a | |
5882 | * fixup or a squash now, we have rearranged it. | |
5883 | */ | |
5884 | if (is_fixup(command)) | |
5885 | continue; | |
5886 | ||
5887 | while (cur >= 0) { | |
f2a04904 AG |
5888 | ALLOC_GROW(items, nr + 1, alloc); |
5889 | items[nr++] = todo_list->items[cur]; | |
c44a4c65 JS |
5890 | cur = next[cur]; |
5891 | } | |
5892 | } | |
5893 | ||
f2a04904 AG |
5894 | FREE_AND_NULL(todo_list->items); |
5895 | todo_list->items = items; | |
5896 | todo_list->nr = nr; | |
5897 | todo_list->alloc = alloc; | |
c44a4c65 JS |
5898 | } |
5899 | ||
5900 | free(next); | |
5901 | free(tail); | |
f2a04904 | 5902 | for (i = 0; i < todo_list->nr; i++) |
c44a4c65 JS |
5903 | free(subjects[i]); |
5904 | free(subjects); | |
6da1a258 | 5905 | hashmap_clear_and_free(&subject2item, struct subject2item_entry, entry); |
c44a4c65 | 5906 | |
3cc0287b | 5907 | clear_commit_todo_item(&commit_todo); |
f2a04904 AG |
5908 | |
5909 | return 0; | |
c44a4c65 | 5910 | } |
901ba7b1 PW |
5911 | |
5912 | int sequencer_determine_whence(struct repository *r, enum commit_whence *whence) | |
5913 | { | |
c8e4159e | 5914 | if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD")) { |
430b75f7 PW |
5915 | struct object_id cherry_pick_head, rebase_head; |
5916 | ||
5917 | if (file_exists(git_path_seq_dir())) | |
5918 | *whence = FROM_CHERRY_PICK_MULTI; | |
5919 | if (file_exists(rebase_path()) && | |
5920 | !get_oid("REBASE_HEAD", &rebase_head) && | |
5921 | !get_oid("CHERRY_PICK_HEAD", &cherry_pick_head) && | |
5922 | oideq(&rebase_head, &cherry_pick_head)) | |
5923 | *whence = FROM_REBASE_PICK; | |
5924 | else | |
5925 | *whence = FROM_CHERRY_PICK_SINGLE; | |
5926 | ||
901ba7b1 PW |
5927 | return 1; |
5928 | } | |
5929 | ||
5930 | return 0; | |
5931 | } |