rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C
[gitweb.git] / builtin / rebase--helper.c
index f7c2a5fdc815a892b99d6561d73d953740bf789a..0716bbfd786cbfbfbec37565e499a5837c5ed0f9 100644 (file)
@@ -3,6 +3,44 @@
 #include "config.h"
 #include "parse-options.h"
 #include "sequencer.h"
+#include "rebase-interactive.h"
+#include "argv-array.h"
+
+static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
+
+static int get_revision_ranges(const char *upstream, const char *onto,
+                              const char **head_hash,
+                              char **revisions, char **shortrevisions)
+{
+       const char *base_rev = upstream ? upstream : onto;
+       struct object_id orig_head;
+
+       if (get_oid("HEAD", &orig_head))
+               return error(_("no HEAD?"));
+
+       *head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ);
+
+       if (revisions)
+               *revisions = xstrfmt("%s...%s", base_rev, *head_hash);
+       if (shortrevisions) {
+               const char *shorthead;
+
+               shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV);
+
+               if (upstream) {
+                       const char *shortrev;
+                       struct object_id rev_oid;
+
+                       get_oid(base_rev, &rev_oid);
+                       shortrev = find_unique_abbrev(&rev_oid, DEFAULT_ABBREV);
+
+                       *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);
+               } else
+                       *shortrevisions = xstrdup(shorthead);
+       }
+
+       return 0;
+}
 
 static const char * const builtin_rebase_helper_usage[] = {
        N_("git rebase--helper [<options>]"),
@@ -12,12 +50,14 @@ static const char * const builtin_rebase_helper_usage[] = {
 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;
-       int abbreviate_commands = 0, rebase_cousins = -1;
+       unsigned flags = 0, keep_empty = 0, rebase_merges = 0, autosquash = 0;
+       int abbreviate_commands = 0, rebase_cousins = -1, ret;
+       const char *head_hash = NULL, *onto = NULL, *restrict_revision = NULL,
+               *squash_onto = NULL, *upstream = NULL;
        enum {
                CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
-               CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH,
-               ADD_EXEC
+               CHECK_TODO_LIST, REARRANGE_SQUASH, ADD_EXEC, EDIT_TODO, PREPARE_BRANCH,
+               COMPLETE_ACTION
        } command = 0;
        struct option options[] = {
                OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
@@ -27,6 +67,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                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"),
@@ -39,12 +82,24 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                        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, "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, "complete-action", &command,
+                           N_("complete the action"), COMPLETE_ACTION),
+               OPT_STRING(0, "onto", &onto, N_("onto"), N_("onto")),
+               OPT_STRING(0, "restrict-revision", &restrict_revision,
+                          N_("restrict-revision"), N_("restrict revision")),
+               OPT_STRING(0, "squash-onto", &squash_onto, N_("squash-onto"),
+                          N_("squash onto")),
+               OPT_STRING(0, "upstream", &upstream, N_("upstream"),
+                          N_("the upstream commit")),
                OPT_END()
        };
 
@@ -72,17 +127,55 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                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 == MAKE_SCRIPT && argc == 1) {
+               char *revisions = NULL;
+               struct argv_array make_script_args = ARGV_ARRAY_INIT;
+
+               if (!upstream && squash_onto)
+                       write_file(path_squash_onto(), "%s\n", squash_onto);
+
+               ret = get_revision_ranges(upstream, onto, &head_hash, &revisions, NULL);
+               if (ret)
+                       return ret;
+
+               argv_array_pushl(&make_script_args, "", revisions, NULL);
+               if (restrict_revision)
+                       argv_array_push(&make_script_args, restrict_revision);
+
+               ret = sequencer_make_script(stdout,
+                                           make_script_args.argc, make_script_args.argv,
+                                           flags);
+
+               free(revisions);
+               argv_array_clear(&make_script_args);
+
+               return !!ret;
+       }
        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)
-               return !!skip_unnecessary_picks();
        if (command == REARRANGE_SQUASH && argc == 1)
                return !!rearrange_squash();
        if (command == ADD_EXEC && argc == 2)
                return !!sequencer_add_exec_commands(argv[1]);
+       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 == COMPLETE_ACTION && argc == 3) {
+               char *shortrevisions = NULL;
+
+               ret = get_revision_ranges(upstream, onto, &head_hash, NULL, &shortrevisions);
+               if (ret)
+                       return ret;
+
+               ret = complete_action(&opts, flags, shortrevisions, argv[1], onto,
+                                     head_hash, argv[2], autosquash);
+
+               free(shortrevisions);
+               return !!ret;
+       }
+
        usage_with_options(builtin_rebase_helper_usage, options);
 }