Hi Phillip,
On Mon, 6 Sep 2021, Phillip Wood wrote:
> Hi dscho
>
> Thanks for working on this, it opens up the possibility of future cleanups now
> we're not constrained by supporting cmd_rebase__interactive()
Yes!!!
> On 01/09/2021 12:57, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin <johannes.schindelin@xxxxxx>
> > [...]
> > @@ -437,24 +362,6 @@ static int run_sequencer_rebase(struct rebase_options
> > *opts,
> >
> > break;
> > }
> > - case ACTION_SHORTEN_OIDS:
> > - case ACTION_EXPAND_OIDS:
> > - ret = transform_todo_file(flags);
> > - break;
> > - case ACTION_CHECK_TODO_LIST:
> > - ret = check_todo_list_from_file(the_repository);
> > - break;
> > - case ACTION_REARRANGE_SQUASH:
> > - ret = rearrange_squash_in_todo_file();
> > - break;
> > - case ACTION_ADD_EXEC: {
> > - struct string_list commands = STRING_LIST_INIT_DUP;
> > -
> > - split_exec_commands(opts->cmd, &commands);
> > - ret = add_exec_commands(&commands);
> > - string_list_clear(&commands, 0);
> > - break;
> > - }
>
> As Alban mentioned, I think it would be worth removing the enum members as
> well as the case clauses here.
Makes sense.
Thank you for your review,
Dscho
>
> Best Wishes
>
> Phillip
>
> > default:
> > BUG("invalid command '%d'", command);
> > }
> > @@ -476,98 +383,6 @@ static int parse_opt_keep_empty(const struct option
> > *opt, const char *arg,
> > return 0;
> > }
> > -static const char * const builtin_rebase_interactive_usage[] = {
> > - N_("git rebase--interactive [<options>]"),
> > - NULL
> > -};
> > -
> > -int cmd_rebase__interactive(int argc, const char **argv, const char
> > *prefix)
> > -{
> > - struct rebase_options opts = REBASE_OPTIONS_INIT;
> > - struct object_id squash_onto = *null_oid();
> > - enum action command = ACTION_NONE;
> > - struct option options[] = {
> > - OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
> > - REBASE_FORCE),
> > - OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
> > - N_("keep commits which start empty"),
> > - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
> > - parse_opt_keep_empty),
> > - OPT_BOOL_F(0, "allow-empty-message",
> > &opts.allow_empty_message,
> > - N_("allow commits with empty messages"),
> > - PARSE_OPT_HIDDEN),
> > - OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase
> > merge commits")),
> > - OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
> > - N_("keep original branch points of cousins")),
> > - OPT_BOOL(0, "autosquash", &opts.autosquash,
> > - N_("move commits that begin with squash!/fixup!")),
> > - OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
> > - OPT_BIT('v', "verbose", &opts.flags,
> > - N_("display a diffstat of what changed upstream"),
> > - REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
> > - OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
> > - ACTION_CONTINUE),
> > - OPT_CMDMODE(0, "skip", &command, N_("skip commit"),
> > ACTION_SKIP),
> > - OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo
> > list"),
> > - ACTION_EDIT_TODO),
> > - OPT_CMDMODE(0, "show-current-patch", &command, N_("show the
> > current patch"),
> > - ACTION_SHOW_CURRENT_PATCH),
> > - OPT_CMDMODE(0, "shorten-ids", &command,
> > - N_("shorten commit ids in the todo list"),
> > ACTION_SHORTEN_OIDS),
> > - OPT_CMDMODE(0, "expand-ids", &command,
> > - N_("expand commit ids in the todo list"),
> > ACTION_EXPAND_OIDS),
> > - OPT_CMDMODE(0, "check-todo-list", &command,
> > - N_("check the todo list"), ACTION_CHECK_TODO_LIST),
> > - OPT_CMDMODE(0, "rearrange-squash", &command,
> > - N_("rearrange fixup/squash lines"),
> > ACTION_REARRANGE_SQUASH),
> > - OPT_CMDMODE(0, "add-exec-commands", &command,
> > - N_("insert exec commands in todo list"),
> > ACTION_ADD_EXEC),
> > - { OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"),
> > N_("onto"),
> > - PARSE_OPT_NONEG, parse_opt_commit, 0 },
> > - { OPTION_CALLBACK, 0, "restrict-revision",
> > &opts.restrict_revision,
> > - N_("restrict-revision"), N_("restrict revision"),
> > - PARSE_OPT_NONEG, parse_opt_commit, 0 },
> > - { OPTION_CALLBACK, 0, "squash-onto", &squash_onto,
> > N_("squash-onto"),
> > - N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0
> > },
> > - { OPTION_CALLBACK, 0, "upstream", &opts.upstream,
> > N_("upstream"),
> > - N_("the upstream commit"), PARSE_OPT_NONEG,
> > parse_opt_commit,
> > - 0 },
> > - OPT_STRING(0, "head-name", &opts.head_name, N_("head-name"),
> > N_("head name")),
> > - { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt,
> > N_("key-id"),
> > - N_("GPG-sign commits"),
> > - PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
> > - OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
> > - N_("rebase strategy")),
> > - OPT_STRING(0, "strategy-opts", &opts.strategy_opts,
> > N_("strategy-opts"),
> > - N_("strategy options")),
> > - OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
> > - N_("the branch or commit to checkout")),
> > - OPT_STRING(0, "onto-name", &opts.onto_name, N_("onto-name"),
> > N_("onto name")),
> > - OPT_STRING(0, "cmd", &opts.cmd, N_("cmd"), N_("the command to
> > run")),
> > - OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),
> > - OPT_BOOL(0, "reschedule-failed-exec",
> > &opts.reschedule_failed_exec,
> > - N_("automatically re-schedule any `exec` that
> > fails")),
> > - OPT_END()
> > - };
> > -
> > - opts.rebase_cousins = -1;
> > -
> > - if (argc == 1)
> > - usage_with_options(builtin_rebase_interactive_usage, options);
> > -
> > - argc = parse_options(argc, argv, prefix, options,
> > - builtin_rebase_interactive_usage,
> > PARSE_OPT_KEEP_ARGV0);
> > -
> > - if (!is_null_oid(&squash_onto))
> > - opts.squash_onto = &squash_onto;
> > -
> > - if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
> > - warning(_("--[no-]rebase-cousins has no effect without "
> > - "--rebase-merges"));
> > -
> > - return !!run_sequencer_rebase(&opts, command);
> > -}
> > -
> > static int is_merge(struct rebase_options *opts)
> > {
> > return opts->type == REBASE_MERGE;
> > diff --git a/git.c b/git.c
> > index 18bed9a9964..268cdd82cfc 100644
> > --- a/git.c
> > +++ b/git.c
> > @@ -577,7 +577,6 @@ static struct cmd_struct commands[] = {
> > { "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
> > { "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
> > { "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
> > - { "rebase--interactive", cmd_rebase__interactive, RUN_SETUP |
> > NEED_WORK_TREE },
> > { "receive-pack", cmd_receive_pack },
> > { "reflog", cmd_reflog, RUN_SETUP },
> > { "remote", cmd_remote, RUN_SETUP },
> >
>
>
>
