Merge branch 'cc/fix-missing-va-end-in-revert'
[git.git] / builtin / revert.c
blobe4ed0239ca7cbc0f33f2cf02d6287e681ca535bf
1 #include "cache.h"
2 #include "builtin.h"
3 #include "parse-options.h"
4 #include "diff.h"
5 #include "revision.h"
6 #include "rerere.h"
7 #include "dir.h"
8 #include "sequencer.h"
11 * This implements the builtins revert and cherry-pick.
13 * Copyright (c) 2007 Johannes E. Schindelin
15 * Based on git-revert.sh, which is
17 * Copyright (c) 2005 Linus Torvalds
18 * Copyright (c) 2005 Junio C Hamano
21 static const char * const revert_usage[] = {
22 "git revert [options] <commit-ish>",
23 "git revert <subcommand>",
24 NULL
27 static const char * const cherry_pick_usage[] = {
28 "git cherry-pick [options] <commit-ish>",
29 "git cherry-pick <subcommand>",
30 NULL
33 static const char *action_name(const struct replay_opts *opts)
35 return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
38 static const char * const *revert_or_cherry_pick_usage(struct replay_opts *opts)
40 return opts->action == REPLAY_REVERT ? revert_usage : cherry_pick_usage;
43 static int option_parse_x(const struct option *opt,
44 const char *arg, int unset)
46 struct replay_opts **opts_ptr = opt->value;
47 struct replay_opts *opts = *opts_ptr;
49 if (unset)
50 return 0;
52 ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
53 opts->xopts[opts->xopts_nr++] = xstrdup(arg);
54 return 0;
57 static void verify_opt_compatible(const char *me, const char *base_opt, ...)
59 const char *this_opt;
60 va_list ap;
62 va_start(ap, base_opt);
63 while ((this_opt = va_arg(ap, const char *))) {
64 if (va_arg(ap, int))
65 break;
67 va_end(ap);
69 if (this_opt)
70 die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
73 static void verify_opt_mutually_compatible(const char *me, ...)
75 const char *opt1, *opt2 = NULL;
76 va_list ap;
78 va_start(ap, me);
79 while ((opt1 = va_arg(ap, const char *))) {
80 if (va_arg(ap, int))
81 break;
83 if (opt1) {
84 while ((opt2 = va_arg(ap, const char *))) {
85 if (va_arg(ap, int))
86 break;
89 va_end(ap);
91 if (opt1 && opt2)
92 die(_("%s: %s cannot be used with %s"), me, opt1, opt2);
95 static void parse_args(int argc, const char **argv, struct replay_opts *opts)
97 const char * const * usage_str = revert_or_cherry_pick_usage(opts);
98 const char *me = action_name(opts);
99 int remove_state = 0;
100 int contin = 0;
101 int rollback = 0;
102 struct option options[] = {
103 OPT_BOOLEAN(0, "quit", &remove_state, "end revert or cherry-pick sequence"),
104 OPT_BOOLEAN(0, "continue", &contin, "resume revert or cherry-pick sequence"),
105 OPT_BOOLEAN(0, "abort", &rollback, "cancel revert or cherry-pick sequence"),
106 OPT_BOOLEAN('n', "no-commit", &opts->no_commit, "don't automatically commit"),
107 OPT_BOOLEAN('e', "edit", &opts->edit, "edit the commit message"),
108 OPT_NOOP_NOARG('r', NULL),
109 OPT_BOOLEAN('s', "signoff", &opts->signoff, "add Signed-off-by:"),
110 OPT_INTEGER('m', "mainline", &opts->mainline, "parent number"),
111 OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto),
112 OPT_STRING(0, "strategy", &opts->strategy, "strategy", "merge strategy"),
113 OPT_CALLBACK('X', "strategy-option", &opts, "option",
114 "option for merge strategy", option_parse_x),
115 OPT_END(),
116 OPT_END(),
117 OPT_END(),
120 if (opts->action == REPLAY_PICK) {
121 struct option cp_extra[] = {
122 OPT_BOOLEAN('x', NULL, &opts->record_origin, "append commit name"),
123 OPT_BOOLEAN(0, "ff", &opts->allow_ff, "allow fast-forward"),
124 OPT_END(),
126 if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
127 die(_("program error"));
130 argc = parse_options(argc, argv, NULL, options, usage_str,
131 PARSE_OPT_KEEP_ARGV0 |
132 PARSE_OPT_KEEP_UNKNOWN);
134 /* Check for incompatible subcommands */
135 verify_opt_mutually_compatible(me,
136 "--quit", remove_state,
137 "--continue", contin,
138 "--abort", rollback,
139 NULL);
141 /* Set the subcommand */
142 if (remove_state)
143 opts->subcommand = REPLAY_REMOVE_STATE;
144 else if (contin)
145 opts->subcommand = REPLAY_CONTINUE;
146 else if (rollback)
147 opts->subcommand = REPLAY_ROLLBACK;
148 else
149 opts->subcommand = REPLAY_NONE;
151 /* Check for incompatible command line arguments */
152 if (opts->subcommand != REPLAY_NONE) {
153 char *this_operation;
154 if (opts->subcommand == REPLAY_REMOVE_STATE)
155 this_operation = "--quit";
156 else if (opts->subcommand == REPLAY_CONTINUE)
157 this_operation = "--continue";
158 else {
159 assert(opts->subcommand == REPLAY_ROLLBACK);
160 this_operation = "--abort";
163 verify_opt_compatible(me, this_operation,
164 "--no-commit", opts->no_commit,
165 "--signoff", opts->signoff,
166 "--mainline", opts->mainline,
167 "--strategy", opts->strategy ? 1 : 0,
168 "--strategy-option", opts->xopts ? 1 : 0,
169 "-x", opts->record_origin,
170 "--ff", opts->allow_ff,
171 NULL);
174 if (opts->allow_ff)
175 verify_opt_compatible(me, "--ff",
176 "--signoff", opts->signoff,
177 "--no-commit", opts->no_commit,
178 "-x", opts->record_origin,
179 "--edit", opts->edit,
180 NULL);
182 if (opts->subcommand != REPLAY_NONE) {
183 opts->revs = NULL;
184 } else {
185 opts->revs = xmalloc(sizeof(*opts->revs));
186 init_revisions(opts->revs, NULL);
187 opts->revs->no_walk = 1;
188 if (argc < 2)
189 usage_with_options(usage_str, options);
190 argc = setup_revisions(argc, argv, opts->revs, NULL);
193 if (argc > 1)
194 usage_with_options(usage_str, options);
197 int cmd_revert(int argc, const char **argv, const char *prefix)
199 struct replay_opts opts;
200 int res;
202 memset(&opts, 0, sizeof(opts));
203 if (isatty(0))
204 opts.edit = 1;
205 opts.action = REPLAY_REVERT;
206 git_config(git_default_config, NULL);
207 parse_args(argc, argv, &opts);
208 res = sequencer_pick_revisions(&opts);
209 if (res < 0)
210 die(_("revert failed"));
211 return res;
214 int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
216 struct replay_opts opts;
217 int res;
219 memset(&opts, 0, sizeof(opts));
220 opts.action = REPLAY_PICK;
221 git_config(git_default_config, NULL);
222 parse_args(argc, argv, &opts);
223 res = sequencer_pick_revisions(&opts);
224 if (res < 0)
225 die(_("cherry-pick failed"));
226 return res;