git-cherry-pick: add allow-empty option
[git/git.git] / builtin / revert.c
CommitLineData
9509af68
JS
1#include "cache.h"
2#include "builtin.h"
f8103794 3#include "parse-options.h"
0f2d4476
JK
4#include "diff.h"
5#include "revision.h"
aa1a0111 6#include "rerere.h"
04d3d3cf 7#include "dir.h"
26ae337b 8#include "sequencer.h"
9509af68
JS
9
10/*
11 * This implements the builtins revert and cherry-pick.
12 *
13 * Copyright (c) 2007 Johannes E. Schindelin
14 *
15 * Based on git-revert.sh, which is
16 *
17 * Copyright (c) 2005 Linus Torvalds
18 * Copyright (c) 2005 Junio C Hamano
19 */
20
f8103794 21static const char * const revert_usage[] = {
1b1dd23f 22 "git revert [options] <commit-ish>",
26ae337b 23 "git revert <subcommand>",
f8103794
PH
24 NULL
25};
9509af68 26
f8103794 27static const char * const cherry_pick_usage[] = {
1b1dd23f 28 "git cherry-pick [options] <commit-ish>",
26ae337b 29 "git cherry-pick <subcommand>",
f8103794
PH
30 NULL
31};
9509af68 32
80e1f791
RR
33static const char *action_name(const struct replay_opts *opts)
34{
644a3690 35 return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
80e1f791
RR
36}
37
80e1f791 38static const char * const *revert_or_cherry_pick_usage(struct replay_opts *opts)
e0ef8495 39{
644a3690 40 return opts->action == REPLAY_REVERT ? revert_usage : cherry_pick_usage;
e0ef8495
JN
41}
42
67ac1e1d
JN
43static int option_parse_x(const struct option *opt,
44 const char *arg, int unset)
45{
80e1f791
RR
46 struct replay_opts **opts_ptr = opt->value;
47 struct replay_opts *opts = *opts_ptr;
48
67ac1e1d
JN
49 if (unset)
50 return 0;
51
80e1f791
RR
52 ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
53 opts->xopts[opts->xopts_nr++] = xstrdup(arg);
67ac1e1d
JN
54 return 0;
55}
56
9044143f
RR
57static void verify_opt_compatible(const char *me, const char *base_opt, ...)
58{
59 const char *this_opt;
60 va_list ap;
61
62 va_start(ap, base_opt);
63 while ((this_opt = va_arg(ap, const char *))) {
64 if (va_arg(ap, int))
65 break;
66 }
67 va_end(ap);
68
69 if (this_opt)
70 die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
71}
72
5a5d80f4
RR
73static void verify_opt_mutually_compatible(const char *me, ...)
74{
27c0f768 75 const char *opt1, *opt2 = NULL;
5a5d80f4
RR
76 va_list ap;
77
78 va_start(ap, me);
79 while ((opt1 = va_arg(ap, const char *))) {
80 if (va_arg(ap, int))
81 break;
82 }
83 if (opt1) {
84 while ((opt2 = va_arg(ap, const char *))) {
85 if (va_arg(ap, int))
86 break;
87 }
88 }
89
90 if (opt1 && opt2)
91 die(_("%s: %s cannot be used with %s"), me, opt1, opt2);
92}
93
80e1f791 94static void parse_args(int argc, const char **argv, struct replay_opts *opts)
9509af68 95{
80e1f791 96 const char * const * usage_str = revert_or_cherry_pick_usage(opts);
9044143f 97 const char *me = action_name(opts);
f80a8726 98 int remove_state = 0;
5a5d80f4 99 int contin = 0;
539047c1 100 int rollback = 0;
f8103794 101 struct option options[] = {
f80a8726
JN
102 OPT_BOOLEAN(0, "quit", &remove_state, "end revert or cherry-pick sequence"),
103 OPT_BOOLEAN(0, "continue", &contin, "resume revert or cherry-pick sequence"),
539047c1 104 OPT_BOOLEAN(0, "abort", &rollback, "cancel revert or cherry-pick sequence"),
80e1f791
RR
105 OPT_BOOLEAN('n', "no-commit", &opts->no_commit, "don't automatically commit"),
106 OPT_BOOLEAN('e', "edit", &opts->edit, "edit the commit message"),
7cfc6057 107 OPT_NOOP_NOARG('r', NULL),
80e1f791
RR
108 OPT_BOOLEAN('s', "signoff", &opts->signoff, "add Signed-off-by:"),
109 OPT_INTEGER('m', "mainline", &opts->mainline, "parent number"),
110 OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto),
111 OPT_STRING(0, "strategy", &opts->strategy, "strategy", "merge strategy"),
112 OPT_CALLBACK('X', "strategy-option", &opts, "option",
67ac1e1d 113 "option for merge strategy", option_parse_x),
f8103794 114 OPT_END(),
c62f6ec3
JH
115 OPT_END(),
116 OPT_END(),
df478b74 117 OPT_END(),
f8103794
PH
118 };
119
644a3690 120 if (opts->action == REPLAY_PICK) {
c62f6ec3 121 struct option cp_extra[] = {
80e1f791
RR
122 OPT_BOOLEAN('x', NULL, &opts->record_origin, "append commit name"),
123 OPT_BOOLEAN(0, "ff", &opts->allow_ff, "allow fast-forward"),
df478b74 124 OPT_BOOLEAN(0, "allow-empty", &opts->allow_empty, "preserve empty commits"),
c62f6ec3
JH
125 OPT_END(),
126 };
127 if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
f30f71ce 128 die(_("program error"));
c62f6ec3
JH
129 }
130
7f13334e
JN
131 argc = parse_options(argc, argv, NULL, options, usage_str,
132 PARSE_OPT_KEEP_ARGV0 |
133 PARSE_OPT_KEEP_UNKNOWN);
26ae337b 134
5a5d80f4
RR
135 /* Check for incompatible subcommands */
136 verify_opt_mutually_compatible(me,
f80a8726 137 "--quit", remove_state,
5a5d80f4 138 "--continue", contin,
539047c1 139 "--abort", rollback,
5a5d80f4
RR
140 NULL);
141
26ae337b 142 /* Set the subcommand */
f80a8726
JN
143 if (remove_state)
144 opts->subcommand = REPLAY_REMOVE_STATE;
5a5d80f4
RR
145 else if (contin)
146 opts->subcommand = REPLAY_CONTINUE;
539047c1
JN
147 else if (rollback)
148 opts->subcommand = REPLAY_ROLLBACK;
26ae337b
RR
149 else
150 opts->subcommand = REPLAY_NONE;
151
152 /* Check for incompatible command line arguments */
5a5d80f4
RR
153 if (opts->subcommand != REPLAY_NONE) {
154 char *this_operation;
f80a8726
JN
155 if (opts->subcommand == REPLAY_REMOVE_STATE)
156 this_operation = "--quit";
539047c1 157 else if (opts->subcommand == REPLAY_CONTINUE)
5a5d80f4 158 this_operation = "--continue";
539047c1
JN
159 else {
160 assert(opts->subcommand == REPLAY_ROLLBACK);
161 this_operation = "--abort";
162 }
5a5d80f4
RR
163
164 verify_opt_compatible(me, this_operation,
26ae337b
RR
165 "--no-commit", opts->no_commit,
166 "--signoff", opts->signoff,
167 "--mainline", opts->mainline,
168 "--strategy", opts->strategy ? 1 : 0,
169 "--strategy-option", opts->xopts ? 1 : 0,
170 "-x", opts->record_origin,
171 "--ff", opts->allow_ff,
172 NULL);
173 }
174
9044143f
RR
175 if (opts->allow_ff)
176 verify_opt_compatible(me, "--ff",
177 "--signoff", opts->signoff,
178 "--no-commit", opts->no_commit,
179 "-x", opts->record_origin,
180 "--edit", opts->edit,
181 NULL);
7f13334e
JN
182
183 if (opts->subcommand != REPLAY_NONE) {
184 opts->revs = NULL;
185 } else {
186 opts->revs = xmalloc(sizeof(*opts->revs));
187 init_revisions(opts->revs, NULL);
188 opts->revs->no_walk = 1;
189 if (argc < 2)
190 usage_with_options(usage_str, options);
191 argc = setup_revisions(argc, argv, opts->revs, NULL);
192 }
193
194 if (argc > 1)
195 usage_with_options(usage_str, options);
9509af68
JS
196}
197
9509af68
JS
198int cmd_revert(int argc, const char **argv, const char *prefix)
199{
80e1f791 200 struct replay_opts opts;
cf3e2486 201 int res;
80e1f791
RR
202
203 memset(&opts, 0, sizeof(opts));
9509af68 204 if (isatty(0))
80e1f791 205 opts.edit = 1;
644a3690 206 opts.action = REPLAY_REVERT;
89641472
RR
207 git_config(git_default_config, NULL);
208 parse_args(argc, argv, &opts);
043a4492 209 res = sequencer_pick_revisions(&opts);
cf3e2486
RR
210 if (res < 0)
211 die(_("revert failed"));
212 return res;
9509af68
JS
213}
214
215int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
216{
80e1f791 217 struct replay_opts opts;
cf3e2486 218 int res;
80e1f791
RR
219
220 memset(&opts, 0, sizeof(opts));
644a3690 221 opts.action = REPLAY_PICK;
89641472
RR
222 git_config(git_default_config, NULL);
223 parse_args(argc, argv, &opts);
043a4492 224 res = sequencer_pick_revisions(&opts);
cf3e2486
RR
225 if (res < 0)
226 die(_("cherry-pick failed"));
227 return res;
9509af68 228}