6 #include "run-command.h"
9 #include "parse-options.h"
10 #include "cache-tree.h"
14 #include "merge-recursive.h"
17 #include "sequencer.h"
20 * This implements the builtins revert and cherry-pick.
22 * Copyright (c) 2007 Johannes E. Schindelin
24 * Based on git-revert.sh, which is
26 * Copyright (c) 2005 Linus Torvalds
27 * Copyright (c) 2005 Junio C Hamano
30 static const char * const revert_usage
[] = {
31 "git revert [options] <commit-ish>",
32 "git revert <subcommand>",
36 static const char * const cherry_pick_usage
[] = {
37 "git cherry-pick [options] <commit-ish>",
38 "git cherry-pick <subcommand>",
42 enum replay_action
{ REVERT
, CHERRY_PICK
};
43 enum replay_subcommand
{ REPLAY_NONE
, REPLAY_REMOVE_STATE
, REPLAY_CONTINUE
};
46 enum replay_action action
;
47 enum replay_subcommand subcommand
;
55 int allow_rerere_auto
;
59 const char **commit_argv
;
64 size_t xopts_nr
, xopts_alloc
;
67 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
69 static const char *action_name(const struct replay_opts
*opts
)
71 return opts
->action
== REVERT
? "revert" : "cherry-pick";
74 static char *get_encoding(const char *message
);
76 static const char * const *revert_or_cherry_pick_usage(struct replay_opts
*opts
)
78 return opts
->action
== REVERT
? revert_usage
: cherry_pick_usage
;
81 static int option_parse_x(const struct option
*opt
,
82 const char *arg
, int unset
)
84 struct replay_opts
**opts_ptr
= opt
->value
;
85 struct replay_opts
*opts
= *opts_ptr
;
90 ALLOC_GROW(opts
->xopts
, opts
->xopts_nr
+ 1, opts
->xopts_alloc
);
91 opts
->xopts
[opts
->xopts_nr
++] = xstrdup(arg
);
95 static void verify_opt_compatible(const char *me
, const char *base_opt
, ...)
100 va_start(ap
, base_opt
);
101 while ((this_opt
= va_arg(ap
, const char *))) {
108 die(_("%s: %s cannot be used with %s"), me
, this_opt
, base_opt
);
111 static void verify_opt_mutually_compatible(const char *me
, ...)
113 const char *opt1
, *opt2
= NULL
;
117 while ((opt1
= va_arg(ap
, const char *))) {
122 while ((opt2
= va_arg(ap
, const char *))) {
129 die(_("%s: %s cannot be used with %s"), me
, opt1
, opt2
);
132 static void parse_args(int argc
, const char **argv
, struct replay_opts
*opts
)
134 const char * const * usage_str
= revert_or_cherry_pick_usage(opts
);
135 const char *me
= action_name(opts
);
136 int remove_state
= 0;
138 struct option options
[] = {
139 OPT_BOOLEAN(0, "quit", &remove_state
, "end revert or cherry-pick sequence"),
140 OPT_BOOLEAN(0, "continue", &contin
, "resume revert or cherry-pick sequence"),
141 OPT_BOOLEAN('n', "no-commit", &opts
->no_commit
, "don't automatically commit"),
142 OPT_BOOLEAN('e', "edit", &opts
->edit
, "edit the commit message"),
143 OPT_NOOP_NOARG('r', NULL
),
144 OPT_BOOLEAN('s', "signoff", &opts
->signoff
, "add Signed-off-by:"),
145 OPT_INTEGER('m', "mainline", &opts
->mainline
, "parent number"),
146 OPT_RERERE_AUTOUPDATE(&opts
->allow_rerere_auto
),
147 OPT_STRING(0, "strategy", &opts
->strategy
, "strategy", "merge strategy"),
148 OPT_CALLBACK('X', "strategy-option", &opts
, "option",
149 "option for merge strategy", option_parse_x
),
150 { OPTION_BOOLEAN
, 0, "reset", &remove_state
, NULL
,
151 "alias for --quit (deprecated)",
152 PARSE_OPT_HIDDEN
| PARSE_OPT_NOARG
},
158 if (opts
->action
== CHERRY_PICK
) {
159 struct option cp_extra
[] = {
160 OPT_BOOLEAN('x', NULL
, &opts
->record_origin
, "append commit name"),
161 OPT_BOOLEAN(0, "ff", &opts
->allow_ff
, "allow fast-forward"),
164 if (parse_options_concat(options
, ARRAY_SIZE(options
), cp_extra
))
165 die(_("program error"));
168 opts
->commit_argc
= parse_options(argc
, argv
, NULL
, options
, usage_str
,
169 PARSE_OPT_KEEP_ARGV0
|
170 PARSE_OPT_KEEP_UNKNOWN
);
172 /* Check for incompatible subcommands */
173 verify_opt_mutually_compatible(me
,
174 "--quit", remove_state
,
175 "--continue", contin
,
178 /* Set the subcommand */
180 opts
->subcommand
= REPLAY_REMOVE_STATE
;
182 opts
->subcommand
= REPLAY_CONTINUE
;
184 opts
->subcommand
= REPLAY_NONE
;
186 /* Check for incompatible command line arguments */
187 if (opts
->subcommand
!= REPLAY_NONE
) {
188 char *this_operation
;
189 if (opts
->subcommand
== REPLAY_REMOVE_STATE
)
190 this_operation
= "--quit";
192 this_operation
= "--continue";
194 verify_opt_compatible(me
, this_operation
,
195 "--no-commit", opts
->no_commit
,
196 "--signoff", opts
->signoff
,
197 "--mainline", opts
->mainline
,
198 "--strategy", opts
->strategy
? 1 : 0,
199 "--strategy-option", opts
->xopts
? 1 : 0,
200 "-x", opts
->record_origin
,
201 "--ff", opts
->allow_ff
,
205 else if (opts
->commit_argc
< 2)
206 usage_with_options(usage_str
, options
);
209 verify_opt_compatible(me
, "--ff",
210 "--signoff", opts
->signoff
,
211 "--no-commit", opts
->no_commit
,
212 "-x", opts
->record_origin
,
213 "--edit", opts
->edit
,
215 opts
->commit_argv
= argv
;
218 struct commit_message
{
222 char *reencoded_message
;
226 static int get_message(struct commit
*commit
, struct commit_message
*out
)
228 const char *encoding
;
229 const char *abbrev
, *subject
;
230 int abbrev_len
, subject_len
;
235 encoding
= get_encoding(commit
->buffer
);
238 if (!git_commit_encoding
)
239 git_commit_encoding
= "UTF-8";
241 out
->reencoded_message
= NULL
;
242 out
->message
= commit
->buffer
;
243 if (strcmp(encoding
, git_commit_encoding
))
244 out
->reencoded_message
= reencode_string(commit
->buffer
,
245 git_commit_encoding
, encoding
);
246 if (out
->reencoded_message
)
247 out
->message
= out
->reencoded_message
;
249 abbrev
= find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
);
250 abbrev_len
= strlen(abbrev
);
252 subject_len
= find_commit_subject(out
->message
, &subject
);
254 out
->parent_label
= xmalloc(strlen("parent of ") + abbrev_len
+
255 strlen("... ") + subject_len
+ 1);
256 q
= out
->parent_label
;
257 q
= mempcpy(q
, "parent of ", strlen("parent of "));
259 q
= mempcpy(q
, abbrev
, abbrev_len
);
260 q
= mempcpy(q
, "... ", strlen("... "));
262 q
= mempcpy(q
, subject
, subject_len
);
267 static void free_message(struct commit_message
*msg
)
269 free(msg
->parent_label
);
270 free(msg
->reencoded_message
);
273 static char *get_encoding(const char *message
)
275 const char *p
= message
, *eol
;
277 while (*p
&& *p
!= '\n') {
278 for (eol
= p
+ 1; *eol
&& *eol
!= '\n'; eol
++)
280 if (!prefixcmp(p
, "encoding ")) {
281 char *result
= xmalloc(eol
- 8 - p
);
282 strlcpy(result
, p
+ 9, eol
- 8 - p
);
292 static void write_cherry_pick_head(struct commit
*commit
, const char *pseudoref
)
294 const char *filename
;
296 struct strbuf buf
= STRBUF_INIT
;
298 strbuf_addf(&buf
, "%s\n", sha1_to_hex(commit
->object
.sha1
));
300 filename
= git_path(pseudoref
);
301 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
303 die_errno(_("Could not open '%s' for writing"), filename
);
304 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
|| close(fd
))
305 die_errno(_("Could not write to '%s'"), filename
);
306 strbuf_release(&buf
);
309 static void print_advice(int show_hint
)
311 char *msg
= getenv("GIT_CHERRY_PICK_HELP");
314 fprintf(stderr
, "%s\n", msg
);
316 * A conflict has occured but the porcelain
317 * (typically rebase --interactive) wants to take care
318 * of the commit itself so remove CHERRY_PICK_HEAD
320 unlink(git_path("CHERRY_PICK_HEAD"));
325 advise("after resolving the conflicts, mark the corrected paths");
326 advise("with 'git add <paths>' or 'git rm <paths>'");
327 advise("and commit the result with 'git commit'");
331 static void write_message(struct strbuf
*msgbuf
, const char *filename
)
333 static struct lock_file msg_file
;
335 int msg_fd
= hold_lock_file_for_update(&msg_file
, filename
,
337 if (write_in_full(msg_fd
, msgbuf
->buf
, msgbuf
->len
) < 0)
338 die_errno(_("Could not write to %s"), filename
);
339 strbuf_release(msgbuf
);
340 if (commit_lock_file(&msg_file
) < 0)
341 die(_("Error wrapping up %s"), filename
);
344 static struct tree
*empty_tree(void)
346 return lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN
);
349 static int error_dirty_index(struct replay_opts
*opts
)
351 if (read_cache_unmerged())
352 return error_resolve_conflict(action_name(opts
));
354 /* Different translation strings for cherry-pick and revert */
355 if (opts
->action
== CHERRY_PICK
)
356 error(_("Your local changes would be overwritten by cherry-pick."));
358 error(_("Your local changes would be overwritten by revert."));
360 if (advice_commit_before_merge
)
361 advise(_("Commit your changes or stash them to proceed."));
365 static int fast_forward_to(const unsigned char *to
, const unsigned char *from
)
367 struct ref_lock
*ref_lock
;
370 if (checkout_fast_forward(from
, to
))
371 exit(1); /* the callee should have complained already */
372 ref_lock
= lock_any_ref_for_update("HEAD", from
, 0);
373 return write_ref_sha1(ref_lock
, to
, "cherry-pick");
376 static int do_recursive_merge(struct commit
*base
, struct commit
*next
,
377 const char *base_label
, const char *next_label
,
378 unsigned char *head
, struct strbuf
*msgbuf
,
379 struct replay_opts
*opts
)
381 struct merge_options o
;
382 struct tree
*result
, *next_tree
, *base_tree
, *head_tree
;
385 static struct lock_file index_lock
;
387 index_fd
= hold_locked_index(&index_lock
, 1);
391 init_merge_options(&o
);
392 o
.ancestor
= base
? base_label
: "(empty tree)";
394 o
.branch2
= next
? next_label
: "(empty tree)";
396 head_tree
= parse_tree_indirect(head
);
397 next_tree
= next
? next
->tree
: empty_tree();
398 base_tree
= base
? base
->tree
: empty_tree();
400 for (xopt
= opts
->xopts
; xopt
!= opts
->xopts
+ opts
->xopts_nr
; xopt
++)
401 parse_merge_opt(&o
, *xopt
);
403 clean
= merge_trees(&o
,
405 next_tree
, base_tree
, &result
);
407 if (active_cache_changed
&&
408 (write_cache(index_fd
, active_cache
, active_nr
) ||
409 commit_locked_index(&index_lock
)))
410 /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
411 die(_("%s: Unable to write new index file"), action_name(opts
));
412 rollback_lock_file(&index_lock
);
416 strbuf_addstr(msgbuf
, "\nConflicts:\n\n");
417 for (i
= 0; i
< active_nr
;) {
418 struct cache_entry
*ce
= active_cache
[i
++];
420 strbuf_addch(msgbuf
, '\t');
421 strbuf_addstr(msgbuf
, ce
->name
);
422 strbuf_addch(msgbuf
, '\n');
423 while (i
< active_nr
&& !strcmp(ce
->name
,
424 active_cache
[i
]->name
))
434 * If we are cherry-pick, and if the merge did not result in
435 * hand-editing, we will hit this commit and inherit the original
436 * author date and name.
437 * If we are revert, or if our cherry-pick results in a hand merge,
438 * we had better say that the current user is responsible for that.
440 static int run_git_commit(const char *defmsg
, struct replay_opts
*opts
)
442 /* 6 is max possible length of our args array including NULL */
446 args
[i
++] = "commit";
456 return run_command_v_opt(args
, RUN_GIT_CMD
);
459 static int do_pick_commit(struct commit
*commit
, struct replay_opts
*opts
)
461 unsigned char head
[20];
462 struct commit
*base
, *next
, *parent
;
463 const char *base_label
, *next_label
;
464 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
, NULL
};
466 struct strbuf msgbuf
= STRBUF_INIT
;
469 if (opts
->no_commit
) {
471 * We do not intend to commit immediately. We just want to
472 * merge the differences in, so let's compute the tree
473 * that represents the "current" state for merge-recursive
476 if (write_cache_as_tree(head
, 0, NULL
))
477 die (_("Your index file is unmerged."));
479 if (get_sha1("HEAD", head
))
480 return error(_("You do not have a valid HEAD"));
481 if (index_differs_from("HEAD", 0))
482 return error_dirty_index(opts
);
486 if (!commit
->parents
) {
489 else if (commit
->parents
->next
) {
490 /* Reverting or cherry-picking a merge commit */
492 struct commit_list
*p
;
495 return error(_("Commit %s is a merge but no -m option was given."),
496 sha1_to_hex(commit
->object
.sha1
));
498 for (cnt
= 1, p
= commit
->parents
;
499 cnt
!= opts
->mainline
&& p
;
502 if (cnt
!= opts
->mainline
|| !p
)
503 return error(_("Commit %s does not have parent %d"),
504 sha1_to_hex(commit
->object
.sha1
), opts
->mainline
);
506 } else if (0 < opts
->mainline
)
507 return error(_("Mainline was specified but commit %s is not a merge."),
508 sha1_to_hex(commit
->object
.sha1
));
510 parent
= commit
->parents
->item
;
512 if (opts
->allow_ff
&& parent
&& !hashcmp(parent
->object
.sha1
, head
))
513 return fast_forward_to(commit
->object
.sha1
, head
);
515 if (parent
&& parse_commit(parent
) < 0)
516 /* TRANSLATORS: The first %s will be "revert" or
517 "cherry-pick", the second %s a SHA1 */
518 return error(_("%s: cannot parse parent commit %s"),
519 action_name(opts
), sha1_to_hex(parent
->object
.sha1
));
521 if (get_message(commit
, &msg
) != 0)
522 return error(_("Cannot get commit message for %s"),
523 sha1_to_hex(commit
->object
.sha1
));
526 * "commit" is an existing commit. We would want to apply
527 * the difference it introduces since its first parent "prev"
528 * on top of the current HEAD if we are cherry-pick. Or the
529 * reverse of it if we are revert.
532 defmsg
= git_pathdup("MERGE_MSG");
534 if (opts
->action
== REVERT
) {
536 base_label
= msg
.label
;
538 next_label
= msg
.parent_label
;
539 strbuf_addstr(&msgbuf
, "Revert \"");
540 strbuf_addstr(&msgbuf
, msg
.subject
);
541 strbuf_addstr(&msgbuf
, "\"\n\nThis reverts commit ");
542 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
544 if (commit
->parents
&& commit
->parents
->next
) {
545 strbuf_addstr(&msgbuf
, ", reversing\nchanges made to ");
546 strbuf_addstr(&msgbuf
, sha1_to_hex(parent
->object
.sha1
));
548 strbuf_addstr(&msgbuf
, ".\n");
553 base_label
= msg
.parent_label
;
555 next_label
= msg
.label
;
558 * Append the commit log message to msgbuf; it starts
559 * after the tree, parent, author, committer
560 * information followed by "\n\n".
562 p
= strstr(msg
.message
, "\n\n");
565 strbuf_addstr(&msgbuf
, p
);
568 if (opts
->record_origin
) {
569 strbuf_addstr(&msgbuf
, "(cherry picked from commit ");
570 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
571 strbuf_addstr(&msgbuf
, ")\n");
575 if (!opts
->strategy
|| !strcmp(opts
->strategy
, "recursive") || opts
->action
== REVERT
) {
576 res
= do_recursive_merge(base
, next
, base_label
, next_label
,
577 head
, &msgbuf
, opts
);
578 write_message(&msgbuf
, defmsg
);
580 struct commit_list
*common
= NULL
;
581 struct commit_list
*remotes
= NULL
;
583 write_message(&msgbuf
, defmsg
);
585 commit_list_insert(base
, &common
);
586 commit_list_insert(next
, &remotes
);
587 res
= try_merge_command(opts
->strategy
, opts
->xopts_nr
, opts
->xopts
,
588 common
, sha1_to_hex(head
), remotes
);
589 free_commit_list(common
);
590 free_commit_list(remotes
);
594 * If the merge was clean or if it failed due to conflict, we write
595 * CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
596 * However, if the merge did not even start, then we don't want to
599 if (opts
->action
== CHERRY_PICK
&& !opts
->no_commit
&& (res
== 0 || res
== 1))
600 write_cherry_pick_head(commit
, "CHERRY_PICK_HEAD");
601 if (opts
->action
== REVERT
&& ((opts
->no_commit
&& res
== 0) || res
== 1))
602 write_cherry_pick_head(commit
, "REVERT_HEAD");
605 error(opts
->action
== REVERT
606 ? _("could not revert %s... %s")
607 : _("could not apply %s... %s"),
608 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
),
610 print_advice(res
== 1);
611 rerere(opts
->allow_rerere_auto
);
613 if (!opts
->no_commit
)
614 res
= run_git_commit(defmsg
, opts
);
623 static void prepare_revs(struct rev_info
*revs
, struct replay_opts
*opts
)
627 init_revisions(revs
, NULL
);
629 if (opts
->action
!= REVERT
)
632 argc
= setup_revisions(opts
->commit_argc
, opts
->commit_argv
, revs
, NULL
);
634 usage(*revert_or_cherry_pick_usage(opts
));
636 if (prepare_revision_walk(revs
))
637 die(_("revision walk setup failed"));
640 die(_("empty commit set passed"));
643 static void read_and_refresh_cache(struct replay_opts
*opts
)
645 static struct lock_file index_lock
;
646 int index_fd
= hold_locked_index(&index_lock
, 0);
647 if (read_index_preload(&the_index
, NULL
) < 0)
648 die(_("git %s: failed to read the index"), action_name(opts
));
649 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, NULL
, NULL
, NULL
);
650 if (the_index
.cache_changed
) {
651 if (write_index(&the_index
, index_fd
) ||
652 commit_locked_index(&index_lock
))
653 die(_("git %s: failed to refresh the index"), action_name(opts
));
655 rollback_lock_file(&index_lock
);
659 * Append a commit to the end of the commit_list.
661 * next starts by pointing to the variable that holds the head of an
662 * empty commit_list, and is updated to point to the "next" field of
663 * the last item on the list as new commits are appended.
667 * struct commit_list *list;
668 * struct commit_list **next = &list;
670 * next = commit_list_append(c1, next);
671 * next = commit_list_append(c2, next);
672 * assert(commit_list_count(list) == 2);
675 static struct commit_list
**commit_list_append(struct commit
*commit
,
676 struct commit_list
**next
)
678 struct commit_list
*new = xmalloc(sizeof(struct commit_list
));
685 static int format_todo(struct strbuf
*buf
, struct commit_list
*todo_list
,
686 struct replay_opts
*opts
)
688 struct commit_list
*cur
= NULL
;
689 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
, NULL
};
690 const char *sha1_abbrev
= NULL
;
691 const char *action_str
= opts
->action
== REVERT
? "revert" : "pick";
693 for (cur
= todo_list
; cur
; cur
= cur
->next
) {
694 sha1_abbrev
= find_unique_abbrev(cur
->item
->object
.sha1
, DEFAULT_ABBREV
);
695 if (get_message(cur
->item
, &msg
))
696 return error(_("Cannot get commit message for %s"), sha1_abbrev
);
697 strbuf_addf(buf
, "%s %s %s\n", action_str
, sha1_abbrev
, msg
.subject
);
702 static struct commit
*parse_insn_line(char *start
, struct replay_opts
*opts
)
704 unsigned char commit_sha1
[20];
705 char sha1_abbrev
[40];
706 enum replay_action action
;
710 if (!prefixcmp(start
, "pick ")) {
711 action
= CHERRY_PICK
;
712 insn_len
= strlen("pick");
713 p
= start
+ insn_len
+ 1;
714 } else if (!prefixcmp(start
, "revert ")) {
716 insn_len
= strlen("revert");
717 p
= start
+ insn_len
+ 1;
726 strlcpy(sha1_abbrev
, p
, q
- p
);
729 * Verify that the action matches up with the one in
730 * opts; we don't support arbitrary instructions
732 if (action
!= opts
->action
) {
733 const char *action_str
;
734 action_str
= action
== REVERT
? "revert" : "cherry-pick";
735 error(_("Cannot %s during a %s"), action_str
, action_name(opts
));
739 if (get_sha1(sha1_abbrev
, commit_sha1
) < 0)
742 return lookup_commit_reference(commit_sha1
);
745 static int parse_insn_buffer(char *buf
, struct commit_list
**todo_list
,
746 struct replay_opts
*opts
)
748 struct commit_list
**next
= todo_list
;
749 struct commit
*commit
;
753 for (i
= 1; *p
; i
++) {
754 commit
= parse_insn_line(p
, opts
);
756 return error(_("Could not parse line %d."), i
);
757 next
= commit_list_append(commit
, next
);
758 p
= strchrnul(p
, '\n');
763 return error(_("No commits parsed."));
767 static void read_populate_todo(struct commit_list
**todo_list
,
768 struct replay_opts
*opts
)
770 const char *todo_file
= git_path(SEQ_TODO_FILE
);
771 struct strbuf buf
= STRBUF_INIT
;
774 fd
= open(todo_file
, O_RDONLY
);
776 die_errno(_("Could not open %s"), todo_file
);
777 if (strbuf_read(&buf
, fd
, 0) < 0) {
779 strbuf_release(&buf
);
780 die(_("Could not read %s."), todo_file
);
784 res
= parse_insn_buffer(buf
.buf
, todo_list
, opts
);
785 strbuf_release(&buf
);
787 die(_("Unusable instruction sheet: %s"), todo_file
);
790 static int populate_opts_cb(const char *key
, const char *value
, void *data
)
792 struct replay_opts
*opts
= data
;
797 else if (!strcmp(key
, "options.no-commit"))
798 opts
->no_commit
= git_config_bool_or_int(key
, value
, &error_flag
);
799 else if (!strcmp(key
, "options.edit"))
800 opts
->edit
= git_config_bool_or_int(key
, value
, &error_flag
);
801 else if (!strcmp(key
, "options.signoff"))
802 opts
->signoff
= git_config_bool_or_int(key
, value
, &error_flag
);
803 else if (!strcmp(key
, "options.record-origin"))
804 opts
->record_origin
= git_config_bool_or_int(key
, value
, &error_flag
);
805 else if (!strcmp(key
, "options.allow-ff"))
806 opts
->allow_ff
= git_config_bool_or_int(key
, value
, &error_flag
);
807 else if (!strcmp(key
, "options.mainline"))
808 opts
->mainline
= git_config_int(key
, value
);
809 else if (!strcmp(key
, "options.strategy"))
810 git_config_string(&opts
->strategy
, key
, value
);
811 else if (!strcmp(key
, "options.strategy-option")) {
812 ALLOC_GROW(opts
->xopts
, opts
->xopts_nr
+ 1, opts
->xopts_alloc
);
813 opts
->xopts
[opts
->xopts_nr
++] = xstrdup(value
);
815 return error(_("Invalid key: %s"), key
);
818 return error(_("Invalid value for %s: %s"), key
, value
);
823 static void read_populate_opts(struct replay_opts
**opts_ptr
)
825 const char *opts_file
= git_path(SEQ_OPTS_FILE
);
827 if (!file_exists(opts_file
))
829 if (git_config_from_file(populate_opts_cb
, opts_file
, *opts_ptr
) < 0)
830 die(_("Malformed options sheet: %s"), opts_file
);
833 static void walk_revs_populate_todo(struct commit_list
**todo_list
,
834 struct replay_opts
*opts
)
836 struct rev_info revs
;
837 struct commit
*commit
;
838 struct commit_list
**next
;
840 prepare_revs(&revs
, opts
);
843 while ((commit
= get_revision(&revs
)))
844 next
= commit_list_append(commit
, next
);
847 static int create_seq_dir(void)
849 const char *seq_dir
= git_path(SEQ_DIR
);
851 if (file_exists(seq_dir
)) {
852 error(_("a cherry-pick or revert is already in progress"));
853 advise(_("try \"git cherry-pick (--continue | --quit)\""));
856 else if (mkdir(seq_dir
, 0777) < 0)
857 die_errno(_("Could not create sequencer directory %s"), seq_dir
);
861 static void save_head(const char *head
)
863 const char *head_file
= git_path(SEQ_HEAD_FILE
);
864 static struct lock_file head_lock
;
865 struct strbuf buf
= STRBUF_INIT
;
868 fd
= hold_lock_file_for_update(&head_lock
, head_file
, LOCK_DIE_ON_ERROR
);
869 strbuf_addf(&buf
, "%s\n", head
);
870 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0)
871 die_errno(_("Could not write to %s"), head_file
);
872 if (commit_lock_file(&head_lock
) < 0)
873 die(_("Error wrapping up %s."), head_file
);
876 static void save_todo(struct commit_list
*todo_list
, struct replay_opts
*opts
)
878 const char *todo_file
= git_path(SEQ_TODO_FILE
);
879 static struct lock_file todo_lock
;
880 struct strbuf buf
= STRBUF_INIT
;
883 fd
= hold_lock_file_for_update(&todo_lock
, todo_file
, LOCK_DIE_ON_ERROR
);
884 if (format_todo(&buf
, todo_list
, opts
) < 0)
885 die(_("Could not format %s."), todo_file
);
886 if (write_in_full(fd
, buf
.buf
, buf
.len
) < 0) {
887 strbuf_release(&buf
);
888 die_errno(_("Could not write to %s"), todo_file
);
890 if (commit_lock_file(&todo_lock
) < 0) {
891 strbuf_release(&buf
);
892 die(_("Error wrapping up %s."), todo_file
);
894 strbuf_release(&buf
);
897 static void save_opts(struct replay_opts
*opts
)
899 const char *opts_file
= git_path(SEQ_OPTS_FILE
);
902 git_config_set_in_file(opts_file
, "options.no-commit", "true");
904 git_config_set_in_file(opts_file
, "options.edit", "true");
906 git_config_set_in_file(opts_file
, "options.signoff", "true");
907 if (opts
->record_origin
)
908 git_config_set_in_file(opts_file
, "options.record-origin", "true");
910 git_config_set_in_file(opts_file
, "options.allow-ff", "true");
911 if (opts
->mainline
) {
912 struct strbuf buf
= STRBUF_INIT
;
913 strbuf_addf(&buf
, "%d", opts
->mainline
);
914 git_config_set_in_file(opts_file
, "options.mainline", buf
.buf
);
915 strbuf_release(&buf
);
918 git_config_set_in_file(opts_file
, "options.strategy", opts
->strategy
);
921 for (i
= 0; i
< opts
->xopts_nr
; i
++)
922 git_config_set_multivar_in_file(opts_file
,
923 "options.strategy-option",
924 opts
->xopts
[i
], "^$", 0);
928 static int pick_commits(struct commit_list
*todo_list
, struct replay_opts
*opts
)
930 struct commit_list
*cur
;
933 setenv(GIT_REFLOG_ACTION
, action_name(opts
), 0);
935 assert(!(opts
->signoff
|| opts
->no_commit
||
936 opts
->record_origin
|| opts
->edit
));
937 read_and_refresh_cache(opts
);
939 for (cur
= todo_list
; cur
; cur
= cur
->next
) {
940 save_todo(cur
, opts
);
941 res
= do_pick_commit(cur
->item
, opts
);
945 * An error was encountered while
946 * picking the last commit; the
947 * sequencer state is useless now --
948 * the user simply needs to resolve
949 * the conflict and commit
951 remove_sequencer_state(0);
957 * Sequence of picks finished successfully; cleanup by
958 * removing the .git/sequencer directory
960 remove_sequencer_state(1);
964 static int pick_revisions(struct replay_opts
*opts
)
966 struct commit_list
*todo_list
= NULL
;
967 unsigned char sha1
[20];
969 read_and_refresh_cache(opts
);
972 * Decide what to do depending on the arguments; a fresh
973 * cherry-pick should be handled differently from an existing
974 * one that is being continued
976 if (opts
->subcommand
== REPLAY_REMOVE_STATE
) {
977 remove_sequencer_state(1);
980 if (opts
->subcommand
== REPLAY_CONTINUE
) {
981 if (!file_exists(git_path(SEQ_TODO_FILE
)))
982 return error(_("No %s in progress"), action_name(opts
));
983 read_populate_opts(&opts
);
984 read_populate_todo(&todo_list
, opts
);
986 /* Verify that the conflict has been resolved */
987 if (!index_differs_from("HEAD", 0))
988 todo_list
= todo_list
->next
;
989 return pick_commits(todo_list
, opts
);
993 * Start a new cherry-pick/ revert sequence; but
994 * first, make sure that an existing one isn't in
998 walk_revs_populate_todo(&todo_list
, opts
);
999 if (create_seq_dir() < 0)
1001 if (get_sha1("HEAD", sha1
)) {
1002 if (opts
->action
== REVERT
)
1003 return error(_("Can't revert as initial commit"));
1004 return error(_("Can't cherry-pick into empty head"));
1006 save_head(sha1_to_hex(sha1
));
1008 return pick_commits(todo_list
, opts
);
1011 int cmd_revert(int argc
, const char **argv
, const char *prefix
)
1013 struct replay_opts opts
;
1016 memset(&opts
, 0, sizeof(opts
));
1019 opts
.action
= REVERT
;
1020 git_config(git_default_config
, NULL
);
1021 parse_args(argc
, argv
, &opts
);
1022 res
= pick_revisions(&opts
);
1024 die(_("revert failed"));
1028 int cmd_cherry_pick(int argc
, const char **argv
, const char *prefix
)
1030 struct replay_opts opts
;
1033 memset(&opts
, 0, sizeof(opts
));
1034 opts
.action
= CHERRY_PICK
;
1035 git_config(git_default_config
, NULL
);
1036 parse_args(argc
, argv
, &opts
);
1037 res
= pick_revisions(&opts
);
1039 die(_("cherry-pick failed"));