rebase -i: also expand/collapse the SHA-1s via the rebase--helper

This is crucial to improve performance on Windows, as the speed is now
mostly dominated by the SHA-1 transformation (because it spawns a new
rev-parse process for *every* line, and spawning processes is pretty
slow from Git for Windows' MSYS2 Bash).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index 613053276e6064de312ee00ad520b93959db0c6c..791b62901c31bdf5a36c2342b5a88e7af36665bc 100644 (file)
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -14,7 +14,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
        struct replay_opts opts = REPLAY_OPTS_INIT;
        int keep_empty = 0;
        enum {
        struct replay_opts opts = REPLAY_OPTS_INIT;
        int keep_empty = 0;
        enum {

-               CONTINUE = 1, ABORT, MAKE_SCRIPT
+               CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_SHA1S, EXPAND_SHA1S

        } 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")),


@@ -25,6 +25,10 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                                ABORT),
                OPT_CMDMODE(0, "make-script", &command,
                        N_("make rebase script"), MAKE_SCRIPT),
                                ABORT),
                OPT_CMDMODE(0, "make-script", &command,
                        N_("make rebase script"), MAKE_SCRIPT),

+               OPT_CMDMODE(0, "shorten-ids", &command,
+                       N_("shorten SHA-1s in the todo list"), SHORTEN_SHA1S),
+               OPT_CMDMODE(0, "expand-ids", &command,
+                       N_("expand SHA-1s in the todo list"), EXPAND_SHA1S),

                OPT_END()
        };
 
                OPT_END()
        };
 


@@ -43,5 +47,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                return !!sequencer_remove_state(&opts);
        if (command == MAKE_SCRIPT && argc > 1)
                return !!sequencer_make_script(keep_empty, stdout, argc, argv);
                return !!sequencer_remove_state(&opts);
        if (command == MAKE_SCRIPT && argc > 1)
                return !!sequencer_make_script(keep_empty, stdout, argc, argv);

+       if (command == SHORTEN_SHA1S && argc == 1)
+               return !!transform_todo_ids(1);
+       if (command == EXPAND_SHA1S && argc == 1)
+               return !!transform_todo_ids(0);

        usage_with_options(builtin_rebase_helper_usage, options);
 }
        usage_with_options(builtin_rebase_helper_usage, options);
 }

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9d65212b7f12d064d24b7354a16a54bc0cb18092..d5df02435ae77165a0def4c135d152c60c6673a5 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -750,35 +750,12 @@ skip_unnecessary_picks () {
                die "$(gettext "Could not skip unnecessary pick commands")"
 }
 
                die "$(gettext "Could not skip unnecessary pick commands")"
 }
 

-transform_todo_ids () {
-       while read -r command rest
-       do
-               case "$command" in
-               "$comment_char"* | exec)
-                       # Be careful for oddball commands like 'exec'
-                       # that do not have a SHA-1 at the beginning of $rest.
-                       ;;
-               *)
-                       sha1=$(git rev-parse --verify --quiet "$@" ${rest%%[     ]*}) &&
-                       if test "a$rest" = "a${rest#*[   ]}"
-                       then
-                               rest=$sha1
-                       else
-                               rest="$sha1 ${rest#*[    ]}"
-                       fi
-                       ;;
-               esac
-               printf '%s\n' "$command${rest:+ }$rest"
-       done <"$todo" >"$todo.new" &&
-       mv -f "$todo.new" "$todo"
-}
-

 expand_todo_ids() {
 expand_todo_ids() {

-       transform_todo_ids
+       git rebase--helper --expand-ids

 }
 
 collapse_todo_ids() {
 }
 
 collapse_todo_ids() {

-       transform_todo_ids --short
+       git rebase--helper --shorten-ids

 }
 
 # Rearrange the todo list that has both "pick sha1 msg" and
 }
 
 # Rearrange the todo list that has both "pick sha1 msg" and

diff --git a/sequencer.c b/sequencer.c
index afcb3d00a32b396dacd1562a9fc3680661e1720a..36ed45d9050697b49c6ce3cdb1e41a2386dddb75 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -2462,3 +2462,60 @@ int sequencer_make_script(int keep_empty, FILE *out,
        strbuf_release(&buf);
        return 0;
 }
        strbuf_release(&buf);
        return 0;
 }

+
+
+int transform_todo_ids(int shorten_ids)
+{
+       const char *todo_file = rebase_path_todo();
+       struct todo_list todo_list = TODO_LIST_INIT;
+       int fd, res, i;
+       FILE *out;
+
+       strbuf_reset(&todo_list.buf);
+       fd = open(todo_file, O_RDONLY);
+       if (fd < 0)
+               return error_errno(_("could not open '%s'"), todo_file);
+       if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
+               close(fd);
+               return error(_("could not read '%s'."), todo_file);
+       }
+       close(fd);
+
+       res = parse_insn_buffer(todo_list.buf.buf, &todo_list);
+       if (res) {
+               todo_list_release(&todo_list);
+               return error(_("unusable todo list: '%s'"), todo_file);
+       }
+
+       out = fopen(todo_file, "w");
+       if (!out) {
+               todo_list_release(&todo_list);
+               return error(_("unable to open '%s' for writing"), todo_file);
+       }
+       for (i = 0; i < todo_list.nr; i++) {
+               struct todo_item *item = todo_list.items + i;
+               int bol = item->offset_in_buf;
+               const char *p = todo_list.buf.buf + bol;
+               int eol = i + 1 < todo_list.nr ?
+                       todo_list.items[i + 1].offset_in_buf :
+                       todo_list.buf.len;
+
+               if (item->command >= TODO_EXEC && item->command != TODO_DROP)
+                       fwrite(p, eol - bol, 1, out);
+               else {
+                       const char *id = shorten_ids ?
+                               short_commit_name(item->commit) :
+                               oid_to_hex(&item->commit->object.oid);
+                       int len;
+
+                       p += strspn(p, " \t"); /* left-trim command */
+                       len = strcspn(p, " \t"); /* length of command */
+
+                       fprintf(out, "%.*s %s %.*s\n",
+                               len, p, id, item->arg_len, item->arg);
+               }
+       }
+       fclose(out);
+       todo_list_release(&todo_list);
+       return 0;
+}

diff --git a/sequencer.h b/sequencer.h
index 83f2943b7a9fc6868cd5c476bd21d65f45c6fda5..71d25374afedf8e380ce4fa7823d589bf0fb19b5 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -48,6 +48,8 @@ int sequencer_remove_state(struct replay_opts *opts);
 int sequencer_make_script(int keep_empty, FILE *out,
                int argc, const char **argv);
 
 int sequencer_make_script(int keep_empty, FILE *out,
                int argc, const char **argv);
 

+int transform_todo_ids(int shorten_ids);
+

 extern const char sign_off_header[];
 
 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
 extern const char sign_off_header[];
 
 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);