From patchwork Thu Sep 27 21:55:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alban Gruin X-Patchwork-Id: 10618633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E3CE417B for ; Thu, 27 Sep 2018 22:00:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DC2A2B8B8 for ; Thu, 27 Sep 2018 22:00:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51D172B8E4; Thu, 27 Sep 2018 22:00:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C38EC2B8DB for ; Thu, 27 Sep 2018 22:00:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727620AbeI1EVC (ORCPT ); Fri, 28 Sep 2018 00:21:02 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44395 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727567AbeI1EVC (ORCPT ); Fri, 28 Sep 2018 00:21:02 -0400 Received: by mail-wr1-f68.google.com with SMTP id v16-v6so4206567wro.11 for ; Thu, 27 Sep 2018 15:00:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V20aHstr7lHBofIfJHFdCgIzVlM/8E0oK6yRdv+SaM4=; b=qE1cUH0n1iLsrBSQ2zMSgcvG4gbJfnu1ZBd2xDNgVWUpPY4U49PhRd01akkD29BILT 4zzCjvgJXPeL5yNjaUqfgROQmSRUaRgG8R5nKXQQB31Lfk/cgvr6z0fuO63/ymxfmv4L UBnrih9U0ZOXuA6ZO0t1n3auZlrZxgJMAiTzjSp5x5lIgoVFMPWlVNCVGpBzVcQYTJPJ d89+aq/f/EwaFDK0+P70+lFkHdsyF2p2c7/719pNgVejpK3wcTYxHJyIm03vmDujLARM eVgqX4g0JYToYaEWFjPWyXoLvH664Ec0Qd6PtvJYQEF1fvYrCrbwDa+JaLicgCOF4x+U BcxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V20aHstr7lHBofIfJHFdCgIzVlM/8E0oK6yRdv+SaM4=; b=qa8Ao7lYuqC/vlhunTH46OEqLAagFD0tMySjxkzKi/yEo378i9TwjhpoVaVwtTWxEJ 88o/alskbq20Kr7LzP2XIFhoTOyM7taw16qOGrRLXbOkyVigGqhE10rbD+n4Gk1FHyAg NZCDG0PFFnSevqk6LWx3YjhFxR5q4RhXE8oPcZEHjgDdr1LYX32F5Sx7Wd9xz60yJBRb QWcqwidmXAFI8T1A7Wm68qs4y6MWAbbl/+W3Fhk5NBQQOmRPBvOyeACkzSifyeDf/YCK qP0CKRdLRHbKV4iTxmXLrVRKBiXSMWm7n0fcegkNxQG3NAvYgJfOcZr4SvLPQoE399mR 3Y7Q== X-Gm-Message-State: ABuFfoj0MMF5qaRU+YBybePiQ13+2cM2Eck+YMiK9MULtoMl9BW+47DE jvCd04l3pTZGyXXDTDyqXa5l++Ho X-Google-Smtp-Source: ACcGV62O1s8nfFva0AkgJUN3ShlnVygqOqNeVe8pt56Bl2HPn9nz6cg0LfFUo5xYqzV29wEjVOD/aw== X-Received: by 2002:adf:93c2:: with SMTP id 60-v6mr9592432wrp.81.1538085636041; Thu, 27 Sep 2018 15:00:36 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-28-140.w86-222.abo.wanadoo.fr. [86.222.27.140]) by smtp.googlemail.com with ESMTPSA id h206-v6sm243153wmf.25.2018.09.27.15.00.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 15:00:35 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Stefan Beller , Christian Couder , Pratik Karki , Johannes Schindelin , phillip.wood@dunelm.org.uk, gitster@pobox.com, Alban Gruin Subject: [GSoC][PATCH v8 07/20] rebase -i: rewrite checkout_onto() in C Date: Thu, 27 Sep 2018 23:55:57 +0200 Message-Id: <20180927215610.32210-8-alban.gruin@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180927215610.32210-1-alban.gruin@gmail.com> References: <20180828121045.14933-1-alban.gruin@gmail.com> <20180927215610.32210-1-alban.gruin@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This rewrites checkout_onto() from shell to C. A new command (“checkout-onto”) is added to rebase--helper.c. The shell version is then stripped. Signed-off-by: Alban Gruin --- No changes since v7. builtin/rebase--helper.c | 7 ++++++- git-rebase--interactive.sh | 25 ++++--------------------- sequencer.c | 19 +++++++++++++++++++ sequencer.h | 3 +++ 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index 0e76dadba6..7d9426d23c 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -18,7 +18,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) 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 + ADD_EXEC, APPEND_TODO_HELP, EDIT_TODO, PREPARE_BRANCH, + CHECKOUT_ONTO } command = 0; struct option options[] = { OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")), @@ -54,6 +55,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) 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_END() }; @@ -99,5 +102,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) 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]); usage_with_options(builtin_rebase_helper_usage, options); } diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 77e972bb6c..b68f108f28 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -28,17 +28,6 @@ case "$comment_char" in ;; esac -orig_reflog_action="$GIT_REFLOG_ACTION" - -comment_for_reflog () { - case "$orig_reflog_action" in - ''|rebase*) - GIT_REFLOG_ACTION="rebase -i ($1)" - export GIT_REFLOG_ACTION - ;; - esac -} - die_abort () { apply_autostash rm -rf "$state_dir" @@ -70,14 +59,6 @@ collapse_todo_ids() { git rebase--helper --shorten-ids } -# Switch to the branch in $into and notify it in the reflog -checkout_onto () { - comment_for_reflog start - GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" - output git checkout $onto || die_abort "$(gettext "could not detach HEAD")" - git update-ref ORIG_HEAD $orig_head -} - get_missing_commit_check_level () { check_level=$(git config --get rebase.missingCommitsCheck) check_level=${check_level:-ignore} @@ -176,7 +157,8 @@ EOF git rebase--helper --check-todo-list || { ret=$? - checkout_onto + git rebase--helper --checkout-onto "$onto_name" "$onto" \ + "$orig_head" ${verbose:+--verbose} exit $ret } @@ -186,7 +168,8 @@ EOF onto="$(git rebase--helper --skip-unnecessary-picks)" || die "Could not skip unnecessary pick commands" - checkout_onto + git rebase--helper --checkout-onto "$onto_name" "$onto" "$orig_head" \ + ${verbose:+--verbose} require_clean_work_tree "rebase" exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \ --continue diff --git a/sequencer.c b/sequencer.c index d8a59c50f8..c7f930ab9c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3315,6 +3315,25 @@ int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit) return 0; } +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); + + if (get_oid(orig_head, &oid)) + return error(_("%s: not a valid OID"), orig_head); + + if (run_git_checkout(opts, onto, action)) { + apply_autostash(opts); + sequencer_remove_state(opts); + return error(_("could not detach HEAD")); + } + + return update_ref(NULL, "ORIG_HEAD", &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR); +} + static const char rescheduled_advice[] = N_("Could not execute the todo command\n" "\n" diff --git a/sequencer.h b/sequencer.h index 9f0ce21be7..5fa89edd3b 100644 --- a/sequencer.h +++ b/sequencer.h @@ -122,6 +122,9 @@ 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); +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)