Code

Merge branch 'tr/grep-l-with-decoration'
[git.git] / builtin / revert.c
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"
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  */
21 static const char * const revert_usage[] = {
22         "git revert [options] <commit-ish>",
23         "git revert <subcommand>",
24         NULL
25 };
27 static const char * const cherry_pick_usage[] = {
28         "git cherry-pick [options] <commit-ish>",
29         "git cherry-pick <subcommand>",
30         NULL
31 };
33 static const char *action_name(const struct replay_opts *opts)
34 {
35         return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
36 }
38 static const char * const *revert_or_cherry_pick_usage(struct replay_opts *opts)
39 {
40         return opts->action == REPLAY_REVERT ? revert_usage : cherry_pick_usage;
41 }
43 static int option_parse_x(const struct option *opt,
44                           const char *arg, int unset)
45 {
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;
55 }
57 static void verify_opt_compatible(const char *me, const char *base_opt, ...)
58 {
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;
66         }
67         va_end(ap);
69         if (this_opt)
70                 die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
71 }
73 static void verify_opt_mutually_compatible(const char *me, ...)
74 {
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;
82         }
83         if (opt1) {
84                 while ((opt2 = va_arg(ap, const char *))) {
85                         if (va_arg(ap, int))
86                                 break;
87                 }
88         }
90         if (opt1 && opt2)
91                 die(_("%s: %s cannot be used with %s"), me, opt1, opt2);
92 }
94 static void parse_args(int argc, const char **argv, struct replay_opts *opts)
95 {
96         const char * const * usage_str = revert_or_cherry_pick_usage(opts);
97         const char *me = action_name(opts);
98         int remove_state = 0;
99         int contin = 0;
100         int rollback = 0;
101         struct option options[] = {
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"),
104                 OPT_BOOLEAN(0, "abort", &rollback, "cancel revert or cherry-pick sequence"),
105                 OPT_BOOLEAN('n', "no-commit", &opts->no_commit, "don't automatically commit"),
106                 OPT_BOOLEAN('e', "edit", &opts->edit, "edit the commit message"),
107                 OPT_NOOP_NOARG('r', NULL),
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",
113                         "option for merge strategy", option_parse_x),
114                 OPT_END(),
115                 OPT_END(),
116                 OPT_END(),
117         };
119         if (opts->action == REPLAY_PICK) {
120                 struct option cp_extra[] = {
121                         OPT_BOOLEAN('x', NULL, &opts->record_origin, "append commit name"),
122                         OPT_BOOLEAN(0, "ff", &opts->allow_ff, "allow fast-forward"),
123                         OPT_END(),
124                 };
125                 if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
126                         die(_("program error"));
127         }
129         argc = parse_options(argc, argv, NULL, options, usage_str,
130                         PARSE_OPT_KEEP_ARGV0 |
131                         PARSE_OPT_KEEP_UNKNOWN);
133         /* Check for incompatible subcommands */
134         verify_opt_mutually_compatible(me,
135                                 "--quit", remove_state,
136                                 "--continue", contin,
137                                 "--abort", rollback,
138                                 NULL);
140         /* Set the subcommand */
141         if (remove_state)
142                 opts->subcommand = REPLAY_REMOVE_STATE;
143         else if (contin)
144                 opts->subcommand = REPLAY_CONTINUE;
145         else if (rollback)
146                 opts->subcommand = REPLAY_ROLLBACK;
147         else
148                 opts->subcommand = REPLAY_NONE;
150         /* Check for incompatible command line arguments */
151         if (opts->subcommand != REPLAY_NONE) {
152                 char *this_operation;
153                 if (opts->subcommand == REPLAY_REMOVE_STATE)
154                         this_operation = "--quit";
155                 else if (opts->subcommand == REPLAY_CONTINUE)
156                         this_operation = "--continue";
157                 else {
158                         assert(opts->subcommand == REPLAY_ROLLBACK);
159                         this_operation = "--abort";
160                 }
162                 verify_opt_compatible(me, this_operation,
163                                 "--no-commit", opts->no_commit,
164                                 "--signoff", opts->signoff,
165                                 "--mainline", opts->mainline,
166                                 "--strategy", opts->strategy ? 1 : 0,
167                                 "--strategy-option", opts->xopts ? 1 : 0,
168                                 "-x", opts->record_origin,
169                                 "--ff", opts->allow_ff,
170                                 NULL);
171         }
173         if (opts->allow_ff)
174                 verify_opt_compatible(me, "--ff",
175                                 "--signoff", opts->signoff,
176                                 "--no-commit", opts->no_commit,
177                                 "-x", opts->record_origin,
178                                 "--edit", opts->edit,
179                                 NULL);
181         if (opts->subcommand != REPLAY_NONE) {
182                 opts->revs = NULL;
183         } else {
184                 opts->revs = xmalloc(sizeof(*opts->revs));
185                 init_revisions(opts->revs, NULL);
186                 opts->revs->no_walk = 1;
187                 if (argc < 2)
188                         usage_with_options(usage_str, options);
189                 argc = setup_revisions(argc, argv, opts->revs, NULL);
190         }
192         if (argc > 1)
193                 usage_with_options(usage_str, options);
196 int cmd_revert(int argc, const char **argv, const char *prefix)
198         struct replay_opts opts;
199         int res;
201         memset(&opts, 0, sizeof(opts));
202         if (isatty(0))
203                 opts.edit = 1;
204         opts.action = REPLAY_REVERT;
205         git_config(git_default_config, NULL);
206         parse_args(argc, argv, &opts);
207         res = sequencer_pick_revisions(&opts);
208         if (res < 0)
209                 die(_("revert failed"));
210         return res;
213 int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
215         struct replay_opts opts;
216         int res;
218         memset(&opts, 0, sizeof(opts));
219         opts.action = REPLAY_PICK;
220         git_config(git_default_config, NULL);
221         parse_args(argc, argv, &opts);
222         res = sequencer_pick_revisions(&opts);
223         if (res < 0)
224                 die(_("cherry-pick failed"));
225         return res;