cherry-pick/revert: add scissors line on merge conflict
[git/git.git] / builtin / revert.c
CommitLineData
9509af68 1#include "cache.h"
b2141fc1 2#include "config.h"
9509af68 3#include "builtin.h"
f8103794 4#include "parse-options.h"
0f2d4476
JK
5#include "diff.h"
6#include "revision.h"
aa1a0111 7#include "rerere.h"
04d3d3cf 8#include "dir.h"
26ae337b 9#include "sequencer.h"
3e7dd992 10#include "branch.h"
9509af68
JS
11
12/*
13 * This implements the builtins revert and cherry-pick.
14 *
15 * Copyright (c) 2007 Johannes E. Schindelin
16 *
17 * Based on git-revert.sh, which is
18 *
19 * Copyright (c) 2005 Linus Torvalds
20 * Copyright (c) 2005 Junio C Hamano
21 */
22
f8103794 23static const char * const revert_usage[] = {
9c9b4f2f 24 N_("git revert [<options>] <commit-ish>..."),
a3b26dc7 25 N_("git revert <subcommand>"),
f8103794
PH
26 NULL
27};
9509af68 28
f8103794 29static const char * const cherry_pick_usage[] = {
9c9b4f2f 30 N_("git cherry-pick [<options>] <commit-ish>..."),
a3b26dc7 31 N_("git cherry-pick <subcommand>"),
f8103794
PH
32 NULL
33};
9509af68 34
80e1f791
RR
35static const char *action_name(const struct replay_opts *opts)
36{
644a3690 37 return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
80e1f791
RR
38}
39
80e1f791 40static const char * const *revert_or_cherry_pick_usage(struct replay_opts *opts)
e0ef8495 41{
644a3690 42 return opts->action == REPLAY_REVERT ? revert_usage : cherry_pick_usage;
e0ef8495
JN
43}
44
67ac1e1d
JN
45static int option_parse_x(const struct option *opt,
46 const char *arg, int unset)
47{
80e1f791
RR
48 struct replay_opts **opts_ptr = opt->value;
49 struct replay_opts *opts = *opts_ptr;
50
67ac1e1d
JN
51 if (unset)
52 return 0;
53
80e1f791
RR
54 ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
55 opts->xopts[opts->xopts_nr++] = xstrdup(arg);
67ac1e1d
JN
56 return 0;
57}
58
b16a991c
JK
59static int option_parse_m(const struct option *opt,
60 const char *arg, int unset)
61{
62 struct replay_opts *replay = opt->value;
63 char *end;
64
65 if (unset) {
66 replay->mainline = 0;
67 return 0;
68 }
69
70 replay->mainline = strtol(arg, &end, 10);
71 if (*end || replay->mainline <= 0)
9440b831
NTND
72 return error(_("option `%s' expects a number greater than zero"),
73 opt->long_name);
b16a991c
JK
74
75 return 0;
76}
77
9fe3edc4 78LAST_ARG_MUST_BE_NULL
9044143f
RR
79static void verify_opt_compatible(const char *me, const char *base_opt, ...)
80{
81 const char *this_opt;
82 va_list ap;
83
84 va_start(ap, base_opt);
85 while ((this_opt = va_arg(ap, const char *))) {
86 if (va_arg(ap, int))
87 break;
88 }
89 va_end(ap);
90
91 if (this_opt)
92 die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
93}
94
2863584f 95static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
9509af68 96{
80e1f791 97 const char * const * usage_str = revert_or_cherry_pick_usage(opts);
9044143f 98 const char *me = action_name(opts);
1a2b985f 99 const char *cleanup_arg = NULL;
84d83f64 100 int cmd = 0;
023ff39b 101 struct option base_options[] = {
84d83f64
SB
102 OPT_CMDMODE(0, "quit", &cmd, N_("end revert or cherry-pick sequence"), 'q'),
103 OPT_CMDMODE(0, "continue", &cmd, N_("resume revert or cherry-pick sequence"), 'c'),
104 OPT_CMDMODE(0, "abort", &cmd, N_("cancel revert or cherry-pick sequence"), 'a'),
1a2b985f 105 OPT_CLEANUP(&cleanup_arg),
84d83f64
SB
106 OPT_BOOL('n', "no-commit", &opts->no_commit, N_("don't automatically commit")),
107 OPT_BOOL('e', "edit", &opts->edit, N_("edit the commit message")),
7cfc6057 108 OPT_NOOP_NOARG('r', NULL),
84d83f64 109 OPT_BOOL('s', "signoff", &opts->signoff, N_("add Signed-off-by:")),
b16a991c
JK
110 OPT_CALLBACK('m', "mainline", opts, N_("parent-number"),
111 N_("select mainline parent"), option_parse_m),
80e1f791 112 OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto),
a3b26dc7
NTND
113 OPT_STRING(0, "strategy", &opts->strategy, N_("strategy"), N_("merge strategy")),
114 OPT_CALLBACK('X', "strategy-option", &opts, N_("option"),
115 N_("option for merge strategy"), option_parse_x),
e703d711 116 { OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key-id"),
3253553e 117 N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
023ff39b 118 OPT_END()
f8103794 119 };
023ff39b 120 struct option *options = base_options;
f8103794 121
644a3690 122 if (opts->action == REPLAY_PICK) {
c62f6ec3 123 struct option cp_extra[] = {
84d83f64
SB
124 OPT_BOOL('x', NULL, &opts->record_origin, N_("append commit name")),
125 OPT_BOOL(0, "ff", &opts->allow_ff, N_("allow fast-forward")),
126 OPT_BOOL(0, "allow-empty", &opts->allow_empty, N_("preserve initially empty commits")),
127 OPT_BOOL(0, "allow-empty-message", &opts->allow_empty_message, N_("allow commits with empty messages")),
128 OPT_BOOL(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")),
c62f6ec3
JH
129 OPT_END(),
130 };
023ff39b 131 options = parse_options_concat(options, cp_extra);
c62f6ec3
JH
132 }
133
7f13334e
JN
134 argc = parse_options(argc, argv, NULL, options, usage_str,
135 PARSE_OPT_KEEP_ARGV0 |
136 PARSE_OPT_KEEP_UNKNOWN);
26ae337b 137
b27cfb0d
NH
138 /* implies allow_empty */
139 if (opts->keep_redundant_commits)
140 opts->allow_empty = 1;
141
1a2b985f
DL
142 if (cleanup_arg) {
143 opts->default_msg_cleanup = get_cleanup_mode(cleanup_arg, 1);
144 opts->explicit_cleanup = 1;
145 }
146
26ae337b 147 /* Check for incompatible command line arguments */
2863584f 148 if (cmd) {
5a5d80f4 149 char *this_operation;
2863584f 150 if (cmd == 'q')
f80a8726 151 this_operation = "--quit";
2863584f 152 else if (cmd == 'c')
5a5d80f4 153 this_operation = "--continue";
539047c1 154 else {
2863584f 155 assert(cmd == 'a');
539047c1
JN
156 this_operation = "--abort";
157 }
5a5d80f4
RR
158
159 verify_opt_compatible(me, this_operation,
26ae337b
RR
160 "--no-commit", opts->no_commit,
161 "--signoff", opts->signoff,
162 "--mainline", opts->mainline,
163 "--strategy", opts->strategy ? 1 : 0,
164 "--strategy-option", opts->xopts ? 1 : 0,
165 "-x", opts->record_origin,
166 "--ff", opts->allow_ff,
f826fb79
PW
167 "--rerere-autoupdate", opts->allow_rerere_auto == RERERE_AUTOUPDATE,
168 "--no-rerere-autoupdate", opts->allow_rerere_auto == RERERE_NOAUTOUPDATE,
26ae337b
RR
169 NULL);
170 }
171
9044143f
RR
172 if (opts->allow_ff)
173 verify_opt_compatible(me, "--ff",
174 "--signoff", opts->signoff,
175 "--no-commit", opts->no_commit,
176 "-x", opts->record_origin,
177 "--edit", opts->edit,
178 NULL);
7f13334e 179
2863584f 180 if (cmd) {
7f13334e
JN
181 opts->revs = NULL;
182 } else {
6d5b93f2 183 struct setup_revision_opt s_r_opt;
7f13334e 184 opts->revs = xmalloc(sizeof(*opts->revs));
2abf3503 185 repo_init_revisions(the_repository, opts->revs, NULL);
a73e22e9 186 opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
7f13334e
JN
187 if (argc < 2)
188 usage_with_options(usage_str, options);
d644c550
JK
189 if (!strcmp(argv[1], "-"))
190 argv[1] = "@{-1}";
6d5b93f2
CB
191 memset(&s_r_opt, 0, sizeof(s_r_opt));
192 s_r_opt.assume_dashdash = 1;
193 argc = setup_revisions(argc, argv, opts->revs, &s_r_opt);
7f13334e
JN
194 }
195
196 if (argc > 1)
197 usage_with_options(usage_str, options);
03a4e260
JS
198
199 /* These option values will be free()d */
200 opts->gpg_sign = xstrdup_or_null(opts->gpg_sign);
201 opts->strategy = xstrdup_or_null(opts->strategy);
2863584f 202
3e7dd992
NTND
203 if (cmd == 'q') {
204 int ret = sequencer_remove_state(opts);
205 if (!ret)
4edce172 206 remove_branch_state(the_repository);
3e7dd992
NTND
207 return ret;
208 }
2863584f 209 if (cmd == 'c')
f11c9580 210 return sequencer_continue(the_repository, opts);
2863584f 211 if (cmd == 'a')
005af339 212 return sequencer_rollback(the_repository, opts);
f11c9580 213 return sequencer_pick_revisions(the_repository, opts);
9509af68
JS
214}
215
9509af68
JS
216int cmd_revert(int argc, const char **argv, const char *prefix)
217{
ee624c0d 218 struct replay_opts opts = REPLAY_OPTS_INIT;
cf3e2486 219 int res;
80e1f791 220
9509af68 221 if (isatty(0))
80e1f791 222 opts.edit = 1;
644a3690 223 opts.action = REPLAY_REVERT;
28d6daed 224 sequencer_init_config(&opts);
2863584f 225 res = run_sequencer(argc, argv, &opts);
cf3e2486
RR
226 if (res < 0)
227 die(_("revert failed"));
228 return res;
9509af68
JS
229}
230
231int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
232{
ee624c0d 233 struct replay_opts opts = REPLAY_OPTS_INIT;
cf3e2486 234 int res;
80e1f791 235
644a3690 236 opts.action = REPLAY_PICK;
28d6daed 237 sequencer_init_config(&opts);
2863584f 238 res = run_sequencer(argc, argv, &opts);
cf3e2486
RR
239 if (res < 0)
240 die(_("cherry-pick failed"));
241 return res;
9509af68 242}