From patchwork Wed Sep 23 07:27:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11794157 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2AFC66CB for ; Wed, 23 Sep 2020 07:28:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 081C6235FC for ; Wed, 23 Sep 2020 07:28:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nU+dmDUE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726779AbgIWH2J (ORCPT ); Wed, 23 Sep 2020 03:28:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726716AbgIWH2I (ORCPT ); Wed, 23 Sep 2020 03:28:08 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3E27C0613D1 for ; Wed, 23 Sep 2020 00:28:07 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id z4so19802887wrr.4 for ; Wed, 23 Sep 2020 00:28:07 -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=V3XoLAkZ22MkSetPvCkGEfSe9qUnUEj3czdfFAaQXE4=; b=nU+dmDUEYiENpTNSpcUmokuPDZi9Bz3ToDwwMYqdDbDL6QG6vYJ3j5U89x6sFaUJIp s48uWxVRLuL26ZG/IofuzT0TcB2GgbeT5dWoZeS2AOHwNnscV0S7qWLyPvgDy8EfXjfH q1l9L1nJDaYIf8LWe1zimv/BdLPizxrbbQi0lBZFZAid5WJinD6SvkYTdZTLDxdH9HbZ 1fAkG/wOqMfniEFdXB5nYfTXUxtiO4pKpuU0wyTFfXFRmVoCNdDExw+zok65aqyv5aym ZoqqY8VkuDHFaA7s651Yp3BIxII1XFRTYbk79VCCpi27CiKywtlB7CkiaNhorP6xnIe6 w6Cg== 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=V3XoLAkZ22MkSetPvCkGEfSe9qUnUEj3czdfFAaQXE4=; b=NYS6HuNThCwB2zX2S9nqtQuKr+mXJG5UH2XRRKj4X8q9bQTQD7JHvGbV271rkq9AFh J+rMgkD/vn/c0XfX+CGlsYUGU1SObpYde/LKnz3eDIYwBAGRnIl0ZvVX/QL4Leh5wxnJ Z6d93xQ13i2dMDGzw4KykFLZyAKMk6ZUNHJRiiZkWyWFVimpJ9n65m3zC7X6jp1bAGVY lYutdoSNibrYsV648G96ZBTgyQbPWr01BagcMyk1dIaax8q2Yn6x+cJsnOvbrcv8hOJx 9/t9Mqfr+FtgtZPFP5XWinwwGcZ5pvJAJIZVQwWb16DpxVooGLGM/ZyaAN/N4KhW0gsx T3lw== X-Gm-Message-State: AOAM533/erKJ46AqGRqvjk5VjtUcY+CH06R9HXtL5kwCTbd7EonzmgGX Vwz+wrzCVbrWUm20PRAaoiOVSlIoSRk= X-Google-Smtp-Source: ABdhPJyDZvCJlD2eAkzamrNpKC7Gf9dyWocODIwkP3SLJnapV7p7Id7lG/xTaTDqqgsj+tyAO1st6w== X-Received: by 2002:adf:a3db:: with SMTP id m27mr8133887wrb.277.1600846086144; Wed, 23 Sep 2020 00:28:06 -0700 (PDT) Received: from localhost.localdomain ([178.237.235.60]) by smtp.gmail.com with ESMTPSA id j14sm30046838wrr.66.2020.09.23.00.28.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2020 00:28:05 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Lars Schneider , Christian Couder , Johannes Schindelin , Tanushree Tumane , Miriam Rubio Subject: [PATCH v8 4/6] bisect--helper: reimplement `bisect_autostart` shell function in C Date: Wed, 23 Sep 2020 09:27:38 +0200 Message-Id: <20200923072740.20772-5-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200923072740.20772-1-mirucam@gmail.com> References: <20200923072740.20772-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Pranit Bauva Reimplement the `bisect_autostart()` shell function in C and add the C implementation from `bisect_next()` which was previously left uncovered. Add `--bisect-autostart` subcommand to be called from git-bisect.sh. Using `--bisect-autostart` subcommand is a temporary measure to port the shell function to C so as to use the existing test suite. As more functions are ported, this subcommand will be retired and bisect_autostart() will be called directly by `bisect_state()`. Change behavior of shell script that returned success when user aborted the bisection. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Pranit Bauva Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 44 +++++++++++++++++++++++++++++++++++++++- git-bisect.sh | 25 ++--------------------- 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 46d2abb36f..ab27a8dff6 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -29,6 +29,7 @@ static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"), N_("git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}=]" " [--no-checkout] [--first-parent] [ [...]] [--] [...]"), + N_("git bisect--helper --bisect-autostart"), NULL }; @@ -653,6 +654,38 @@ static int bisect_start(struct bisect_terms *terms, const char **argv, int argc) return res; } +static inline int file_is_not_empty(const char *path) +{ + return !is_empty_or_missing_file(path); +} + +static int bisect_autostart(struct bisect_terms *terms) +{ + int res; + const char *yesno; + + if (file_is_not_empty(git_path_bisect_start())) + return 0; + + fprintf_ln(stderr, _("You need to start by \"git bisect " + "start\"\n")); + + if (!isatty(STDIN_FILENO)) + return -1; + + /* + * TRANSLATORS: Make sure to include [Y] and [n] in your + * translation. The program will only accept English input + * at this point. + */ + yesno = git_prompt(_("Do you want me to do it for you " + "[Y/n]? "), PROMPT_ECHO); + res = tolower(*yesno) == 'n' ? + -1 : bisect_start(terms, empty_strvec, 0); + + return res; +} + int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { enum { @@ -665,7 +698,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) CHECK_AND_SET_TERMS, BISECT_NEXT_CHECK, BISECT_TERMS, - BISECT_START + BISECT_START, + BISECT_AUTOSTART, } cmdmode = 0; int res = 0, nolog = 0; struct option options[] = { @@ -689,6 +723,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) N_("print out the bisect terms"), BISECT_TERMS), OPT_CMDMODE(0, "bisect-start", &cmdmode, N_("start the bisect session"), BISECT_START), + OPT_CMDMODE(0, "bisect-autostart", &cmdmode, + N_("start the bisection if it has not yet been started"), BISECT_AUTOSTART), OPT_BOOL(0, "no-log", &nolog, N_("no log for BISECT_WRITE")), OPT_END() @@ -748,6 +784,12 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) set_terms(&terms, "bad", "good"); res = bisect_start(&terms, argv, argc); break; + case BISECT_AUTOSTART: + if (argc) + return error(_("--bisect-autostart does not accept arguments")); + set_terms(&terms, "bad", "good"); + res = bisect_autostart(&terms); + break; default: BUG("unknown subcommand %d", cmdmode); } diff --git a/git-bisect.sh b/git-bisect.sh index 2f60fefcfa..4e9b2d36cb 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -49,27 +49,6 @@ bisect_head() fi } -bisect_autostart() { - test -s "$GIT_DIR/BISECT_START" || { - gettextln "You need to start by \"git bisect start\"" >&2 - if test -t 0 - then - # TRANSLATORS: Make sure to include [Y] and [n] in your - # translation. The program will only accept English input - # at this point. - gettext "Do you want me to do it for you [Y/n]? " >&2 - read yesno - case "$yesno" in - [Nn]*) - exit ;; - esac - bisect_start - else - exit 1 - fi - } -} - bisect_start() { git bisect--helper --bisect-start $@ || exit @@ -108,7 +87,7 @@ bisect_skip() { } bisect_state() { - bisect_autostart + git bisect--helper --bisect-autostart || exit state=$1 git bisect--helper --check-and-set-terms $state $TERM_GOOD $TERM_BAD || exit get_terms @@ -149,7 +128,7 @@ bisect_auto_next() { bisect_next() { case "$#" in 0) ;; *) usage ;; esac - bisect_autostart + git bisect--helper --bisect-autostart git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD $TERM_GOOD|| exit # Perform all bisection computation, display and checkout