b97e187364
This rewrites complete_action() from shell to C. A new mode is added to rebase--helper (`--complete-action`), as well as a new flag (`--autosquash`). Finally, complete_action() is stripped from git-rebase--interactive.sh. The original complete_action() would return the code 2 when the todo list contained no actions. This was a special case for rebase -i and -p; git-rebase.sh would then apply the autostash, delete the state directory, and die with the message "Nothing to do". This cleanup is rewritten in C instead of returning 2. As rebase -i no longer returns 2, the comment describing this behaviour in git-rebase.sh is updated to reflect this change. The message "Nothing to do" is now printed with error(), and so becomes "error: nothing to do". Some tests in t3404 check this value, so they are updated to fit this change. The first check might seem useless as we write "noop" to the todo list if it is empty. Actually, the todo list might contain commented commands (ie. empty commits). In this case, complete_action() won’t write "noop", and will abort without starting the editor. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
123 lines
4.7 KiB
C
123 lines
4.7 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include "parse-options.h"
|
|
#include "sequencer.h"
|
|
#include "rebase-interactive.h"
|
|
|
|
static const char * const builtin_rebase_helper_usage[] = {
|
|
N_("git rebase--helper [<options>]"),
|
|
NULL
|
|
};
|
|
|
|
int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct replay_opts opts = REPLAY_OPTS_INIT;
|
|
unsigned flags = 0, keep_empty = 0, rebase_merges = 0, autosquash = 0;
|
|
int abbreviate_commands = 0, rebase_cousins = -1;
|
|
enum {
|
|
CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
|
|
CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH,
|
|
ADD_EXEC, APPEND_TODO_HELP, EDIT_TODO, PREPARE_BRANCH,
|
|
CHECKOUT_ONTO, COMPLETE_ACTION
|
|
} command = 0;
|
|
struct option options[] = {
|
|
OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
|
|
OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
|
|
OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
|
|
N_("allow commits with empty messages")),
|
|
OPT_BOOL(0, "rebase-merges", &rebase_merges, N_("rebase merge commits")),
|
|
OPT_BOOL(0, "rebase-cousins", &rebase_cousins,
|
|
N_("keep original branch points of cousins")),
|
|
OPT_BOOL(0, "autosquash", &autosquash,
|
|
N_("move commits that begin with squash!/fixup!")),
|
|
OPT__VERBOSE(&opts.verbose, N_("be verbose")),
|
|
OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
|
|
CONTINUE),
|
|
OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
|
|
ABORT),
|
|
OPT_CMDMODE(0, "make-script", &command,
|
|
N_("make rebase script"), MAKE_SCRIPT),
|
|
OPT_CMDMODE(0, "shorten-ids", &command,
|
|
N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
|
|
OPT_CMDMODE(0, "expand-ids", &command,
|
|
N_("expand commit ids in the todo list"), EXPAND_OIDS),
|
|
OPT_CMDMODE(0, "check-todo-list", &command,
|
|
N_("check the todo list"), CHECK_TODO_LIST),
|
|
OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
|
|
N_("skip unnecessary picks"), SKIP_UNNECESSARY_PICKS),
|
|
OPT_CMDMODE(0, "rearrange-squash", &command,
|
|
N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
|
|
OPT_CMDMODE(0, "add-exec-commands", &command,
|
|
N_("insert exec commands in todo list"), ADD_EXEC),
|
|
OPT_CMDMODE(0, "append-todo-help", &command,
|
|
N_("insert the help in the todo list"), APPEND_TODO_HELP),
|
|
OPT_CMDMODE(0, "edit-todo", &command,
|
|
N_("edit the todo list during an interactive rebase"),
|
|
EDIT_TODO),
|
|
OPT_CMDMODE(0, "prepare-branch", &command,
|
|
N_("prepare the branch to be rebased"), PREPARE_BRANCH),
|
|
OPT_CMDMODE(0, "checkout-onto", &command,
|
|
N_("checkout a commit"), CHECKOUT_ONTO),
|
|
OPT_CMDMODE(0, "complete-action", &command,
|
|
N_("complete the action"), COMPLETE_ACTION),
|
|
OPT_END()
|
|
};
|
|
|
|
sequencer_init_config(&opts);
|
|
git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
|
|
|
|
opts.action = REPLAY_INTERACTIVE_REBASE;
|
|
opts.allow_ff = 1;
|
|
opts.allow_empty = 1;
|
|
|
|
argc = parse_options(argc, argv, NULL, options,
|
|
builtin_rebase_helper_usage, PARSE_OPT_KEEP_ARGV0);
|
|
|
|
flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
|
|
flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
|
|
flags |= rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
|
|
flags |= rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
|
|
flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
|
|
|
|
if (rebase_cousins >= 0 && !rebase_merges)
|
|
warning(_("--[no-]rebase-cousins has no effect without "
|
|
"--rebase-merges"));
|
|
|
|
if (command == CONTINUE && argc == 1)
|
|
return !!sequencer_continue(&opts);
|
|
if (command == ABORT && argc == 1)
|
|
return !!sequencer_remove_state(&opts);
|
|
if (command == MAKE_SCRIPT && argc > 1)
|
|
return !!sequencer_make_script(stdout, argc, argv, flags);
|
|
if ((command == SHORTEN_OIDS || command == EXPAND_OIDS) && argc == 1)
|
|
return !!transform_todos(flags);
|
|
if (command == CHECK_TODO_LIST && argc == 1)
|
|
return !!check_todo_list();
|
|
if (command == SKIP_UNNECESSARY_PICKS && argc == 1) {
|
|
struct object_id oid;
|
|
int ret = skip_unnecessary_picks(&oid);
|
|
|
|
if (!ret)
|
|
puts(oid_to_hex(&oid));
|
|
return !!ret;
|
|
}
|
|
if (command == REARRANGE_SQUASH && argc == 1)
|
|
return !!rearrange_squash();
|
|
if (command == ADD_EXEC && argc == 2)
|
|
return !!sequencer_add_exec_commands(argv[1]);
|
|
if (command == APPEND_TODO_HELP && argc == 1)
|
|
return !!append_todo_help_to_file(0, keep_empty);
|
|
if (command == EDIT_TODO && argc == 1)
|
|
return !!edit_todo_list(flags);
|
|
if (command == PREPARE_BRANCH && argc == 2)
|
|
return !!prepare_branch_to_be_rebased(&opts, argv[1]);
|
|
if (command == CHECKOUT_ONTO && argc == 4)
|
|
return !!checkout_onto(&opts, argv[1], argv[2], argv[3]);
|
|
if (command == COMPLETE_ACTION && argc == 6)
|
|
return !!complete_action(&opts, flags, argv[1], argv[2], argv[3],
|
|
argv[4], argv[5], autosquash);
|
|
|
|
usage_with_options(builtin_rebase_helper_usage, options);
|
|
}
|