6 #include "run-command.h"
9 #include "parse-options.h"
10 #include "cache-tree.h"
14 #include "merge-recursive.h"
18 * This implements the builtins revert and cherry-pick.
20 * Copyright (c) 2007 Johannes E. Schindelin
22 * Based on git-revert.sh, which is
24 * Copyright (c) 2005 Linus Torvalds
25 * Copyright (c) 2005 Junio C Hamano
28 static const char * const revert_usage
[] = {
29 "git revert [options] <commit-ish>",
33 static const char * const cherry_pick_usage
[] = {
34 "git cherry-pick [options] <commit-ish>",
38 static int edit
, no_replay
, no_commit
, mainline
, signoff
, allow_ff
;
39 static enum { REVERT
, CHERRY_PICK
} action
;
40 static struct commit
*commit
;
41 static int commit_argc
;
42 static const char **commit_argv
;
43 static int allow_rerere_auto
;
45 static const char *me
;
48 static const char *strategy
;
49 static const char **xopts
;
50 static size_t xopts_nr
, xopts_alloc
;
52 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
54 static char *get_encoding(const char *message
);
56 static const char * const *revert_or_cherry_pick_usage(void)
58 return action
== REVERT
? revert_usage
: cherry_pick_usage
;
61 static int option_parse_x(const struct option
*opt
,
62 const char *arg
, int unset
)
67 ALLOC_GROW(xopts
, xopts_nr
+ 1, xopts_alloc
);
68 xopts
[xopts_nr
++] = xstrdup(arg
);
72 static void parse_args(int argc
, const char **argv
)
74 const char * const * usage_str
= revert_or_cherry_pick_usage();
76 struct option options
[] = {
77 OPT_BOOLEAN('n', "no-commit", &no_commit
, "don't automatically commit"),
78 OPT_BOOLEAN('e', "edit", &edit
, "edit the commit message"),
79 { OPTION_BOOLEAN
, 'r', NULL
, &noop
, NULL
, "no-op (backward compatibility)",
80 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
, NULL
, 0 },
81 OPT_BOOLEAN('s', "signoff", &signoff
, "add Signed-off-by:"),
82 OPT_INTEGER('m', "mainline", &mainline
, "parent number"),
83 OPT_RERERE_AUTOUPDATE(&allow_rerere_auto
),
84 OPT_STRING(0, "strategy", &strategy
, "strategy", "merge strategy"),
85 OPT_CALLBACK('X', "strategy-option", &xopts
, "option",
86 "option for merge strategy", option_parse_x
),
92 if (action
== CHERRY_PICK
) {
93 struct option cp_extra
[] = {
94 OPT_BOOLEAN('x', NULL
, &no_replay
, "append commit name"),
95 OPT_BOOLEAN(0, "ff", &allow_ff
, "allow fast-forward"),
98 if (parse_options_concat(options
, ARRAY_SIZE(options
), cp_extra
))
99 die(_("program error"));
102 commit_argc
= parse_options(argc
, argv
, NULL
, options
, usage_str
,
103 PARSE_OPT_KEEP_ARGV0
|
104 PARSE_OPT_KEEP_UNKNOWN
);
106 usage_with_options(usage_str
, options
);
111 struct commit_message
{
115 char *reencoded_message
;
119 static int get_message(const char *raw_message
, struct commit_message
*out
)
121 const char *encoding
;
122 const char *abbrev
, *subject
;
123 int abbrev_len
, subject_len
;
128 encoding
= get_encoding(raw_message
);
131 if (!git_commit_encoding
)
132 git_commit_encoding
= "UTF-8";
134 out
->reencoded_message
= NULL
;
135 out
->message
= raw_message
;
136 if (strcmp(encoding
, git_commit_encoding
))
137 out
->reencoded_message
= reencode_string(raw_message
,
138 git_commit_encoding
, encoding
);
139 if (out
->reencoded_message
)
140 out
->message
= out
->reencoded_message
;
142 abbrev
= find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
);
143 abbrev_len
= strlen(abbrev
);
145 subject_len
= find_commit_subject(out
->message
, &subject
);
147 out
->parent_label
= xmalloc(strlen("parent of ") + abbrev_len
+
148 strlen("... ") + subject_len
+ 1);
149 q
= out
->parent_label
;
150 q
= mempcpy(q
, "parent of ", strlen("parent of "));
152 q
= mempcpy(q
, abbrev
, abbrev_len
);
153 q
= mempcpy(q
, "... ", strlen("... "));
155 q
= mempcpy(q
, subject
, subject_len
);
160 static void free_message(struct commit_message
*msg
)
162 free(msg
->parent_label
);
163 free(msg
->reencoded_message
);
166 static char *get_encoding(const char *message
)
168 const char *p
= message
, *eol
;
171 die (_("Could not read commit message of %s"),
172 sha1_to_hex(commit
->object
.sha1
));
173 while (*p
&& *p
!= '\n') {
174 for (eol
= p
+ 1; *eol
&& *eol
!= '\n'; eol
++)
176 if (!prefixcmp(p
, "encoding ")) {
177 char *result
= xmalloc(eol
- 8 - p
);
178 strlcpy(result
, p
+ 9, eol
- 8 - p
);
188 static void write_cherry_pick_head(void)
191 struct strbuf buf
= STRBUF_INIT
;
193 strbuf_addf(&buf
, "%s\n", sha1_to_hex(commit
->object
.sha1
));
195 fd
= open(git_path("CHERRY_PICK_HEAD"), O_WRONLY
| O_CREAT
, 0666);
197 die_errno(_("Could not open '%s' for writing"),
198 git_path("CHERRY_PICK_HEAD"));
199 if (write_in_full(fd
, buf
.buf
, buf
.len
) != buf
.len
|| close(fd
))
200 die_errno(_("Could not write to '%s'"), git_path("CHERRY_PICK_HEAD"));
201 strbuf_release(&buf
);
204 static void print_advice(void)
206 char *msg
= getenv("GIT_CHERRY_PICK_HELP");
209 fprintf(stderr
, "%s\n", msg
);
211 * A conflict has occured but the porcelain
212 * (typically rebase --interactive) wants to take care
213 * of the commit itself so remove CHERRY_PICK_HEAD
215 unlink(git_path("CHERRY_PICK_HEAD"));
219 advise("after resolving the conflicts, mark the corrected paths");
220 advise("with 'git add <paths>' or 'git rm <paths>'");
221 advise("and commit the result with 'git commit'");
224 static void write_message(struct strbuf
*msgbuf
, const char *filename
)
226 static struct lock_file msg_file
;
228 int msg_fd
= hold_lock_file_for_update(&msg_file
, filename
,
230 if (write_in_full(msg_fd
, msgbuf
->buf
, msgbuf
->len
) < 0)
231 die_errno(_("Could not write to %s."), filename
);
232 strbuf_release(msgbuf
);
233 if (commit_lock_file(&msg_file
) < 0)
234 die(_("Error wrapping up %s"), filename
);
237 static struct tree
*empty_tree(void)
239 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
241 tree
->object
.parsed
= 1;
242 tree
->object
.type
= OBJ_TREE
;
243 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
247 static NORETURN
void die_dirty_index(const char *me
)
249 if (read_cache_unmerged()) {
250 die_resolve_conflict(me
);
252 if (advice_commit_before_merge
) {
253 if (action
== REVERT
)
254 die(_("Your local changes would be overwritten by revert.\n"
255 "Please, commit your changes or stash them to proceed."));
257 die(_("Your local changes would be overwritten by cherry-pick.\n"
258 "Please, commit your changes or stash them to proceed."));
260 if (action
== REVERT
)
261 die(_("Your local changes would be overwritten by revert.\n"));
263 die(_("Your local changes would be overwritten by cherry-pick.\n"));
268 static int fast_forward_to(const unsigned char *to
, const unsigned char *from
)
270 struct ref_lock
*ref_lock
;
273 if (checkout_fast_forward(from
, to
))
274 exit(1); /* the callee should have complained already */
275 ref_lock
= lock_any_ref_for_update("HEAD", from
, 0);
276 return write_ref_sha1(ref_lock
, to
, "cherry-pick");
279 static int do_recursive_merge(struct commit
*base
, struct commit
*next
,
280 const char *base_label
, const char *next_label
,
281 unsigned char *head
, struct strbuf
*msgbuf
)
283 struct merge_options o
;
284 struct tree
*result
, *next_tree
, *base_tree
, *head_tree
;
287 static struct lock_file index_lock
;
289 index_fd
= hold_locked_index(&index_lock
, 1);
293 init_merge_options(&o
);
294 o
.ancestor
= base
? base_label
: "(empty tree)";
296 o
.branch2
= next
? next_label
: "(empty tree)";
298 head_tree
= parse_tree_indirect(head
);
299 next_tree
= next
? next
->tree
: empty_tree();
300 base_tree
= base
? base
->tree
: empty_tree();
302 for (xopt
= xopts
; xopt
!= xopts
+ xopts_nr
; xopt
++)
303 parse_merge_opt(&o
, *xopt
);
305 clean
= merge_trees(&o
,
307 next_tree
, base_tree
, &result
);
309 if (active_cache_changed
&&
310 (write_cache(index_fd
, active_cache
, active_nr
) ||
311 commit_locked_index(&index_lock
)))
312 /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
313 die(_("%s: Unable to write new index file"), me
);
314 rollback_lock_file(&index_lock
);
318 strbuf_addstr(msgbuf
, "\nConflicts:\n\n");
319 for (i
= 0; i
< active_nr
;) {
320 struct cache_entry
*ce
= active_cache
[i
++];
322 strbuf_addch(msgbuf
, '\t');
323 strbuf_addstr(msgbuf
, ce
->name
);
324 strbuf_addch(msgbuf
, '\n');
325 while (i
< active_nr
&& !strcmp(ce
->name
,
326 active_cache
[i
]->name
))
336 * If we are cherry-pick, and if the merge did not result in
337 * hand-editing, we will hit this commit and inherit the original
338 * author date and name.
339 * If we are revert, or if our cherry-pick results in a hand merge,
340 * we had better say that the current user is responsible for that.
342 static int run_git_commit(const char *defmsg
)
344 /* 6 is max possible length of our args array including NULL */
348 args
[i
++] = "commit";
358 return run_command_v_opt(args
, RUN_GIT_CMD
);
361 static int do_pick_commit(void)
363 unsigned char head
[20];
364 struct commit
*base
, *next
, *parent
;
365 const char *base_label
, *next_label
;
366 struct commit_message msg
= { NULL
, NULL
, NULL
, NULL
, NULL
};
368 struct strbuf msgbuf
= STRBUF_INIT
;
373 * We do not intend to commit immediately. We just want to
374 * merge the differences in, so let's compute the tree
375 * that represents the "current" state for merge-recursive
378 if (write_cache_as_tree(head
, 0, NULL
))
379 die (_("Your index file is unmerged."));
381 if (get_sha1("HEAD", head
))
382 die (_("You do not have a valid HEAD"));
383 if (index_differs_from("HEAD", 0))
388 if (!commit
->parents
) {
391 else if (commit
->parents
->next
) {
392 /* Reverting or cherry-picking a merge commit */
394 struct commit_list
*p
;
397 die(_("Commit %s is a merge but no -m option was given."),
398 sha1_to_hex(commit
->object
.sha1
));
400 for (cnt
= 1, p
= commit
->parents
;
401 cnt
!= mainline
&& p
;
404 if (cnt
!= mainline
|| !p
)
405 die(_("Commit %s does not have parent %d"),
406 sha1_to_hex(commit
->object
.sha1
), mainline
);
408 } else if (0 < mainline
)
409 die(_("Mainline was specified but commit %s is not a merge."),
410 sha1_to_hex(commit
->object
.sha1
));
412 parent
= commit
->parents
->item
;
414 if (allow_ff
&& parent
&& !hashcmp(parent
->object
.sha1
, head
))
415 return fast_forward_to(commit
->object
.sha1
, head
);
417 if (parent
&& parse_commit(parent
) < 0)
418 /* TRANSLATORS: The first %s will be "revert" or
419 "cherry-pick", the second %s a SHA1 */
420 die(_("%s: cannot parse parent commit %s"),
421 me
, sha1_to_hex(parent
->object
.sha1
));
423 if (get_message(commit
->buffer
, &msg
) != 0)
424 die(_("Cannot get commit message for %s"),
425 sha1_to_hex(commit
->object
.sha1
));
428 * "commit" is an existing commit. We would want to apply
429 * the difference it introduces since its first parent "prev"
430 * on top of the current HEAD if we are cherry-pick. Or the
431 * reverse of it if we are revert.
434 defmsg
= git_pathdup("MERGE_MSG");
436 if (action
== REVERT
) {
438 base_label
= msg
.label
;
440 next_label
= msg
.parent_label
;
441 strbuf_addstr(&msgbuf
, "Revert \"");
442 strbuf_addstr(&msgbuf
, msg
.subject
);
443 strbuf_addstr(&msgbuf
, "\"\n\nThis reverts commit ");
444 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
446 if (commit
->parents
&& commit
->parents
->next
) {
447 strbuf_addstr(&msgbuf
, ", reversing\nchanges made to ");
448 strbuf_addstr(&msgbuf
, sha1_to_hex(parent
->object
.sha1
));
450 strbuf_addstr(&msgbuf
, ".\n");
455 base_label
= msg
.parent_label
;
457 next_label
= msg
.label
;
460 * Append the commit log message to msgbuf; it starts
461 * after the tree, parent, author, committer
462 * information followed by "\n\n".
464 p
= strstr(msg
.message
, "\n\n");
467 strbuf_addstr(&msgbuf
, p
);
471 strbuf_addstr(&msgbuf
, "(cherry picked from commit ");
472 strbuf_addstr(&msgbuf
, sha1_to_hex(commit
->object
.sha1
));
473 strbuf_addstr(&msgbuf
, ")\n");
476 write_cherry_pick_head();
479 if (!strategy
|| !strcmp(strategy
, "recursive") || action
== REVERT
) {
480 res
= do_recursive_merge(base
, next
, base_label
, next_label
,
482 write_message(&msgbuf
, defmsg
);
484 struct commit_list
*common
= NULL
;
485 struct commit_list
*remotes
= NULL
;
487 write_message(&msgbuf
, defmsg
);
489 commit_list_insert(base
, &common
);
490 commit_list_insert(next
, &remotes
);
491 res
= try_merge_command(strategy
, xopts_nr
, xopts
, common
,
492 sha1_to_hex(head
), remotes
);
493 free_commit_list(common
);
494 free_commit_list(remotes
);
498 error(action
== REVERT
499 ? _("could not revert %s... %s")
500 : _("could not apply %s... %s"),
501 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
),
504 rerere(allow_rerere_auto
);
507 res
= run_git_commit(defmsg
);
516 static void prepare_revs(struct rev_info
*revs
)
520 init_revisions(revs
, NULL
);
522 if (action
!= REVERT
)
525 argc
= setup_revisions(commit_argc
, commit_argv
, revs
, NULL
);
527 usage(*revert_or_cherry_pick_usage());
529 if (prepare_revision_walk(revs
))
530 die(_("revision walk setup failed"));
533 die(_("empty commit set passed"));
536 static void read_and_refresh_cache(const char *me
)
538 static struct lock_file index_lock
;
539 int index_fd
= hold_locked_index(&index_lock
, 0);
540 if (read_index_preload(&the_index
, NULL
) < 0)
541 die(_("git %s: failed to read the index"), me
);
542 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, NULL
, NULL
, NULL
);
543 if (the_index
.cache_changed
) {
544 if (write_index(&the_index
, index_fd
) ||
545 commit_locked_index(&index_lock
))
546 die(_("git %s: failed to refresh the index"), me
);
548 rollback_lock_file(&index_lock
);
551 static int revert_or_cherry_pick(int argc
, const char **argv
)
553 struct rev_info revs
;
555 git_config(git_default_config
, NULL
);
556 me
= action
== REVERT
? "revert" : "cherry-pick";
557 setenv(GIT_REFLOG_ACTION
, me
, 0);
558 parse_args(argc
, argv
);
562 die(_("cherry-pick --ff cannot be used with --signoff"));
564 die(_("cherry-pick --ff cannot be used with --no-commit"));
566 die(_("cherry-pick --ff cannot be used with -x"));
568 die(_("cherry-pick --ff cannot be used with --edit"));
571 read_and_refresh_cache(me
);
575 while ((commit
= get_revision(&revs
))) {
576 int res
= do_pick_commit();
584 int cmd_revert(int argc
, const char **argv
, const char *prefix
)
589 return revert_or_cherry_pick(argc
, argv
);
592 int cmd_cherry_pick(int argc
, const char **argv
, const char *prefix
)
594 action
= CHERRY_PICK
;
595 return revert_or_cherry_pick(argc
, argv
);