Andrew's git - gitweb.git/blob - builtin/rebase--helper.c

   1#include "builtin.h"
   2#include "cache.h"
   3#include "config.h"
   4#include "parse-options.h"
   5#include "sequencer.h"
   6#include "rebase-interactive.h"
   7
   8static const char * const builtin_rebase_helper_usage[] = {
   9        N_("git rebase--helper [<options>]"),
  10        NULL
  11};
  12
  13int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
  14{
  15        struct replay_opts opts = REPLAY_OPTS_INIT;
  16        unsigned flags = 0, keep_empty = 0, rebase_merges = 0;
  17        int abbreviate_commands = 0, rebase_cousins = -1;
  18        enum {
  19                CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
  20                CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH,
  21                ADD_EXEC, APPEND_TODO_HELP, EDIT_TODO, PREPARE_BRANCH,
  22                CHECKOUT_ONTO
  23        } command = 0;
  24        struct option options[] = {
  25                OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
  26                OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
  27                OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
  28                        N_("allow commits with empty messages")),
  29                OPT_BOOL(0, "rebase-merges", &rebase_merges, N_("rebase merge commits")),
  30                OPT_BOOL(0, "rebase-cousins", &rebase_cousins,
  31                         N_("keep original branch points of cousins")),
  32                OPT__VERBOSE(&opts.verbose, N_("be verbose")),
  33                OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
  34                                CONTINUE),
  35                OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
  36                                ABORT),
  37                OPT_CMDMODE(0, "make-script", &command,
  38                        N_("make rebase script"), MAKE_SCRIPT),
  39                OPT_CMDMODE(0, "shorten-ids", &command,
  40                        N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
  41                OPT_CMDMODE(0, "expand-ids", &command,
  42                        N_("expand commit ids in the todo list"), EXPAND_OIDS),
  43                OPT_CMDMODE(0, "check-todo-list", &command,
  44                        N_("check the todo list"), CHECK_TODO_LIST),
  45                OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
  46                        N_("skip unnecessary picks"), SKIP_UNNECESSARY_PICKS),
  47                OPT_CMDMODE(0, "rearrange-squash", &command,
  48                        N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
  49                OPT_CMDMODE(0, "add-exec-commands", &command,
  50                        N_("insert exec commands in todo list"), ADD_EXEC),
  51                OPT_CMDMODE(0, "append-todo-help", &command,
  52                            N_("insert the help in the todo list"), APPEND_TODO_HELP),
  53                OPT_CMDMODE(0, "edit-todo", &command,
  54                            N_("edit the todo list during an interactive rebase"),
  55                            EDIT_TODO),
  56                OPT_CMDMODE(0, "prepare-branch", &command,
  57                            N_("prepare the branch to be rebased"), PREPARE_BRANCH),
  58                OPT_CMDMODE(0, "checkout-onto", &command,
  59                            N_("checkout a commit"), CHECKOUT_ONTO),
  60                OPT_END()
  61        };
  62
  63        sequencer_init_config(&opts);
  64        git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
  65
  66        opts.action = REPLAY_INTERACTIVE_REBASE;
  67        opts.allow_ff = 1;
  68        opts.allow_empty = 1;
  69
  70        argc = parse_options(argc, argv, NULL, options,
  71                        builtin_rebase_helper_usage, PARSE_OPT_KEEP_ARGV0);
  72
  73        flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
  74        flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
  75        flags |= rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
  76        flags |= rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
  77        flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
  78
  79        if (rebase_cousins >= 0 && !rebase_merges)
  80                warning(_("--[no-]rebase-cousins has no effect without "
  81                          "--rebase-merges"));
  82
  83        if (command == CONTINUE && argc == 1)
  84                return !!sequencer_continue(&opts);
  85        if (command == ABORT && argc == 1)
  86                return !!sequencer_remove_state(&opts);
  87        if (command == MAKE_SCRIPT && argc > 1)
  88                return !!sequencer_make_script(stdout, argc, argv, flags);
  89        if ((command == SHORTEN_OIDS || command == EXPAND_OIDS) && argc == 1)
  90                return !!transform_todos(flags);
  91        if (command == CHECK_TODO_LIST && argc == 1)
  92                return !!check_todo_list();
  93        if (command == SKIP_UNNECESSARY_PICKS && argc == 1) {
  94                struct object_id oid;
  95                int ret = skip_unnecessary_picks(&oid);
  96
  97                if (!ret)
  98                        puts(oid_to_hex(&oid));
  99                return !!ret;
 100        }
 101        if (command == REARRANGE_SQUASH && argc == 1)
 102                return !!rearrange_squash();
 103        if (command == ADD_EXEC && argc == 2)
 104                return !!sequencer_add_exec_commands(argv[1]);
 105        if (command == APPEND_TODO_HELP && argc == 1)
 106                return !!append_todo_help_to_file(0, keep_empty);
 107        if (command == EDIT_TODO && argc == 1)
 108                return !!edit_todo_list(flags);
 109        if (command == PREPARE_BRANCH && argc == 2)
 110                return !!prepare_branch_to_be_rebased(&opts, argv[1]);
 111        if (command == CHECKOUT_ONTO && argc == 4)
 112                return !!checkout_onto(&opts, argv[1], argv[2], argv[3]);
 113        usage_with_options(builtin_rebase_helper_usage, options);
 114}