Merge branch 'gs/rebase-allow-empty-message'
[git/git.git] / 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
7 static const char * const builtin_rebase_helper_usage[] = {
8 N_("git rebase--helper [<options>]"),
9 NULL
10 };
11
12 int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
13 {
14 struct replay_opts opts = REPLAY_OPTS_INIT;
15 unsigned flags = 0, keep_empty = 0;
16 int abbreviate_commands = 0;
17 enum {
18 CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
19 CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH,
20 ADD_EXEC
21 } command = 0;
22 struct option options[] = {
23 OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
24 OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
25 OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
26 N_("allow commits with empty messages")),
27 OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
28 CONTINUE),
29 OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
30 ABORT),
31 OPT_CMDMODE(0, "make-script", &command,
32 N_("make rebase script"), MAKE_SCRIPT),
33 OPT_CMDMODE(0, "shorten-ids", &command,
34 N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
35 OPT_CMDMODE(0, "expand-ids", &command,
36 N_("expand commit ids in the todo list"), EXPAND_OIDS),
37 OPT_CMDMODE(0, "check-todo-list", &command,
38 N_("check the todo list"), CHECK_TODO_LIST),
39 OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
40 N_("skip unnecessary picks"), SKIP_UNNECESSARY_PICKS),
41 OPT_CMDMODE(0, "rearrange-squash", &command,
42 N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
43 OPT_CMDMODE(0, "add-exec-commands", &command,
44 N_("insert exec commands in todo list"), ADD_EXEC),
45 OPT_END()
46 };
47
48 sequencer_init_config(&opts);
49 git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
50
51 opts.action = REPLAY_INTERACTIVE_REBASE;
52 opts.allow_ff = 1;
53 opts.allow_empty = 1;
54
55 argc = parse_options(argc, argv, NULL, options,
56 builtin_rebase_helper_usage, PARSE_OPT_KEEP_ARGV0);
57
58 flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
59 flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
60 flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
61
62 if (command == CONTINUE && argc == 1)
63 return !!sequencer_continue(&opts);
64 if (command == ABORT && argc == 1)
65 return !!sequencer_remove_state(&opts);
66 if (command == MAKE_SCRIPT && argc > 1)
67 return !!sequencer_make_script(stdout, argc, argv, flags);
68 if ((command == SHORTEN_OIDS || command == EXPAND_OIDS) && argc == 1)
69 return !!transform_todos(flags);
70 if (command == CHECK_TODO_LIST && argc == 1)
71 return !!check_todo_list();
72 if (command == SKIP_UNNECESSARY_PICKS && argc == 1)
73 return !!skip_unnecessary_picks();
74 if (command == REARRANGE_SQUASH && argc == 1)
75 return !!rearrange_squash();
76 if (command == ADD_EXEC && argc == 2)
77 return !!sequencer_add_exec_commands(argv[1]);
78 usage_with_options(builtin_rebase_helper_usage, options);
79 }