From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-1.7 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM,RCVD_IN_SORBS_WEB,RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 2BD3C20357 for ; Fri, 14 Jul 2017 14:45:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754527AbdGNOpV (ORCPT ); Fri, 14 Jul 2017 10:45:21 -0400 Received: from mout.gmx.net ([212.227.17.22]:58768 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754516AbdGNOpU (ORCPT ); Fri, 14 Jul 2017 10:45:20 -0400 Received: from virtualbox ([37.201.192.198]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LviG8-1dhvwS25Sm-017VNV; Fri, 14 Jul 2017 16:45:12 +0200 Date: Fri, 14 Jul 2017 16:45:11 +0200 (CEST) From: Johannes Schindelin X-X-Sender: virtualbox@virtualbox To: git@vger.kernel.org cc: Junio C Hamano , Philip Oakley , Jeff King , Phillip Wood , Liam Beguin Subject: [PATCH v6 05/10] rebase -i: also expand/collapse the SHA-1s via the rebase--helper In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K0:kcdFR1PJRjFm+sg2CGb+KG3f1IoN6W6RD4UGHwLLUrBb484YfUv b+esqsWs8atM1Uwi7s2WknQkf8VAqVZFwd3uqVTTzppR75fxy1HIDzdqHPmFC53GoL0TOXD 0/vV9AYwDDt/ShQ1z7KYzizmsJ7iI/djzRZyd6nBYAjCWHtuwnWtQON4UsyEu2E1BExWarZ xxt+iLAIiX7BBy1YBp7bA== X-UI-Out-Filterresults: notjunk:1;V01:K0:jxkjbign854=:UgbKlny9mL0MpVXtxiiGz8 e9nw/ZLImhXR0WMoRPzXrNGtKY3rkxatrr25bBplrFhHCCGt6KXrFYakVdLH5lt2dZFBlurYk 1xOfdeCeiAgObA236oxOYHOYaNfsDsKWW6l9oMRU+vZVdYtUeA6epUXvmLhtd9/7QMLRNVlf8 kcIge7ZzvzzvnsiwlgkGnh80SDX3B2rIQrWnhXEBdxDHWaGoc2vOjRFTrMQgSlCU91ywegYlg wTbDg/p5uNDuo45vFz0gfUf9phLPWylS4xAl7omD3/rVhcpAJ79qgHeu4a9KQm23vjHXPZvUD yxU+KPojOCKZyjs/nhtYbiC7UQaLA0nFZETcf1MhQjFJna9rOcT+l5It7YqPTT7U1y79WSDfX diMElZaohhO0P+1bR4C+vD5meJmPiJw467WwRO3wK3DvKHEDKFq/eRGAV5LYEdy2I1ZOclWAT ckxHfEaAenGVmbBruwLiuFiqUbDX6W/WVE19tvu1jGjQyzcoC3CraQq0xstr/nT8tjUSzcwR5 JuKgjfEZZzgdigK3R2xuxZCVw/Fwxny4VSQeN2LEZSQcbEnwxqWkHqdc+FTkHJ1xgPh/uQa6P WGZi99M74MAtbxa2jyBLbjy6x6y/09te6d4KuQCQKEQCHE8hxwXMoc479GLhnOySc18xfc6Oc UYxJ6NdPJ2XDoLiqXeUdP+ZFSHMtG4zHW59LiKSP2dUQqy8D7wqfmb4pHRpM+I2hqt679Fa2I 39hmPLVhVe+vR4KSqPE+NDuz26etcvX/ZX+lJpisx0MqPRTY13DmDkQ6rmMc+eNd9UiLxNtY7 v1550IT/DJ2rwh1EqRObgGdHU/dAU64SQ6Et2bmDyolm04Ysqc= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- builtin/rebase--helper.c | 10 +++++++- git-rebase--interactive.sh | 27 ++-------------------- sequencer.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ sequencer.h | 2 ++ 4 files changed, 70 insertions(+), 26 deletions(-) diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index 613053276e6..791b62901c3 100644 --- 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 { - 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")), @@ -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), + 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() }; @@ -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); + 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); } diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 9d65212b7f1..d5df02435ae 100644 --- 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")" } -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() { - transform_todo_ids + git rebase--helper --expand-ids } collapse_todo_ids() { - transform_todo_ids --short + git rebase--helper --shorten-ids } # Rearrange the todo list that has both "pick sha1 msg" and diff --git a/sequencer.c b/sequencer.c index afcb3d00a32..36ed45d9050 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2462,3 +2462,60 @@ int sequencer_make_script(int keep_empty, FILE *out, 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 83f2943b7a9..71d25374afe 100644 --- 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 transform_todo_ids(int shorten_ids); + extern const char sign_off_header[]; void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag); -- 2.13.3.windows.1.13.gaf0c2223da0