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