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=-2.0 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,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 4E9CC20357 for ; Fri, 14 Jul 2017 14:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754548AbdGNOpl (ORCPT ); Fri, 14 Jul 2017 10:45:41 -0400 Received: from mout.gmx.net ([212.227.17.20]:61847 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754530AbdGNOpj (ORCPT ); Fri, 14 Jul 2017 10:45:39 -0400 Received: from virtualbox ([37.201.192.198]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M3NEK-1dnQEo01Ng-00qzos; Fri, 14 Jul 2017 16:45:26 +0200 Date: Fri, 14 Jul 2017 16:45:25 +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 08/10] rebase -i: skip unnecessary picks using the rebase--helper In-Reply-To: Message-ID: <7f234693bdce5a4539ef6890569185c6a0ddda5a.1500043437.git.johannes.schindelin@gmx.de> 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:nSHjbGoXnnw/OFDMsXQ+YlL3TT2J/oAww2Fj4u+H0HHAw4AN73S Fqzfyz5VrApMtS2j+Rh4EuSKuwCZMACQzge9g+HwJjDY/m1/qXL5yEWfz41aaO0XJKIYBqB CPfJfXMvIkP2o7lnBhbaRanQmkGDAWcvJ/iItbqQDOgUsB2/x1DvRV0Os1rhKMu6gjxjFYY 6+P4P0tYrBzt9L2x6kKzA== X-UI-Out-Filterresults: notjunk:1;V01:K0:QUZpSFd6vsY=:EtE8swyBxkFtEZze2gcNGg Z/QolIvy1jntXT4RjKa0429iBe24ttA4QTl3dvZaFB13MgWulY1ZvBYwMFVrwBGUt6pSzFzYT 8qrPgWus27a4RTxDRU3uOgyiOyQP+QjN5x+jZu2NVrV/TQbl5tdXWX5yCOsoyZfJTtW2iz2VC BERCQTn9UbwZpd5UEIDte6voeNJKi56tlqSc5LrTp0Yg4qZbb0eo0Q1nAX1mCOH/NddhHfbyg 1JGPkFygl21bPXJ6t0cmKsfCS2LTqmXCUUYQupMbB8CAnY0Ehb+0V8VTSzgDPF8CaChTbSbUU uBOE23ENXV58fuC81yHvIpOLINKaD/kSNkVY3pgiXRR9/HUUmcnTlB1wau0CDvbgalKXQCs5t pTc1x2mV56NB4UuhRtPp5W2ZFMpRfvk72d1PmotDU/lfbo7SPoBANLqWMzXeS2sZMCO0hgH0C VRv3tJWfEF0nMXXej5qP8QzvhLw/cWbonZs2tZlgZdZo9AJtVGvWG4jPx9gJJocII1uG8o4w9 ZvvloY02TkWNwuVbi2VNXv1OJeTuk32/BYRgWvEtpGKQ26PuZWVoO9Ts7uOOIpeh2MzDsv3Qv NC2rvx7khYyTcT/pwLpOyRE82C4gnIuZrpTlwKaK/bs2KZ+xGfEKEgngKl8ZeS/msto2Oh+wt tspltpbr7kzu6gVHLIHqPft7W9rbPuoaghHCuDTFXpYlrT2Lnr4HxTT4MNgG3J1nbei2nE35D O/1A/y48yQLzJzKsgeKOzpdATy48esAmox9A/t4evrYEgrDQhJhsiJlatuBmzdRNDz0ZiblkC dArjsGyh2a0/0yjYx2d8WhoE6e8IE6XfuDjxzPE7nEh9ZEorPk= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In particular on Windows, where shell scripts are even more expensive than on MacOSX or Linux, it makes sense to move a loop that forks Git at least once for every line in the todo list into a builtin. Note: The original code did not try to skip unnecessary picks of root commits but punts instead (probably --root was not considered common enough of a use case to bother optimizing). We do the same, for now. Signed-off-by: Johannes Schindelin --- builtin/rebase--helper.c | 6 ++- git-rebase--interactive.sh | 41 ++--------------- sequencer.c | 107 +++++++++++++++++++++++++++++++++++++++++++++ sequencer.h | 1 + 4 files changed, 116 insertions(+), 39 deletions(-) diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index 305adb5b707..057ae7102ff 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -15,7 +15,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) int keep_empty = 0; enum { CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_SHA1S, EXPAND_SHA1S, - CHECK_TODO_LIST + CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS } command = 0; struct option options[] = { OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")), @@ -32,6 +32,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) N_("expand SHA-1s in the todo list"), EXPAND_SHA1S), 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_END() }; @@ -56,5 +58,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) return !!transform_todo_ids(0); if (command == CHECK_TODO_LIST && argc == 1) return !!check_todo_list(); + if (command == SKIP_UNNECESSARY_PICKS && argc == 1) + return !!skip_unnecessary_picks(); usage_with_options(builtin_rebase_helper_usage, options); } diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c8cad318fa4..af8d7bd77fb 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -713,43 +713,6 @@ do_rest () { done } -# skip picking commits whose parents are unchanged -skip_unnecessary_picks () { - fd=3 - while read -r command rest - do - # fd=3 means we skip the command - case "$fd,$command" in - 3,pick|3,p) - # pick a commit whose parent is current $onto -> skip - sha1=${rest%% *} - case "$(git rev-parse --verify --quiet "$sha1"^)" in - "$onto"*) - onto=$sha1 - ;; - *) - fd=1 - ;; - esac - ;; - 3,"$comment_char"*|3,) - # copy comments - ;; - *) - fd=1 - ;; - esac - printf '%s\n' "$command${rest:+ }$rest" >&$fd - done <"$todo" >"$todo.new" 3>>"$done" && - mv -f "$todo".new "$todo" && - case "$(peek_next_command)" in - squash|s|fixup|f) - record_in_rewritten "$onto" - ;; - esac || - die "$(gettext "Could not skip unnecessary pick commands")" -} - expand_todo_ids() { git rebase--helper --expand-ids } @@ -1149,7 +1112,9 @@ git rebase--helper --check-todo-list || { expand_todo_ids -test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks +test -d "$rewritten" || test -n "$force_rebase" || +onto="$(git rebase--helper --skip-unnecessary-picks)" || +die "Could not skip unnecessary pick commands" checkout_onto if test -z "$rebase_root" && test ! -d "$rewritten" diff --git a/sequencer.c b/sequencer.c index 15107de1e1c..96d43aec764 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2641,3 +2641,110 @@ int check_todo_list(void) return res; } + +/* skip picking commits whose parents are unchanged */ +int skip_unnecessary_picks(void) +{ + const char *todo_file = rebase_path_todo(); + struct strbuf buf = STRBUF_INIT; + struct todo_list todo_list = TODO_LIST_INIT; + struct object_id onto_oid, *oid = &onto_oid, *parent_oid; + int fd, i; + + if (!read_oneliner(&buf, rebase_path_onto(), 0)) + return error(_("could not read 'onto'")); + if (get_oid(buf.buf, &onto_oid)) { + strbuf_release(&buf); + return error(_("need a HEAD to fixup")); + } + strbuf_release(&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); + if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) { + todo_list_release(&todo_list); + return -1; + } + + for (i = 0; i < todo_list.nr; i++) { + struct todo_item *item = todo_list.items + i; + + if (item->command >= TODO_NOOP) + continue; + if (item->command != TODO_PICK) + break; + if (parse_commit(item->commit)) { + todo_list_release(&todo_list); + return error(_("could not parse commit '%s'"), + oid_to_hex(&item->commit->object.oid)); + } + if (!item->commit->parents) + break; /* root commit */ + if (item->commit->parents->next) + break; /* merge commit */ + parent_oid = &item->commit->parents->item->object.oid; + if (hashcmp(parent_oid->hash, oid->hash)) + break; + oid = &item->commit->object.oid; + } + if (i > 0) { + int offset = i < todo_list.nr ? + todo_list.items[i].offset_in_buf : todo_list.buf.len; + const char *done_path = rebase_path_done(); + + fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666); + if (fd < 0) { + error_errno(_("could not open '%s' for writing"), + done_path); + todo_list_release(&todo_list); + return -1; + } + if (write_in_full(fd, todo_list.buf.buf, offset) < 0) { + error_errno(_("could not write to '%s'"), done_path); + todo_list_release(&todo_list); + close(fd); + return -1; + } + close(fd); + + fd = open(rebase_path_todo(), O_WRONLY, 0666); + if (fd < 0) { + error_errno(_("could not open '%s' for writing"), + rebase_path_todo()); + todo_list_release(&todo_list); + return -1; + } + if (write_in_full(fd, todo_list.buf.buf + offset, + todo_list.buf.len - offset) < 0) { + error_errno(_("could not write to '%s'"), + rebase_path_todo()); + close(fd); + todo_list_release(&todo_list); + return -1; + } + if (ftruncate(fd, todo_list.buf.len - offset) < 0) { + error_errno(_("could not truncate '%s'"), + rebase_path_todo()); + todo_list_release(&todo_list); + close(fd); + return -1; + } + close(fd); + + todo_list.current = i; + if (is_fixup(peek_command(&todo_list, 0))) + record_in_rewritten(oid, peek_command(&todo_list, 0)); + } + + todo_list_release(&todo_list); + printf("%s\n", oid_to_hex(oid)); + + return 0; +} diff --git a/sequencer.h b/sequencer.h index 878dd296f8c..04a57e09a1d 100644 --- a/sequencer.h +++ b/sequencer.h @@ -50,6 +50,7 @@ int sequencer_make_script(int keep_empty, FILE *out, int transform_todo_ids(int shorten_ids); int check_todo_list(void); +int skip_unnecessary_picks(void); extern const char sign_off_header[]; -- 2.13.3.windows.1.13.gaf0c2223da0