From patchwork Thu Sep 24 12:33:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11797179 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 CD8E16CB for ; Thu, 24 Sep 2020 12:34:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A73BC238E4 for ; Thu, 24 Sep 2020 12:34:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CKaa/2ZJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727794AbgIXMeA (ORCPT ); Thu, 24 Sep 2020 08:34:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727570AbgIXMeA (ORCPT ); Thu, 24 Sep 2020 08:34:00 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA9A1C0613CE for ; Thu, 24 Sep 2020 05:33:59 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id m6so3669095wrn.0 for ; Thu, 24 Sep 2020 05:33:59 -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=M+JmQMk+e2m4npZedAl84xsb23PB90uGmu0PhUZk5L0=; b=CKaa/2ZJfhRZygsBiKGSd3rPHOwtzaEiSUd1Hfsd2Vy8oatopa+Wc787DZ6vSZWNJp zLK/A0y46cW37LuMeLtfOG6KeMgPL+YoMhSSWBt6Vo9+L3qVzVsm7dbn/2r9VX5E85Hn mvWqWphXROtpYHw9qkLJL3plikM2XM3bGAAvUhAIA/9g74E9K7g07+LDv2kYFWP97kpX ZiqEUT8x9TxYf1yZ31WtHWfLXvJSTBXqJWyJnT84DTxEqYP6xaimXxFW2QrJUvlnSZJF YmKySzBm8HSYzMppJzEN603dxIKEZ7mw7X6gfMDpUvuMQTCp+Wnx+cvhvFvjyLEVPWL7 oKpg== 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=M+JmQMk+e2m4npZedAl84xsb23PB90uGmu0PhUZk5L0=; b=Ho5duHz4ZMmV/SZkm7M39+55by2wnciDi3ZJgPFQGETmKv8ixsaNh+vwAZNakom0fn ktVUKvq/9cyvK8Mqr4fMUBlDcoRVnZhWObzSOAQR4g6r6Pr5aVOrhpzkmOlpbhrhY6m7 U6LQUCm8sBtdCFdmOk7fIWbmZCexa28b4UMAZktP1417i3TFDp05NsVoXBgcPql4IGE9 xxbN5j8OxGEzOsRM6Q0LLVU5xlURncx21u9d4pNz5S+wbSGVi9cMRpqn5WfyQkCSK2qI FB1uW+UKCBpneI/Jm3GYONIiDPVRBNa2F7aZkY9TRCjq4RUI7m/hKSmkGgzKFlUeX7yf q4gg== X-Gm-Message-State: AOAM532V4Rc7biWz86+AIrCrSnGau2OMlnmFa2H+rX4guEgh+mhKlbvk hxMyDApQkYKlRR9CC5h6wYLdLFSOfoU= X-Google-Smtp-Source: ABdhPJzVZ2uSV1rbX1iDGIyW2zi8WMiKKGQn+fWGXJ3D3c83GgvBoIQLfZGrMFrFKfYY1+htlyNKJw== X-Received: by 2002:a5d:52ca:: with SMTP id r10mr4600657wrv.195.1600950838232; Thu, 24 Sep 2020 05:33:58 -0700 (PDT) Received: from localhost.localdomain ([178.237.235.60]) by smtp.gmail.com with ESMTPSA id i83sm3485457wma.22.2020.09.24.05.33.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 05:33:57 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio , Christian Couder , Johannes Schindelin Subject: [PATCH v9 1/6] bisect--helper: BUG() in cmd_*() on invalid subcommand Date: Thu, 24 Sep 2020 14:33:35 +0200 Message-Id: <20200924123340.52632-2-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200924123340.52632-1-mirucam@gmail.com> References: <20200924123340.52632-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In cmd_bisect__helper() function, if an invalid or no subcommand is passed there is a BUG. BUG() out instead of returning an error. Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 7dcc1b5188..23a9f00035 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -720,7 +720,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) res = bisect_start(&terms, argv, argc); break; default: - return error("BUG: unknown subcommand '%d'", cmdmode); + BUG("unknown subcommand %d", cmdmode); } free_terms(&terms); From patchwork Thu Sep 24 12:33:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11797181 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 A952059D for ; Thu, 24 Sep 2020 12:34:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A759238E4 for ; Thu, 24 Sep 2020 12:34:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="siGigk+C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727801AbgIXMeB (ORCPT ); Thu, 24 Sep 2020 08:34:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727570AbgIXMeB (ORCPT ); Thu, 24 Sep 2020 08:34:01 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2AE8C0613CE for ; Thu, 24 Sep 2020 05:34:00 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id k15so3598246wrn.10 for ; Thu, 24 Sep 2020 05:34:00 -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=c9Y7TvxvEafAn9PpUMsqnYYW+Mm5hIL2kR7H/olF6XM=; b=siGigk+CpMbheTE2c2l8+THN0eZLTSpqnpJ5RcXMAf8Be7ZyGb6dNxW/n89VTHnpCU yeiRZcJ3Y0mbaLYr59p+atfLHo9dkLlOg+uCd3/P+0dsU2wGVUQNXGOxXRyiK44yDxAy QgYlo2FbNSYXmMjK5keLvBtNNvfk7TIPNhc6cjGDEkzCMscuj5o8bEmWf8m2+IcRExMq DWSQot3np4EcQ9xLO1GAQ3UyWGNY8NgPMXrcuLWlq5BTO9+yMUIwX0S4ASH6lyQ9KwPB CH0RZFDh6tgQwrvkReubMkSrX53AgwBORD59Si6Z+JISaBj98TIN3umS8QQ92h+Tse2U S++A== 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=c9Y7TvxvEafAn9PpUMsqnYYW+Mm5hIL2kR7H/olF6XM=; b=KRfp4BswanDtsQF6Q5LljYCcX632aIUumw/N4P3DSvwbLpmQv362EjT2IOzWOUJLW/ hOD+/ZBNK2ET/C3b5VJg+4jnBmM7h5iuH37v8V8cMRSVlbFTgY+aH5zlYlv2xg3DTIu6 3iSavhR2rNES4A7I227CMP/iVLO4Yi5C1heBpuUpnvHzSnJO8sX43wmTIYBjH4fVjSQ9 LKl7mKmPCQMFQS8+14GndCInVNUdVRdeYJ1PJWEWQz2XxK5Ini3bpba4KdlZVnxofP0Z 5+9DtV+Hre+eHL5P1jShQbigfpYArCGSIOC+D6Vfbcc0ZPgUeaYwP0ZXgWhPVPdKEFQD x6dg== X-Gm-Message-State: AOAM533VKaIY4xWM6iYAeQSnMLNOmodWazk+IjRyr696G95eAY7wPjrY vo8CqQOtTPTyjQj8Vrv9PcfLy4xO4Hc= X-Google-Smtp-Source: ABdhPJxe3HsoPlIcArSNuprx4uJvR8EBjKkHrWGKMZwhV6uITFR8P38X1zybBEoleBCIVodretR3ow== X-Received: by 2002:adf:cd05:: with SMTP id w5mr4914792wrm.62.1600950839241; Thu, 24 Sep 2020 05:33:59 -0700 (PDT) Received: from localhost.localdomain ([178.237.235.60]) by smtp.gmail.com with ESMTPSA id i83sm3485457wma.22.2020.09.24.05.33.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 05:33:58 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio , Christian Couder , Junio C Hamano Subject: [PATCH v9 2/6] bisect--helper: use '-res' in 'cmd_bisect__helper' return Date: Thu, 24 Sep 2020 14:33:36 +0200 Message-Id: <20200924123340.52632-3-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200924123340.52632-1-mirucam@gmail.com> References: <20200924123340.52632-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Following 'enum bisect_error' vocabulary, return variable 'res' is always non-positive. Let's use '-res' instead of 'abs(res)' to make the code clearer. Mentored-by: Christian Couder Helped-by: Junio C Hamano Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 23a9f00035..8037888ae2 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -731,5 +731,5 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) res = BISECT_OK; - return abs(res); + return -res; } From patchwork Thu Sep 24 12:33:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11797183 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 A026F59D for ; Thu, 24 Sep 2020 12:34:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83B6E2395B for ; Thu, 24 Sep 2020 12:34:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZuahN31K" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727810AbgIXMeF (ORCPT ); Thu, 24 Sep 2020 08:34:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727570AbgIXMeC (ORCPT ); Thu, 24 Sep 2020 08:34:02 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E03B2C0613CE for ; Thu, 24 Sep 2020 05:34:01 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id l15so6707757wmh.1 for ; Thu, 24 Sep 2020 05:34:01 -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=6RIDM9yzJVsduW37sLu4RYCMYtjNJRoj3YnsK67/z0s=; b=ZuahN31Kl9lKmnQkVKnigJhIUA6TxNZ/WgErPO99eizUta2mGGkstvzz1Mk4fBEKn9 ev42fg3z0e77pa23YEkSK9rEwZ3igiyy753dkJUcQzOiENOS7IDH5aDuX1qpw+ZU0dY1 ZKqiLRLicoTzSh+U2EvjrZqHKYimom43/SDngGA8WvSU5Czgi2YeTXADb4MQq0+AgTNa +0RoJg8B6AZVV2y0hgqd9hl4/LGP2dxFLWYjC1MTbxy/BUc13/Vq2qM32Vl0mBTO+UTX f8YmdropzByz0cM/J50WPPT6XumfqjKhabdW1c2GY5HHIDZVYVtdvRSVKJk2Jll1rzRK 3tiQ== 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=6RIDM9yzJVsduW37sLu4RYCMYtjNJRoj3YnsK67/z0s=; b=IidmQSHIG35OBKEF4R5nolRz6QNdrGbukH3lvWI4LzzVIWmVTwrruq62X/AzsiRq2S O5a5rRw3MlNMM3tdxbgl1Z5VLeFThAY3DxdYsSRBWqlRVKXgpRrEOvNCdAQ9vU/nPNd4 cA70IDBxlLhZpN/FB9tH3ZA+FICZ0lr3bZLJqdNaTuarN1TLag/ZIOxTWNizObelWv5N PLS7jQ7p1PX0yF6mFPTWZRNibYlP+USSX59/UoMwVNNs3RrVcjJYN5cFCgf82wsRjQOc ED8rvGOC1RBVOH1ZhMMFVgo8IVIUH0aSkjSboWlYyskmy4I6uE547DZOY90SnhHqzZEH QCng== X-Gm-Message-State: AOAM5318skUj4Dd+VDM24cAukBkkC/ERT4q6SJBa6hnjIcZ2OH1e0BUw +IrTU1PI6y61NpcilHAisgj6ki4wxL0= X-Google-Smtp-Source: ABdhPJz9qKThYNtSDZl+6YDT7GjnznP51hPK1zh/Q7lKhnoKo0A1QRqPjQYpHTLnYPlmM+wfxz1e0w== X-Received: by 2002:a1c:e3c3:: with SMTP id a186mr4838070wmh.189.1600950840323; Thu, 24 Sep 2020 05:34:00 -0700 (PDT) Received: from localhost.localdomain ([178.237.235.60]) by smtp.gmail.com with ESMTPSA id i83sm3485457wma.22.2020.09.24.05.33.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 05:33:59 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio , Christian Couder , Johannes Schindelin Subject: [PATCH v9 3/6] bisect--helper: introduce new `write_in_file()` function Date: Thu, 24 Sep 2020 14:33:37 +0200 Message-Id: <20200924123340.52632-4-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200924123340.52632-1-mirucam@gmail.com> References: <20200924123340.52632-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Let's refactor code adding a new `write_in_file()` function that opens a file for writing a message and closes it and a wrapper for writing mode. This helper will be used in later steps and makes the code simpler and easier to understand. Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 43 +++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8037888ae2..46d2abb36f 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -74,6 +74,40 @@ static int one_of(const char *term, ...) return res; } +static int write_in_file(const char *path, const char *mode, const char *format, va_list args) +{ + FILE *fp = NULL; + int res = 0; + + if (strcmp(mode, "w")) + BUG("write-in-file does not support '%s' mode", mode); + fp = fopen(path, mode); + if (!fp) + return error_errno(_("cannot open file '%s' in mode '%s'"), path, mode); + res = vfprintf(fp, format, args); + + if (res < 0) { + int saved_errno = errno; + fclose(fp); + errno = saved_errno; + return error_errno(_("could not write to file '%s'"), path); + } + + return fclose(fp); +} + +static int write_to_file(const char *path, const char *format, ...) +{ + int res; + va_list args; + + va_start(args, format); + res = write_in_file(path, "w", format, args); + va_end(args); + + return res; +} + static int check_term_format(const char *term, const char *orig_term) { int res; @@ -104,7 +138,6 @@ static int check_term_format(const char *term, const char *orig_term) static int write_terms(const char *bad, const char *good) { - FILE *fp = NULL; int res; if (!strcmp(bad, good)) @@ -113,13 +146,9 @@ static int write_terms(const char *bad, const char *good) if (check_term_format(bad, "bad") || check_term_format(good, "good")) return -1; - fp = fopen(git_path_bisect_terms(), "w"); - if (!fp) - return error_errno(_("could not open the file BISECT_TERMS")); + res = write_to_file(git_path_bisect_terms(), "%s\n%s\n", bad, good); - res = fprintf(fp, "%s\n%s\n", bad, good); - res |= fclose(fp); - return (res < 0) ? -1 : 0; + return res; } static int is_expected_rev(const char *expected_hex) From patchwork Thu Sep 24 12:33: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: 11797187 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 8666B59D for ; Thu, 24 Sep 2020 12:34:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60B03235FD for ; Thu, 24 Sep 2020 12:34:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lZScrOiz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727807AbgIXMeE (ORCPT ); Thu, 24 Sep 2020 08:34:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727757AbgIXMeE (ORCPT ); Thu, 24 Sep 2020 08:34:04 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BA6BC0613D3 for ; Thu, 24 Sep 2020 05:34:03 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id k18so3399003wmj.5 for ; Thu, 24 Sep 2020 05:34:03 -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=XqFQnS4xBRLe9JS0i3eneAHjIpDK3GpJ2K5ArNHAlKk=; b=lZScrOizl8WUREsuJUUvkh+WYS/M/If7zstXoM6MAptyWCJgqCtB/z6XTZ8AlJA5Lf woYjxcR+zB1rggf65YDgI3FBx/eC8nXCW4iq1sZTiKhfPMnUQMqO/AASevvT2Y4Ae3Ho N2OGkZ+arvu16mYKXJrdUj9qAKRll93dIR0xBXzdoWXF7idEogx34DtYNYcHLoQ4CJ9N us/g9uQNRCXwiPWjwz20nm4nf7oRQ7fLYe9BSL7A/NXumWL4TqWH93zn5fjCVvgjdBh4 9jolpatcjkXdKeMp6RWm7Fuf6HT8U2l3YAkOv3cFKP3zvRvPqg+4xqzmPldc49QjYeNv ov9A== 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=XqFQnS4xBRLe9JS0i3eneAHjIpDK3GpJ2K5ArNHAlKk=; b=NH2+NbL6MIO7XjyVZQ3AGMxXUKHxoP2PxkCOkGhy8n4hfGhqaua/bemEWYSGKCxhSX qvR8E1RhF7nbxYuD2wKLn6ZB311ky5SfHruiMfC1NeoIHETeBRYOxTZTWtie3MwHlXGy dAJ/9DaJgMYJC6xay08WbEzxnlW2VFMfl0fKtO8vzlcCDbBo6MrZlie+UQ2sj2epfppQ U0Xcmb/2WeN+Gf6xMrobbnsw/w6gyiZwLuz55kWAR6cGzKmvl238JcztifUb72GU3Cie 1ZPdoKkiJvNRbnzsXa0BUOgqZSnaVmRihbB3nFiPsjeMFTghEMg0MkizzlrGnUdfPGWX jOag== X-Gm-Message-State: AOAM530qz4No6rvXjZFuzbf4A/hkBE9R9/1alQYcc8CbnLQlqX5psVN8 BkRcFM2PkbtaVeirdqVGg/g5vP0PLGE= X-Google-Smtp-Source: ABdhPJzRBh8Fe0FTfuGz2iGtCX8R7TXrUpuAYJ1XGRvos6WxlUJAloaVIM5jlRJXT6jslyB8witV5w== X-Received: by 2002:a1c:9c8c:: with SMTP id f134mr4499865wme.27.1600950841549; Thu, 24 Sep 2020 05:34:01 -0700 (PDT) Received: from localhost.localdomain ([178.237.235.60]) by smtp.gmail.com with ESMTPSA id i83sm3485457wma.22.2020.09.24.05.34.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 05:34:01 -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 v9 4/6] bisect--helper: reimplement `bisect_autostart` shell function in C Date: Thu, 24 Sep 2020 14:33:38 +0200 Message-Id: <20200924123340.52632-5-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200924123340.52632-1-mirucam@gmail.com> References: <20200924123340.52632-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..6ed3e42fc2 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 || exit git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD $TERM_GOOD|| exit # Perform all bisection computation, display and checkout From patchwork Thu Sep 24 12:33:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11797185 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 554D11731 for ; Thu, 24 Sep 2020 12:34:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A1B42395B for ; Thu, 24 Sep 2020 12:34:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vCYj6CC2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727813AbgIXMeF (ORCPT ); Thu, 24 Sep 2020 08:34:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727804AbgIXMeE (ORCPT ); Thu, 24 Sep 2020 08:34:04 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 351BAC0613D4 for ; Thu, 24 Sep 2020 05:34:04 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id w5so3613100wrp.8 for ; Thu, 24 Sep 2020 05:34:04 -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=2I9Y2hRuXgRqT6FgB1KECR88tDHWd7i0V/IscrZ+zbo=; b=vCYj6CC2E3tqXW0ogfe/xmkNsPtqkcJTT6h5ucsIF0+Li8yn+ojcZ2aKmoJNraLB/r j2URTmVgWTjVjpwOcos1OMnFboijHTZam5yZ67ilT95FcNHtadhYT6h1s2sEyFUCtFwP 4d8jeKPV/cRT8ar2KMrZ8Xcd8x5dOZUMbw0Tt49lxDY6/3rNS0Ki4tuw3pqb32ffsjx0 Lq3IfyI/Sobv46MCRyHL4ofExxPqnKFf/dIHZ9aGVPMiQGpOwPZWC/4tBHi61ClMc9PG V5m6iDT9EFaA3pe4j5uvbKgz00rmDODsK2ueVrsIbLsCBdYuzsQ8vkMeJQsZ1fQO+0Jz VqaQ== 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=2I9Y2hRuXgRqT6FgB1KECR88tDHWd7i0V/IscrZ+zbo=; b=eTTorYef5ebFjo4wTH37lwwc2k/3qSctzVoT6HgdGqRcEJ3HmRblkJDOyI8E0vHukg SrCbNanGSYmd+qogZOyy7Z+7klaNxPxP31mNm83rwoEjmMgakgOyIALhELSp67bAZEeE 9xNf3lMPbw3B8qx9ntOlg3OYKg7a+UCWwuhCI2vIVZjq1s359V4PGAa5Og4GVaNITwYs XlnQkcESZkr+xwuvCdPc/jE1CMTfsB8kt6YJ5Lq3HIL/pFuBRc1edSullWVLh195rSsK 0nPPV+lyB/eVzM0vrOnoj2H1NcOEfJ1ZdQcdfP9qOzrOevy6b1O83GgiJIinyIj/feYJ RlsA== X-Gm-Message-State: AOAM530V75ubpO5dB5cWWiLe+JiJ/kS6CBjYZkM1m9h5+zxYRhVWtMS1 qIv+GJxBEvr4djfefZK6k24wf4IJWf4= X-Google-Smtp-Source: ABdhPJwZdPMUs9H+FAOV2gUbYhvvSZut3gbqXw90Q2uj3gUHfgV2dR+Z8JUvnZg3N34lQFiLfj/PGQ== X-Received: by 2002:adf:dcd1:: with SMTP id x17mr5278368wrm.150.1600950842732; Thu, 24 Sep 2020 05:34:02 -0700 (PDT) Received: from localhost.localdomain ([178.237.235.60]) by smtp.gmail.com with ESMTPSA id i83sm3485457wma.22.2020.09.24.05.34.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 05:34:02 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio , Christian Couder Subject: [PATCH v9 5/6] bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()' Date: Thu, 24 Sep 2020 14:33:39 +0200 Message-Id: <20200924123340.52632-6-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200924123340.52632-1-mirucam@gmail.com> References: <20200924123340.52632-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As there can be other revision walks after bisect_next_all(), let's add a call to a function to clear all the marks at the end of bisect_next_all(). Mentored-by: Christian Couder Signed-off-by: Miriam Rubio --- bisect.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bisect.c b/bisect.c index d42a3a3767..c6aba2b9f2 100644 --- a/bisect.c +++ b/bisect.c @@ -1082,6 +1082,8 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix) "Bisecting: %d revisions left to test after this %s\n", nr), nr, steps_msg); free(steps_msg); + /* Clean up objects used, as they will be reused. */ + clear_commit_marks_all(ALL_REV_FLAGS); return bisect_checkout(bisect_rev, no_checkout); } From patchwork Thu Sep 24 12:33:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 11797189 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 AA2B159D for ; Thu, 24 Sep 2020 12:34:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85A99235FD for ; Thu, 24 Sep 2020 12:34:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GoqTe6qq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727814AbgIXMeL (ORCPT ); Thu, 24 Sep 2020 08:34:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727728AbgIXMeG (ORCPT ); Thu, 24 Sep 2020 08:34:06 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEB08C0613CE for ; Thu, 24 Sep 2020 05:34:05 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id b79so3409442wmb.4 for ; Thu, 24 Sep 2020 05:34:05 -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=gcVPuA1+yZU6a0zTj51rfQHnvMGMyAX2SY+qfw9gPHE=; b=GoqTe6qqY1ziwXPSgTbxdecyvePJFT6gWeQy+0FRCaWLSu8x6EQEnTR9JnRB4a62s2 BIYspmgITaLOC6Xtt6cVx5NDaZ6+ixaJwWYYpy3zQaJHxJ3wNPDE7vwXTfui4CZWN8DL U76GPZS9G5Av40DHhTTKUWseznXx+CvUgUzkJokugX1gNu6H6vGOo3UOr6STDBietudV KnyogYC6SvOk8lwmY0Q5v7KivoThma8lN3lyIobYR5xT1bZPwqSl/Tq7faDnKrlSVoQe Gmg/NhAZ/cSxQhtEPAY7qWKO5HyQpkmD77T0vc5dEvVzoo36/oAF2OjLhhwTqSfNyaoE yiSQ== 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=gcVPuA1+yZU6a0zTj51rfQHnvMGMyAX2SY+qfw9gPHE=; b=P82pKlgEivPVcguq/KdsSd3m0A3eosSFDysAOCL8CZR7APuxqUUThMM/8nuF6Q/pf6 6Hm/+gaYylgLCBno5trAW48XoFfG3E390xpcw4zkQ8zU1rAhopOCnxCspMC4CEaCj5sk BoxVgnvmb/JKudd+yeNOHCatK1l69AvVxLDjhN1b1zs5UynceXwx1wnGrfZGoPTvegVj EkWQnhZE8u0nU47iG22GZCbqhTHxJWF0tVA0pEnd3NgSWcVbJ1zTKXyeemwLDyAqgM8Q +KNzTHkTM6sOxLMD1DOC1IEqywI4kws2ZZUL5QwIokY3OJ9TIH2mR9fLc4YjJIjr1Z0Q AWmg== X-Gm-Message-State: AOAM532nLDtPid3AAu2n7PPwqZSZtiGMA1etPMQA0UZh7+4/dH3f1cWW JpN3qaLpYHXkQtepcRj96J/OQRRko7w= X-Google-Smtp-Source: ABdhPJy3KVIz/Z7E7+DyHoe9CUaXyr7wL3WzIGV+sCE8Cvn/dxz4lDPwM6DcqU4X9Xg4NYMjj4XZ8g== X-Received: by 2002:a05:600c:2f8f:: with SMTP id t15mr4721640wmn.41.1600950843941; Thu, 24 Sep 2020 05:34:03 -0700 (PDT) Received: from localhost.localdomain ([178.237.235.60]) by smtp.gmail.com with ESMTPSA id i83sm3485457wma.22.2020.09.24.05.34.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 05:34:03 -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 v9 6/6] bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C Date: Thu, 24 Sep 2020 14:33:40 +0200 Message-Id: <20200924123340.52632-7-mirucam@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200924123340.52632-1-mirucam@gmail.com> References: <20200924123340.52632-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_next()` and the `bisect_auto_next()` shell functions in C and add the subcommands to `git bisect--helper` to call them from git-bisect.sh . bisect_auto_next() function returns an enum bisect_error type as whole `git bisect` can exit with an error code when bisect_next() does. Return an error when `bisect_next()` fails, that fix a bug on shell script version. Using `--bisect-next` and `--bisect-auto-next` subcommands is a temporary measure to port shell function to C so as to use the existing test suite. As more functions are ported, `--bisect-auto-next` subcommand will be retired and will be called by some other methods. 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 --- bisect.c | 11 ++- builtin/bisect--helper.c | 180 ++++++++++++++++++++++++++++++++++++++- git-bisect.sh | 47 +--------- 3 files changed, 191 insertions(+), 47 deletions(-) diff --git a/bisect.c b/bisect.c index c6aba2b9f2..f5b1368128 100644 --- a/bisect.c +++ b/bisect.c @@ -988,8 +988,11 @@ void read_bisect_terms(const char **read_bad, const char **read_good) * the bisection process finished successfully. * In this case the calling function or command should not turn a * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code. - * If no_checkout is non-zero, the bisection process does not - * checkout the trial commit but instead simply updates BISECT_HEAD. + * + * Checking BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND + * in bisect_helper::bisect_next() and only transforming it to 0 at + * the end of bisect_helper::cmd_bisect__helper() helps bypassing + * all the code related to finding a commit to test. */ enum bisect_error bisect_next_all(struct repository *r, const char *prefix) { @@ -999,6 +1002,10 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix) enum bisect_error res = BISECT_OK; struct object_id *bisect_rev; char *steps_msg; + /* + * If no_checkout is non-zero, the bisection process does not + * checkout the trial commit but instead simply updates BISECT_HEAD. + */ int no_checkout = ref_exists("BISECT_HEAD"); unsigned bisect_flags = 0; diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index ab27a8dff6..3a5bf99257 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -8,6 +8,7 @@ #include "run-command.h" #include "prompt.h" #include "quote.h" +#include "revision.h" static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV") @@ -29,10 +30,17 @@ 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-next"), + N_("git bisect--helper --bisect-auto-next"), N_("git bisect--helper --bisect-autostart"), NULL }; +struct add_bisect_ref_data { + struct rev_info *revs; + unsigned int object_flags; +}; + struct bisect_terms { char *term_good; char *term_bad; @@ -56,6 +64,8 @@ static void set_terms(struct bisect_terms *terms, const char *bad, static const char vocab_bad[] = "bad|new"; static const char vocab_good[] = "good|old"; +static int bisect_autostart(struct bisect_terms *terms); + /* * Check whether the string `term` belongs to the set of strings * included in the variable arguments. @@ -80,7 +90,7 @@ static int write_in_file(const char *path, const char *mode, const char *format, FILE *fp = NULL; int res = 0; - if (strcmp(mode, "w")) + if (strcmp(mode, "w") && strcmp(mode, "a")) BUG("write-in-file does not support '%s' mode", mode); fp = fopen(path, mode); if (!fp) @@ -109,6 +119,18 @@ static int write_to_file(const char *path, const char *format, ...) return res; } +static int append_to_file(const char *path, const char *format, ...) +{ + int res; + va_list args; + + va_start(args, format); + res = write_in_file(path, "a", format, args); + va_end(args); + + return res; +} + static int check_term_format(const char *term, const char *orig_term) { int res; @@ -451,6 +473,142 @@ static int bisect_append_log_quoted(const char **argv) return res; } +static int add_bisect_ref(const char *refname, const struct object_id *oid, + int flags, void *cb) +{ + struct add_bisect_ref_data *data = cb; + + add_pending_oid(data->revs, refname, oid, data->object_flags); + + return 0; +} + +static int prepare_revs(struct bisect_terms *terms, struct rev_info *revs) +{ + int res = 0; + struct add_bisect_ref_data cb = { revs }; + char *good = xstrfmt("%s-*", terms->term_good); + + /* + * We cannot use terms->term_bad directly in + * for_each_glob_ref_in() and we have to append a '*' to it, + * otherwise for_each_glob_ref_in() will append '/' and '*'. + */ + char *bad = xstrfmt("%s*", terms->term_bad); + + /* + * It is important to reset the flags used by revision walks + * as the previous call to bisect_next_all() in turn + * sets up a revision walk. + */ + reset_revision_walk(); + init_revisions(revs, NULL); + setup_revisions(0, NULL, revs, NULL); + for_each_glob_ref_in(add_bisect_ref, bad, "refs/bisect/", &cb); + cb.object_flags = UNINTERESTING; + for_each_glob_ref_in(add_bisect_ref, good, "refs/bisect/", &cb); + if (prepare_revision_walk(revs)) + res = error(_("revision walk setup failed\n")); + + free(good); + free(bad); + return res; +} + +static int bisect_skipped_commits(struct bisect_terms *terms) +{ + int res; + FILE *fp = NULL; + struct rev_info revs; + struct commit *commit; + struct pretty_print_context pp = {0}; + struct strbuf commit_name = STRBUF_INIT; + + res = prepare_revs(terms, &revs); + if (res) + return res; + + fp = fopen(git_path_bisect_log(), "a"); + if (!fp) + return error_errno(_("could not open '%s' for appending"), + git_path_bisect_log()); + + if (fprintf(fp, "# only skipped commits left to test\n") < 0) + return error_errno(_("failed to write to '%s'"), git_path_bisect_log()); + + while ((commit = get_revision(&revs)) != NULL) { + strbuf_reset(&commit_name); + format_commit_message(commit, "%s", + &commit_name, &pp); + fprintf(fp, "# possible first %s commit: [%s] %s\n", + terms->term_bad, oid_to_hex(&commit->object.oid), + commit_name.buf); + } + + /* + * Reset the flags used by revision walks in case + * there is another revision walk after this one. + */ + reset_revision_walk(); + + strbuf_release(&commit_name); + fclose(fp); + return 0; +} + +static int bisect_successful(struct bisect_terms *terms) +{ + struct object_id oid; + struct commit *commit; + struct pretty_print_context pp = {0}; + struct strbuf commit_name = STRBUF_INIT; + char *bad_ref = xstrfmt("refs/bisect/%s",terms->term_bad); + int res; + + read_ref(bad_ref, &oid); + commit = lookup_commit_reference_by_name(bad_ref); + format_commit_message(commit, "%s", &commit_name, &pp); + + res = append_to_file(git_path_bisect_log(), "# first %s commit: [%s] %s\n", + terms->term_bad, oid_to_hex(&commit->object.oid), + commit_name.buf); + + strbuf_release(&commit_name); + free(bad_ref); + return res; +} + +static enum bisect_error bisect_next(struct bisect_terms *terms, const char *prefix) +{ + enum bisect_error res; + + if (bisect_autostart(terms)) + return BISECT_FAILED; + + if (bisect_next_check(terms, terms->term_good)) + return BISECT_FAILED; + + /* Perform all bisection computation */ + res = bisect_next_all(the_repository, prefix); + + if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) { + res = bisect_successful(terms); + return res ? res : BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND; + } else if (res == BISECT_ONLY_SKIPPED_LEFT) { + res = bisect_skipped_commits(terms); + return res ? res : BISECT_ONLY_SKIPPED_LEFT; + } + return res; +} + +static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char *prefix) +{ + if (bisect_next_check(terms, NULL)) + return BISECT_OK; + + return bisect_next(terms, prefix); +} + static int bisect_start(struct bisect_terms *terms, const char **argv, int argc) { int no_checkout = 0; @@ -700,6 +858,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) BISECT_TERMS, BISECT_START, BISECT_AUTOSTART, + BISECT_NEXT, + BISECT_AUTO_NEXT } cmdmode = 0; int res = 0, nolog = 0; struct option options[] = { @@ -723,6 +883,10 @@ 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-next", &cmdmode, + N_("find the next bisection commit"), BISECT_NEXT), + OPT_CMDMODE(0, "bisect-auto-next", &cmdmode, + N_("verify the next bisection state then checkout the next bisection commit"), BISECT_AUTO_NEXT), 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, @@ -784,6 +948,18 @@ 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_NEXT: + if (argc) + return error(_("--bisect-next requires 0 arguments")); + get_terms(&terms); + res = bisect_next(&terms, prefix); + break; + case BISECT_AUTO_NEXT: + if (argc) + return error(_("--bisect-auto-next requires 0 arguments")); + get_terms(&terms); + res = bisect_auto_next(&terms, prefix); + break; case BISECT_AUTOSTART: if (argc) return error(_("--bisect-autostart does not accept arguments")); @@ -799,7 +975,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) * Handle early success * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all */ - if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) + if ((res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) || (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND)) res = BISECT_OK; return -res; diff --git a/git-bisect.sh b/git-bisect.sh index 6ed3e42fc2..ea7e684ebb 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -65,8 +65,7 @@ bisect_start() { # # Check if we can proceed to the next bisect state. # - get_terms - bisect_auto_next + git bisect--helper --bisect-auto-next || exit trap '-' 0 } @@ -119,45 +118,7 @@ bisect_state() { *) usage ;; esac - bisect_auto_next -} - -bisect_auto_next() { - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD && bisect_next || : -} - -bisect_next() { - case "$#" in 0) ;; *) usage ;; esac - git bisect--helper --bisect-autostart || exit - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD $TERM_GOOD|| exit - - # Perform all bisection computation, display and checkout - git bisect--helper --next-all - res=$? - - # Check if we should exit because bisection is finished - if test $res -eq 10 - then - bad_rev=$(git show-ref --hash --verify refs/bisect/$TERM_BAD) - bad_commit=$(git show-branch $bad_rev) - echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG" - exit 0 - elif test $res -eq 2 - then - echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG" - good_revs=$(git for-each-ref --format="%(objectname)" "refs/bisect/$TERM_GOOD-*") - for skipped in $(git rev-list refs/bisect/$TERM_BAD --not $good_revs) - do - skipped_commit=$(git show-branch $skipped) - echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG" - done - exit $res - fi - - # Check for an error in the bisection process - test $res -ne 0 && exit $res - - return 0 + git bisect--helper --bisect-auto-next } bisect_visualize() { @@ -213,7 +174,7 @@ bisect_replay () { esac done <"$file" IFS="$oIFS" - bisect_auto_next + git bisect--helper --bisect-auto-next || exit } bisect_run () { @@ -310,7 +271,7 @@ case "$#" in bisect_skip "$@" ;; next) # Not sure we want "next" at the UI level anymore. - bisect_next "$@" ;; + git bisect--helper --bisect-next "$@" || exit ;; visualize|view) bisect_visualize "$@" ;; reset)