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