rebase -i: remove unused modes and functions

This removes the modes `--skip-unnecessary-picks`, `--append-todo-help`,
and `--checkout-onto` from rebase--helper.c, the functions of
git-rebase--interactive.sh that were rendered useless by the rewrite of
complete_action(), and append_todo_help_to_file() from
rebase-interactive.c.

skip_unnecessary_picks() and checkout_onto() becomes static, as they are
only used inside of the sequencer.

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index 01b33339589e34e3d1c3696076b4baa51d590bb8..e1460136f549d4b5640ed5e081bc55509f91fdd5 100644 (file)
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -17,9 +17,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
        int abbreviate_commands = 0, rebase_cousins = -1;
        enum {
                CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
        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
+               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")),
        } command = 0;
        struct option options[] = {
                OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),


@@ -44,21 +43,15 @@ 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),
                        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, "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, "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()
                OPT_CMDMODE(0, "complete-action", &command,
                            N_("complete the action"), COMPLETE_ACTION),
                OPT_END()


@@ -94,26 +87,14 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                return !!transform_todos(flags);
        if (command == CHECK_TODO_LIST && argc == 1)
                return !!check_todo_list();
                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 == 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 == 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);
        if (command == COMPLETE_ACTION && argc == 6)
                return !!complete_action(&opts, flags, argv[1], argv[2], argv[3],
                                         argv[4], argv[5], autosquash);

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 59dc4888a6da11e9cd0164449e84412c9a82cccb..0d66c0f8b8db825dcffd341f32c78b7734260f04 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -16,56 +16,6 @@ todo="$state_dir"/git-rebase-todo
 GIT_CHERRY_PICK_HELP="$resolvemsg"
 export GIT_CHERRY_PICK_HELP
 
 GIT_CHERRY_PICK_HELP="$resolvemsg"
 export GIT_CHERRY_PICK_HELP
 

-comment_char=$(git config --get core.commentchar 2>/dev/null)
-case "$comment_char" in
-'' | auto)
-       comment_char="#"
-       ;;
-?)
-       ;;
-*)
-       comment_char=$(echo "$comment_char" | cut -c1)
-       ;;
-esac
-
-die_abort () {
-       apply_autostash
-       rm -rf "$state_dir"
-       die "$1"
-}
-
-has_action () {
-       test -n "$(git stripspace --strip-comments <"$1")"
-}
-
-git_sequence_editor () {
-       if test -z "$GIT_SEQUENCE_EDITOR"
-       then
-               GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
-               if [ -z "$GIT_SEQUENCE_EDITOR" ]
-               then
-                       GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
-               fi
-       fi
-
-       eval "$GIT_SEQUENCE_EDITOR" '"$@"'
-}
-
-expand_todo_ids() {
-       git rebase--helper --expand-ids
-}
-
-collapse_todo_ids() {
-       git rebase--helper --shorten-ids
-}
-
-get_missing_commit_check_level () {
-       check_level=$(git config --get rebase.missingCommitsCheck)
-       check_level=${check_level:-ignore}
-       # Don't be case sensitive
-       printf '%s' "$check_level" | tr 'A-Z' 'a-z'
-}
-

 # Initiate an action. If the cannot be any
 # further action it  may exec a command
 # or exit and not return.
 # Initiate an action. If the cannot be any
 # further action it  may exec a command
 # or exit and not return.

diff --git a/rebase-interactive.c b/rebase-interactive.c
index 4a9a10eff4a5a256540f45a123e170e178bc9ac4..0f4119cbae1bb6c126e15f734855ab2837d98d47 100644 (file)
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -52,28 +52,6 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty,
        }
 }
 
        }
 }
 

-int append_todo_help_to_file(unsigned edit_todo, unsigned keep_empty)
-{
-       struct strbuf buf = STRBUF_INIT;
-       FILE *todo;
-       int ret;
-
-       todo = fopen_or_warn(rebase_path_todo(), "a");
-       if (!todo)
-               return -1;
-
-       append_todo_help(edit_todo, keep_empty, &buf);
-
-       ret = fputs(buf.buf, todo);
-       if (ret < 0)
-               error_errno(_("could not append help text to '%s'"), rebase_path_todo());
-
-       fclose(todo);
-       strbuf_release(&buf);
-
-       return ret;
-}
-

 int edit_todo_list(unsigned flags)
 {
        struct strbuf buf = STRBUF_INIT;
 int edit_todo_list(unsigned flags)
 {
        struct strbuf buf = STRBUF_INIT;

diff --git a/rebase-interactive.h b/rebase-interactive.h
index d33f3176b72703b0412e00e92cf23461dc116763..971da037769476da196ae39eec89431be4923d54 100644 (file)
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -3,7 +3,6 @@
 
 void append_todo_help(unsigned edit_todo, unsigned keep_empty,
                      struct strbuf *buf);
 
 void append_todo_help(unsigned edit_todo, unsigned keep_empty,
                      struct strbuf *buf);

-int append_todo_help_to_file(unsigned edit_todo, unsigned keep_empty);

 int edit_todo_list(unsigned flags);
 
 #endif
 int edit_todo_list(unsigned flags);
 
 #endif

diff --git a/sequencer.c b/sequencer.c
index 98aacc802641de20407140ba45ce3bba4542857a..de2b5f820814b056a36c9ab0291730b0251bc673 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -3173,9 +3173,9 @@ int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit)
        return 0;
 }
 
        return 0;
 }
 

-int checkout_onto(struct replay_opts *opts,
-                 const char *onto_name, const char *onto,
-                 const char *orig_head)
+static int checkout_onto(struct replay_opts *opts,
+                        const char *onto_name, const char *onto,
+                        const char *orig_head)

 {
        struct object_id oid;
        const char *action = reflog_message(opts, "start", "checkout %s", onto_name);
 {
        struct object_id oid;
        const char *action = reflog_message(opts, "start", "checkout %s", onto_name);


@@ -4420,7 +4420,7 @@ static int rewrite_file(const char *path, const char *buf, size_t len)
 }
 
 /* skip picking commits whose parents are unchanged */
 }
 
 /* skip picking commits whose parents are unchanged */

-int skip_unnecessary_picks(struct object_id *output_oid)
+static int skip_unnecessary_picks(struct object_id *output_oid)

 {
        const char *todo_file = rebase_path_todo();
        struct strbuf buf = STRBUF_INIT;
 {
        const char *todo_file = rebase_path_todo();
        struct strbuf buf = STRBUF_INIT;

diff --git a/sequencer.h b/sequencer.h
index d58766c6d78fc6e0a0e2073b6e11d6f2ac144c43..02e3d7940e8cb1761f86ef9ca811a372050db38c 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -91,7 +91,6 @@ int sequencer_add_exec_commands(const char *command);
 int transform_todos(unsigned flags);
 enum missing_commit_check_level get_missing_commit_check_level(void);
 int check_todo_list(void);
 int transform_todos(unsigned flags);
 enum missing_commit_check_level get_missing_commit_check_level(void);
 int check_todo_list(void);

-int skip_unnecessary_picks(struct object_id *output_oid);

 int complete_action(struct replay_opts *opts, unsigned flags,
                    const char *shortrevisions, const char *onto_name,
                    const char *onto, const char *orig_head, const char *cmd,
 int complete_action(struct replay_opts *opts, unsigned flags,
                    const char *shortrevisions, const char *onto_name,
                    const char *onto, const char *orig_head, const char *cmd,


@@ -114,9 +113,6 @@ void commit_post_rewrite(const struct commit *current_head,
                         const struct object_id *new_head);
 
 int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);
                         const struct object_id *new_head);
 
 int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);

-int checkout_onto(struct replay_opts *opts,
-                 const char *onto_name, const char *onto,
-                 const char *orig_head);

 
 #define SUMMARY_INITIAL_COMMIT   (1 << 0)
 #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
 
 #define SUMMARY_INITIAL_COMMIT   (1 << 0)
 #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)