Andrew's git - gitweb.git/blob

   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"
   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
  21static const char * const revert_usage[] = {
  22        N_("git revert [options] <commit-ish>..."),
  23        N_("git revert <subcommand>"),
  24        NULL
  25};
  26
  27static const char * const cherry_pick_usage[] = {
  28        N_("git cherry-pick [options] <commit-ish>..."),
  29        N_("git cherry-pick <subcommand>"),
  30        NULL
  31};
  32
  33static const char *action_name(const struct replay_opts *opts)
  34{
  35        return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
  36}
  37
  38static 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}
  42
  43static 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;
  48
  49        if (unset)
  50                return 0;
  51
  52        ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
  53        opts->xopts[opts->xopts_nr++] = xstrdup(arg);
  54        return 0;
  55}
  56
  57LAST_ARG_MUST_BE_NULL
  58static void verify_opt_compatible(const char *me, const char *base_opt, ...)
  59{
  60        const char *this_opt;
  61        va_list ap;
  62
  63        va_start(ap, base_opt);
  64        while ((this_opt = va_arg(ap, const char *))) {
  65                if (va_arg(ap, int))
  66                        break;
  67        }
  68        va_end(ap);
  69
  70        if (this_opt)
  71                die(_("%s: %s cannot be used with %s"), me, this_opt, base_opt);
  72}
  73
  74LAST_ARG_MUST_BE_NULL
  75static void verify_opt_mutually_compatible(const char *me, ...)
  76{
  77        const char *opt1, *opt2 = NULL;
  78        va_list ap;
  79
  80        va_start(ap, me);
  81        while ((opt1 = va_arg(ap, const char *))) {
  82                if (va_arg(ap, int))
  83                        break;
  84        }
  85        if (opt1) {
  86                while ((opt2 = va_arg(ap, const char *))) {
  87                        if (va_arg(ap, int))
  88                                break;
  89                }
  90        }
  91        va_end(ap);
  92
  93        if (opt1 && opt2)
  94                die(_("%s: %s cannot be used with %s"), me, opt1, opt2);
  95}
  96
  97static void parse_args(int argc, const char **argv, struct replay_opts *opts)
  98{
  99        const char * const * usage_str = revert_or_cherry_pick_usage(opts);
 100        const char *me = action_name(opts);
 101        int remove_state = 0;
 102        int contin = 0;
 103        int rollback = 0;
 104        struct option options[] = {
 105                OPT_BOOLEAN(0, "quit", &remove_state, N_("end revert or cherry-pick sequence")),
 106                OPT_BOOLEAN(0, "continue", &contin, N_("resume revert or cherry-pick sequence")),
 107                OPT_BOOLEAN(0, "abort", &rollback, N_("cancel revert or cherry-pick sequence")),
 108                OPT_BOOLEAN('n', "no-commit", &opts->no_commit, N_("don't automatically commit")),
 109                OPT_BOOLEAN('e', "edit", &opts->edit, N_("edit the commit message")),
 110                OPT_NOOP_NOARG('r', NULL),
 111                OPT_BOOLEAN('s', "signoff", &opts->signoff, N_("add Signed-off-by:")),
 112                OPT_INTEGER('m', "mainline", &opts->mainline, N_("parent number")),
 113                OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto),
 114                OPT_STRING(0, "strategy", &opts->strategy, N_("strategy"), N_("merge strategy")),
 115                OPT_CALLBACK('X', "strategy-option", &opts, N_("option"),
 116                        N_("option for merge strategy"), option_parse_x),
 117                OPT_END(),
 118                OPT_END(),
 119                OPT_END(),
 120                OPT_END(),
 121                OPT_END(),
 122                OPT_END(),
 123        };
 124
 125        if (opts->action == REPLAY_PICK) {
 126                struct option cp_extra[] = {
 127                        OPT_BOOLEAN('x', NULL, &opts->record_origin, N_("append commit name")),
 128                        OPT_BOOLEAN(0, "ff", &opts->allow_ff, N_("allow fast-forward")),
 129                        OPT_BOOLEAN(0, "allow-empty", &opts->allow_empty, N_("preserve initially empty commits")),
 130                        OPT_BOOLEAN(0, "allow-empty-message", &opts->allow_empty_message, N_("allow commits with empty messages")),
 131                        OPT_BOOLEAN(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")),
 132                        OPT_END(),
 133                };
 134                if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
 135                        die(_("program error"));
 136        }
 137
 138        argc = parse_options(argc, argv, NULL, options, usage_str,
 139                        PARSE_OPT_KEEP_ARGV0 |
 140                        PARSE_OPT_KEEP_UNKNOWN);
 141
 142        /* Check for incompatible subcommands */
 143        verify_opt_mutually_compatible(me,
 144                                "--quit", remove_state,
 145                                "--continue", contin,
 146                                "--abort", rollback,
 147                                NULL);
 148
 149        /* implies allow_empty */
 150        if (opts->keep_redundant_commits)
 151                opts->allow_empty = 1;
 152
 153        /* Set the subcommand */
 154        if (remove_state)
 155                opts->subcommand = REPLAY_REMOVE_STATE;
 156        else if (contin)
 157                opts->subcommand = REPLAY_CONTINUE;
 158        else if (rollback)
 159                opts->subcommand = REPLAY_ROLLBACK;
 160        else
 161                opts->subcommand = REPLAY_NONE;
 162
 163        /* Check for incompatible command line arguments */
 164        if (opts->subcommand != REPLAY_NONE) {
 165                char *this_operation;
 166                if (opts->subcommand == REPLAY_REMOVE_STATE)
 167                        this_operation = "--quit";
 168                else if (opts->subcommand == REPLAY_CONTINUE)
 169                        this_operation = "--continue";
 170                else {
 171                        assert(opts->subcommand == REPLAY_ROLLBACK);
 172                        this_operation = "--abort";
 173                }
 174
 175                verify_opt_compatible(me, this_operation,
 176                                "--no-commit", opts->no_commit,
 177                                "--signoff", opts->signoff,
 178                                "--mainline", opts->mainline,
 179                                "--strategy", opts->strategy ? 1 : 0,
 180                                "--strategy-option", opts->xopts ? 1 : 0,
 181                                "-x", opts->record_origin,
 182                                "--ff", opts->allow_ff,
 183                                NULL);
 184        }
 185
 186        if (opts->allow_ff)
 187                verify_opt_compatible(me, "--ff",
 188                                "--signoff", opts->signoff,
 189                                "--no-commit", opts->no_commit,
 190                                "-x", opts->record_origin,
 191                                "--edit", opts->edit,
 192                                NULL);
 193
 194        if (opts->subcommand != REPLAY_NONE) {
 195                opts->revs = NULL;
 196        } else {
 197                struct setup_revision_opt s_r_opt;
 198                opts->revs = xmalloc(sizeof(*opts->revs));
 199                init_revisions(opts->revs, NULL);
 200                opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
 201                if (argc < 2)
 202                        usage_with_options(usage_str, options);
 203                memset(&s_r_opt, 0, sizeof(s_r_opt));
 204                s_r_opt.assume_dashdash = 1;
 205                argc = setup_revisions(argc, argv, opts->revs, &s_r_opt);
 206        }
 207
 208        if (argc > 1)
 209                usage_with_options(usage_str, options);
 210}
 211
 212int cmd_revert(int argc, const char **argv, const char *prefix)
 213{
 214        struct replay_opts opts;
 215        int res;
 216
 217        memset(&opts, 0, sizeof(opts));
 218        if (isatty(0))
 219                opts.edit = 1;
 220        opts.action = REPLAY_REVERT;
 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(_("revert failed"));
 226        return res;
 227}
 228
 229int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
 230{
 231        struct replay_opts opts;
 232        int res;
 233
 234        memset(&opts, 0, sizeof(opts));
 235        opts.action = REPLAY_PICK;
 236        git_config(git_default_config, NULL);
 237        parse_args(argc, argv, &opts);
 238        res = sequencer_pick_revisions(&opts);
 239        if (res < 0)
 240                die(_("cherry-pick failed"));
 241        return res;
 242}