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