From patchwork Sun Apr 11 09:55:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12196129 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E7BDC433B4 for ; Sun, 11 Apr 2021 09:56:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4444611CE for ; Sun, 11 Apr 2021 09:56:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235382AbhDKJ43 (ORCPT ); Sun, 11 Apr 2021 05:56:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbhDKJ42 (ORCPT ); Sun, 11 Apr 2021 05:56:28 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C41EBC061574 for ; Sun, 11 Apr 2021 02:56:12 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id a6so9859299wrw.8 for ; Sun, 11 Apr 2021 02:56:12 -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=sVG2Tb+3jo8G5zdkc8IPV7f/mJRvdz3MdmkDy+VsCMc=; b=OLWiN9AoUw02SGY4gepEK2g6aM+o9MPXcb27V4TkqZKR+V2YCCOfXCY7UXY9VFuyjp fknWasZbV8v6odxECeWL1jv0DvQ4TBCrRs8aLGnuXmE+DaszQw59EidsJdt7uiOh3TN7 0ViwCFevmEvUsQ649seVjoJvVLcwAl7QxSQ13Rb0WhiXMC9e42AuXGO8kJfGzBQxq6u+ AGGtNnxyMt1s8IytNkUSs10ufkC0n/M/KgZiKI3Jotsu6a+p7+D8BmSyijmr3o81QMXw wVUOFUV87dlorpJvyAjGZIvjPSWPIj6IcoBt4hpXClLry3TpXPl4ozYKlrLuk59Jsd9y zb6Q== 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=sVG2Tb+3jo8G5zdkc8IPV7f/mJRvdz3MdmkDy+VsCMc=; b=qMX362pDR9U7bHqtMdG+UN1dmM95h6aOiQPzFxmPJaWqsEgQ3h71sY5NCY++ur80cR uBPXrP8ImS/gdmVZSuCuFWa7RnBUrL+bCfpbmnaYVrYZ2mo8eugDAmULONw0gU9+TDVf dt9jCmThq5Gd4HrQwZr3iMaOJqHmk3u2X7U432UjOQ5g/Bnp1yisAibOONerP8Vlwd4K 1twi2VuQdStdBclMIamWQEf9r2fLQ9iAmxRrByl4Wdj4e/8JMh1EqM637woS4NIgcSO5 sp4vL6wPI8/8KHCFaU/dAszvOQYR4qwi0GJFzekCZ975ygJkxqMGx6MLj9StilkY3Fz2 qztw== X-Gm-Message-State: AOAM532kzQVGwPlPMxJPoytJFs8VncVUfWcU7DZib/v9oRWCzz+Xu0g3 FSqmvP24S8B4yc9ouVfr7qfemMXHQW0= X-Google-Smtp-Source: ABdhPJw1VSccbF65DhX/DCFIEu5mQptynndcBvUwPk/frTf8N9dkfFMt2AXA2yhoN6IxMVSnozbWVQ== X-Received: by 2002:a05:6000:251:: with SMTP id m17mr26560464wrz.171.1618134971544; Sun, 11 Apr 2021 02:56:11 -0700 (PDT) Received: from localhost.localdomain ([81.0.37.230]) by smtp.gmail.com with ESMTPSA id j30sm12994099wrj.62.2021.04.11.02.56.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 02:56:11 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Tanushree Tumane , Miriam Rubio Subject: [PATCH v3 1/4] run-command: make `exists_in_PATH()` non-static Date: Sun, 11 Apr 2021 11:55:35 +0200 Message-Id: <20210411095538.34129-2-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210411095538.34129-1-mirucam@gmail.com> References: <20210411095538.34129-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Pranit Bauva Removes the `static` keyword from `exists_in_PATH()` function and declares the function in `run-command.h` file. The function will be used in bisect_visualize() in a later commit. Mentored by: Christian Couder Mentored by: Johannes Schindelin Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- run-command.c | 2 +- run-command.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/run-command.c b/run-command.c index be6bc128cd..210b8858f7 100644 --- a/run-command.c +++ b/run-command.c @@ -211,7 +211,7 @@ static char *locate_in_PATH(const char *file) return NULL; } -static int exists_in_PATH(const char *file) +int exists_in_PATH(const char *file) { char *r = locate_in_PATH(file); int found = r != NULL; diff --git a/run-command.h b/run-command.h index d08414a92e..cc6f1bad20 100644 --- a/run-command.h +++ b/run-command.h @@ -179,6 +179,18 @@ void child_process_clear(struct child_process *); int is_executable(const char *name); +/** + * Search if a $PATH for a command exists. This emulates the path search that + * execvp would perform, without actually executing the command so it + * can be used before fork() to prepare to run a command using + * execve() or after execvp() to diagnose why it failed. + * + * The caller should ensure that file contains no directory separators. + * + * Returns 1 if it is found in $PATH or 0 if the command could not be found. + */ +int exists_in_PATH(const char *file); + /** * Start a sub-process. Takes a pointer to a `struct child_process` * that specifies the details and returns pipe FDs (if requested). From patchwork Sun Apr 11 09:55:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12196131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81DADC43460 for ; Sun, 11 Apr 2021 09:56:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CC0E611F0 for ; Sun, 11 Apr 2021 09:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235394AbhDKJ4a (ORCPT ); Sun, 11 Apr 2021 05:56:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235391AbhDKJ43 (ORCPT ); Sun, 11 Apr 2021 05:56:29 -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 78006C06138B for ; Sun, 11 Apr 2021 02:56:13 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so5188324wmj.2 for ; Sun, 11 Apr 2021 02:56:13 -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=XiUdO9/MUHtGHyGT/+/I7m+LftBF4SC9h8sIkh34j1Y=; b=ZzuBZ6AWXemreCvAXpNOWTlOrzzRH/XcR9RBQICwCJLzEuSHj0sAAHrBuY6zgREilb 2ce7u7ucUIZ4J3Neun/+wzYb1wjbOXIDR1X4oKMdu+mXktkHnFJ83K6EiwL7w6f02Dg4 r75v91pP5PMF8xIiMseV7f//iGoewJp557XwCBZPOmd2Nt1Guvf2UqITr4suogPR2KbJ wcgYEDhV0wgwn+q3pKKtFRqJsvJtJNLa8QoThkg5fQIAd+0Nhp2ZYOoTrkTHtEn/kkBr lV3ImGAmfiDcyxm2RsSy8TDLhIfKf6zqMkLdJSwruAIuhwI9SloITE+xytmz2ixWKEGA jwsQ== 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=XiUdO9/MUHtGHyGT/+/I7m+LftBF4SC9h8sIkh34j1Y=; b=IJfkTIBBi4bI+sVxkW+VmKXV3lXXgcRFD9tspzQp1TMfM+2UEoRbk9Lv21PbvI5U61 C8lgEZ5FVy/npTeiwVOZeIe26q+ZbiUdflJUbTkxzT2xJrNa5pXMpYivHrbcNBU9lYih ie/S2ZCijNoWL7JgMzTqBzi0wx0Fef2ocY05PTt5lgL5vorePZQtm44duhLl8EDeOq0M 5Amxa4QROKrxZyRt0nQE6AvvTNxQRLJuv41V1xCFrXuELBIT5gTIohocVmGfS8ke2ID7 iVrBHhSoVmSQIGnuAq/WJrRi9aXS5ZPjG/O+mHyBiIeHcxYReLP6+lboDjtOWTMyK6c+ +eFw== X-Gm-Message-State: AOAM531yag0aHbKLTfFMMFCjCjhijIwYIWfWHq4hQfivwLRj0tIidSLU 2uUJUN/sfSrzZ8tQUto7LRy6KZDusZc= X-Google-Smtp-Source: ABdhPJzTN+slzZusRMXgdpSIX0Q8u09Lup5Xku0W8ejxDtmi+H0jHEA9US3r9Qr+rZfYbCUk0S1hAA== X-Received: by 2002:a05:600c:1457:: with SMTP id h23mr21712962wmi.118.1618134972297; Sun, 11 Apr 2021 02:56:12 -0700 (PDT) Received: from localhost.localdomain ([81.0.37.230]) by smtp.gmail.com with ESMTPSA id j30sm12994099wrj.62.2021.04.11.02.56.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 02:56:12 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Pranit Bauva , Christian Couder , Johannes Schindelin , Tanushree Tumane , Miriam Rubio Subject: [PATCH v3 2/4] bisect--helper: reimplement `bisect_visualize()`shell function in C Date: Sun, 11 Apr 2021 11:55:36 +0200 Message-Id: <20210411095538.34129-3-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210411095538.34129-1-mirucam@gmail.com> References: <20210411095538.34129-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_visualize()` shell function in C and also add `--bisect-visualize` subcommand to `git bisect--helper` to call it from git-bisect.sh. Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 48 +++++++++++++++++++++++++++++++++++++++- git-bisect.sh | 25 +-------------------- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 1fdb7d9d10..71963979b1 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -30,6 +30,7 @@ static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-state (good|old) [...]"), N_("git bisect--helper --bisect-replay "), N_("git bisect--helper --bisect-skip [(|)...]"), + N_("git bisect--helper --bisect-visualize"), NULL }; @@ -1034,6 +1035,44 @@ static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **ar return res; } +static int bisect_visualize(struct bisect_terms *terms, const char **argv, int argc) +{ + struct strvec args = STRVEC_INIT; + int flags = RUN_COMMAND_NO_STDIN, res = 0; + struct strbuf sb = STRBUF_INIT; + + if (bisect_next_check(terms, NULL) != 0) + return BISECT_FAILED; + + if (!argc) { + if ((getenv("DISPLAY") || getenv("SESSIONNAME") || getenv("MSYSTEM") || + getenv("SECURITYSESSIONID")) && exists_in_PATH("gitk")) + strvec_push(&args, "gitk"); + else { + strvec_pushl(&args, "log", NULL); + flags |= RUN_GIT_CMD; + } + } else { + if (argv[0][0] == '-') { + strvec_pushl(&args, "log", NULL); + flags |= RUN_GIT_CMD; + } else if (strcmp(argv[0], "tig") && !starts_with(argv[0], "git")) + flags |= RUN_GIT_CMD; + + strvec_pushv(&args, argv); + } + + strvec_pushl(&args, "--bisect", "--", NULL); + + strbuf_read_file(&sb, git_path_bisect_names(), 0); + sq_dequote_to_strvec(sb.buf, &args); + strbuf_release(&sb); + + res = run_command_v_opt(args.v, flags); + strvec_clear(&args); + return res; +} + int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { enum { @@ -1046,7 +1085,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) BISECT_STATE, BISECT_LOG, BISECT_REPLAY, - BISECT_SKIP + BISECT_SKIP, + BISECT_VISUALIZE, } cmdmode = 0; int res = 0, nolog = 0; struct option options[] = { @@ -1068,6 +1108,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) N_("replay the bisection process from the given file"), BISECT_REPLAY), OPT_CMDMODE(0, "bisect-skip", &cmdmode, N_("skip some commits for checkout"), BISECT_SKIP), + OPT_CMDMODE(0, "bisect-visualize", &cmdmode, + N_("visualize the bisection"), BISECT_VISUALIZE), OPT_BOOL(0, "no-log", &nolog, N_("no log for BISECT_WRITE")), OPT_END() @@ -1128,6 +1170,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) set_terms(&terms, "bad", "good"); res = bisect_skip(&terms, argv, argc); break; + case BISECT_VISUALIZE: + get_terms(&terms); + res = bisect_visualize(&terms, argv, argc); + break; default: BUG("unknown subcommand %d", cmdmode); } diff --git a/git-bisect.sh b/git-bisect.sh index 6a7afaea8d..95f7f3fb8c 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -39,29 +39,6 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" TERM_BAD=bad TERM_GOOD=good -bisect_visualize() { - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit - - if test $# = 0 - then - if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" && - type gitk >/dev/null 2>&1 - then - set gitk - else - set git log - fi - else - case "$1" in - git*|tig) ;; - -*) set git log "$@" ;; - *) set git "$@" ;; - esac - fi - - eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES") -} - bisect_run () { git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit @@ -152,7 +129,7 @@ case "$#" in # Not sure we want "next" at the UI level anymore. git bisect--helper --bisect-next "$@" || exit ;; visualize|view) - bisect_visualize "$@" ;; + git bisect--helper --bisect-visualize "$@" || exit;; reset) git bisect--helper --bisect-reset "$@" ;; replay) From patchwork Sun Apr 11 09:55:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12196133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36CD7C433B4 for ; Sun, 11 Apr 2021 09:56:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07010611EF for ; Sun, 11 Apr 2021 09:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235398AbhDKJ4b (ORCPT ); Sun, 11 Apr 2021 05:56:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235386AbhDKJ4a (ORCPT ); Sun, 11 Apr 2021 05:56:30 -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 2DF5EC061574 for ; Sun, 11 Apr 2021 02:56:14 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id a6so9859324wrw.8 for ; Sun, 11 Apr 2021 02:56:14 -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=MLx0yqmDJ4v5kn2GC09r04P04VxiTIwut8GKzsOetEk=; b=C0Od25XbF+eWyFxn7rGhukmE17qGjXWo4S9RIvxSdZfDLTry8o2/Wh77Yoruj1QiCb hSKMd99y+naolx3jU5Rz00gUoiVIBtcqr31RsgU5KpPDJRkb8VKaxCKMaz5Ud1vZz+oK 10jYzYBqRDPYj3T5IrM6QUEYB472m8kFJFZGPTsfFDsJ0u0e4Mqp/KJ0Fe054gr2YSOZ CJgeD2pq0+YxMdICyf8p0VjNndrOEuG/hsqoVwzBzqxB9nnRy2XB0qWgMxnrnMlKBnhK 20ea6cKjKeKsS9A4IRxPhPSfeIVA7gX39bZLaXBPlau4XssyCIAmLmuEm+rmSGydJ9uQ v46w== 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=MLx0yqmDJ4v5kn2GC09r04P04VxiTIwut8GKzsOetEk=; b=WKrqSCZEpZZ3uvQbm7GC+SflozIAuTGloYH90rQuCG6m+A8fR+SMVMKTBlpOsGh0RJ vh2N4HWRp39MiWjzEla0PFUwFDgW+RAqwbAf34qpezxxiXMVz+m8OTQsrs6MQWI7T+iq 7CL8UwUuAnSbXNqIlZ2xef62NuW0O2Q2/tMEzRPA0x6jU8TWHwIOy4uvVfwzeYLDgjaA sq4K3aztqZYOhn6hHL7P4uLfqwI8QoxGA+bm6sHVl+uE5x9q7PNf/35reDB5iikChvcQ Fp23f34h6+CjwQ0jz+XJ6NohA/uvQtnWV6VgUJI7/TludAz53dYHAws94rTQlfghxAZs SLzg== X-Gm-Message-State: AOAM531uuhmT3wiOr8Ctn7Qh+opaf1wLF9fvUaGxye/XtFDN62RI62+C D74p5SBTfB94U+dz0ZQIEg1P8TVMWGo= X-Google-Smtp-Source: ABdhPJy4bk2Rcrq0WhH0L2xtiobm+Hiw61fQObVh7comTYV6uCIKj2I94ehnNkShYk8qgETyt2MvkA== X-Received: by 2002:a5d:4402:: with SMTP id z2mr6501058wrq.179.1618134972945; Sun, 11 Apr 2021 02:56:12 -0700 (PDT) Received: from localhost.localdomain ([81.0.37.230]) by smtp.gmail.com with ESMTPSA id j30sm12994099wrj.62.2021.04.11.02.56.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 02:56:12 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Tanushree Tumane , Christian Couder , Miriam Rubio Subject: [PATCH v3 3/4] bisect--helper: reimplement `bisect_run` shell function in C Date: Sun, 11 Apr 2021 11:55:37 +0200 Message-Id: <20210411095538.34129-4-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210411095538.34129-1-mirucam@gmail.com> References: <20210411095538.34129-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Tanushree Tumane Reimplement the `bisect_run()` shell function in C and also add `--bisect-run` subcommand to `git bisect--helper` to call it from git-bisect.sh. Mentored-by: Christian Couder Signed-off-by: Tanushree Tumane Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 83 ++++++++++++++++++++++++++++++++++++++++ git-bisect.sh | 62 +----------------------------- 2 files changed, 84 insertions(+), 61 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 71963979b1..dc87fc7dd0 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -18,6 +18,7 @@ static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG") static GIT_PATH_FUNC(git_path_head_name, "head-name") static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") +static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-reset []"), @@ -31,6 +32,7 @@ static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-replay "), N_("git bisect--helper --bisect-skip [(|)...]"), N_("git bisect--helper --bisect-visualize"), + N_("git bisect--helper --bisect-run ..."), NULL }; @@ -1073,6 +1075,78 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a return res; } +static int bisect_run(struct bisect_terms *terms, const char **argv, int argc) +{ + int res = BISECT_OK; + struct strbuf command = STRBUF_INIT; + struct strvec args = STRVEC_INIT; + struct strvec run_args = STRVEC_INIT; + int exit = 0; + int temporary_stdout_fd, saved_stdout; + + if (bisect_next_check(terms, NULL)) + return BISECT_FAILED; + + if (argc) + sq_quote_argv(&command, argv); + else + return BISECT_FAILED; + + run_args.v[0] = xstrdup(command.buf); + run_args.nr = 1; + + while (1) { + strvec_clear(&args); + exit = 1; + + printf(_("running %s"), command.buf); + res = run_command_v_opt(run_args.v, RUN_USING_SHELL); + + if (res < 0 || 128 <= res) { + error(_("bisect run failed: exit code %d from" + " '%s' is < 0 or >= 128"), res, command.buf); + strbuf_release(&command); + return res; + } + + if (res == 125) + strvec_push(&args, "skip"); + else if (res > 0) + strvec_push(&args, terms->term_bad); + else + strvec_push(&args, terms->term_good); + + temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666); + saved_stdout = dup(1); + dup2(temporary_stdout_fd, 1); + + res = bisect_state(terms, args.v, args.nr); + + dup2(saved_stdout, 1); + close(saved_stdout); + close(temporary_stdout_fd); + + if (res == BISECT_ONLY_SKIPPED_LEFT) + error(_("bisect run cannot continue any more")); + else if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) { + printf(_("bisect run success")); + res = BISECT_OK; + } else if (res) { + error(_("bisect run failed:'git bisect--helper --bisect-state" + " %s' exited with error code %d"), args.v[0], res); + } else { + exit = 0; + } + + if (exit) { + strbuf_release(&command); + strvec_clear(&args); + strvec_clear(&run_args); + return res; + } + } +} + int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { enum { @@ -1087,6 +1161,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) BISECT_REPLAY, BISECT_SKIP, BISECT_VISUALIZE, + BISECT_RUN, } cmdmode = 0; int res = 0, nolog = 0; struct option options[] = { @@ -1110,6 +1185,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) N_("skip some commits for checkout"), BISECT_SKIP), OPT_CMDMODE(0, "bisect-visualize", &cmdmode, N_("visualize the bisection"), BISECT_VISUALIZE), + OPT_CMDMODE(0, "bisect-run", &cmdmode, + N_("use ... to automatically bisect."), BISECT_RUN), OPT_BOOL(0, "no-log", &nolog, N_("no log for BISECT_WRITE")), OPT_END() @@ -1174,6 +1251,12 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) get_terms(&terms); res = bisect_visualize(&terms, argv, argc); break; + case BISECT_RUN: + if (!argc) + return error(_("bisect run failed: no command provided.")); + get_terms(&terms); + res = bisect_run(&terms, argv, argc); + break; default: BUG("unknown subcommand %d", cmdmode); } diff --git a/git-bisect.sh b/git-bisect.sh index 95f7f3fb8c..e83d011e17 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -39,66 +39,6 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" TERM_BAD=bad TERM_GOOD=good -bisect_run () { - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit - - test -n "$*" || die "$(gettext "bisect run failed: no command provided.")" - - while true - do - command="$@" - eval_gettextln "running \$command" - "$@" - res=$? - - # Check for really bad run error. - if [ $res -lt 0 -o $res -ge 128 ] - then - eval_gettextln "bisect run failed: -exit code \$res from '\$command' is < 0 or >= 128" >&2 - exit $res - fi - - # Find current state depending on run success or failure. - # A special exit code of 125 means cannot test. - if [ $res -eq 125 ] - then - state='skip' - elif [ $res -gt 0 ] - then - state="$TERM_BAD" - else - state="$TERM_GOOD" - fi - - git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN" - res=$? - - cat "$GIT_DIR/BISECT_RUN" - - if sane_grep "first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \ - >/dev/null - then - gettextln "bisect run cannot continue any more" >&2 - exit $res - fi - - if [ $res -ne 0 ] - then - eval_gettextln "bisect run failed: -'bisect-state \$state' exited with error code \$res" >&2 - exit $res - fi - - if sane_grep "is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev/null - then - gettextln "bisect run success" - exit 0; - fi - - done -} - get_terms () { if test -s "$GIT_DIR/BISECT_TERMS" then @@ -137,7 +77,7 @@ case "$#" in log) git bisect--helper --bisect-log || exit ;; run) - bisect_run "$@" ;; + git bisect--helper --bisect-run "$@" || exit;; terms) git bisect--helper --bisect-terms "$@" || exit;; *) From patchwork Sun Apr 11 09:55:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Miriam R." X-Patchwork-Id: 12196135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC7BAC43460 for ; Sun, 11 Apr 2021 09:56:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A51ED611EF for ; Sun, 11 Apr 2021 09:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235405AbhDKJ4d (ORCPT ); Sun, 11 Apr 2021 05:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235395AbhDKJ4a (ORCPT ); Sun, 11 Apr 2021 05:56:30 -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 CBC8AC061574 for ; Sun, 11 Apr 2021 02:56:14 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id j20-20020a05600c1914b029010f31e15a7fso6979241wmq.1 for ; Sun, 11 Apr 2021 02:56:14 -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=gbPBT1+NJysDMjw4zJOQIIRrpKYLuIjhBBOU1NdvHaA=; b=WNrY+d/bA9+2Lx8fXEqNHHoqxPLzn3PkS7hVBKkDOkpBYXP+lcayH6OEKMJseEuwJB Nk23sxPZf6nVlK1gT6jQOcLeG9Xc3GKwm6irEJGC1efBbXiJhDo7j2bfEw3tI9vLPVVZ 6Dtx5KO7XDF9EGQms30Okcf/M+m5bScZwWNmWKwwGVqmjhD48OMbwzw8wdDUMHRuMzsx Gftl4O8OTQtHJFjnlwtlhO/teOl8P8sEoq44Uk8pHVchluHMen2aytrhVJAt1hpuDcNG mm4018KJSEijq1sR0gK9qXBk9j2hgawhUp1XVFbs1SN8l8QQ37/8G/iNQUDMuHh2DioV s9zw== 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=gbPBT1+NJysDMjw4zJOQIIRrpKYLuIjhBBOU1NdvHaA=; b=LQ5O66AyVQFPARPyM6ijic52bEBlPdJqqGxvX4+iGhyd/G/2AXhm75F0fDnfmUAIMP yhJffufOmdU2SofeELflavhhzELmzOjc1dksJ++ZSYnWjdzUO2ITmuuXh7OeuYyNlC03 Q/uKBbxrfa05yHCSBjvdEfnHL48VI+/oVsI5fqjIRyQNY7M/MLP2qEi5xSe2JcgKvxt9 k++Ev7rHHnXm2BvlcspkrKAK/h6eZ8JBkmrHpp3T16zWsf5xoHH0At8Qlb9fbRr7CcM/ 4dII3+B76EvHhAmwGmvEaUk4lfAh2l10USUvuiVYiH/XEblI9fPfstvqIn0ERp5nSRDe r0Hw== X-Gm-Message-State: AOAM531byjS9i3lM4RMwsQDWKOLg241i06u/WJoMTW+nprd0ayvoKwmZ P1osGiH/uu1vLKTnCl3c2qlZZLFBvSU= X-Google-Smtp-Source: ABdhPJy1VVHQhAKe79vBMhYBCEM+2Jam0A0rM++uhmJtoZfR9CTTTSi1iqRvcxtLAim43JCn5886xg== X-Received: by 2002:a7b:cd98:: with SMTP id y24mr9977462wmj.52.1618134973568; Sun, 11 Apr 2021 02:56:13 -0700 (PDT) Received: from localhost.localdomain ([81.0.37.230]) by smtp.gmail.com with ESMTPSA id j30sm12994099wrj.62.2021.04.11.02.56.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 02:56:13 -0700 (PDT) From: Miriam Rubio To: git@vger.kernel.org Cc: Miriam Rubio Subject: [PATCH v3 4/4] bisect--helper: retire `--bisect-next-check` subcommand Date: Sun, 11 Apr 2021 11:55:38 +0200 Message-Id: <20210411095538.34129-5-mirucam@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210411095538.34129-1-mirucam@gmail.com> References: <20210411095538.34129-1-mirucam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org After reimplementation of `git bisect run` in C, `--bisect-next-check` subcommand is not needed anymore. Let's remove it from options list and code. Mentored by: Christian Couder Signed-off-by: Miriam Rubio --- builtin/bisect--helper.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index dc87fc7dd0..0ff34007be 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -22,7 +22,6 @@ static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-reset []"), - N_("git bisect--helper --bisect-next-check []"), 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] [ [...]] [--] [...]"), @@ -1206,12 +1205,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) return error(_("--bisect-reset requires either no argument or a commit")); res = bisect_reset(argc ? argv[0] : NULL); break; - case BISECT_NEXT_CHECK: - if (argc != 2 && argc != 3) - return error(_("--bisect-next-check requires 2 or 3 arguments")); - set_terms(&terms, argv[1], argv[0]); - res = bisect_next_check(&terms, argc == 3 ? argv[2] : NULL); - break; case BISECT_TERMS: if (argc > 1) return error(_("--bisect-terms requires 0 or 1 argument"));