From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id BD4051F4B5 for ; Thu, 21 Nov 2019 15:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726613AbfKUPwC (ORCPT ); Thu, 21 Nov 2019 10:52:02 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42842 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbfKUPwB (ORCPT ); Thu, 21 Nov 2019 10:52:01 -0500 Received: by mail-wr1-f66.google.com with SMTP id a15so5006114wrf.9 for ; Thu, 21 Nov 2019 07:51:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=29kfKYIa+20ylMRQsVzEOYq9YF/ZAgL/Qbwdp5eTeoA=; b=ISj1WNIJRPLOfnR1DdunySt2+DCjVWVp20ABM0fN78ta2IaZbHNnUBJbj9oGxD9srN pC7UZ94w1A3VkB6l6OUaMf8HCiPdM2++LEv2t1ApZ1N04Ff2u7HEn/5AMkasJ7/lAxyI yps1OVdp2jzdjRUUyiog1Bg9LjDmanrPgpQi2mpK9k/TNYHZMkXh2YioNjh6tG9xtwAy DPlWnr9god9bpOWgpR8QNEb8vEybmYKOYtz9MFhYACRaINu5KIAzLoreWIg2HWKU8zOh Sg/g1kZ1vEFrJ20ouVa+IAP5RvzqlR074UrpZBHDV6M2PzCDalaT4cZsHoPZggooyW1b Su7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=29kfKYIa+20ylMRQsVzEOYq9YF/ZAgL/Qbwdp5eTeoA=; b=Gbbj+LH9iO6eHY/+pAUsd0taH9sW9X64JPEj8DlYNkYegc7BH7hVTO15u9hajRJ1Hi d13hzY3GBg1uV3mXQVTH9+Ep/HVHdz6iFqb3DaC/Is2fxviGWOyzuBUNt25J8yASZIa/ dzpzMOM6uSHXwoYPflgdfwIyU+6HdaG/hlpNvitdgYHH/fw6xEyoXsHqp6lqOBhmbS7a psCxOUjV4dSiqGAUVcyZWzU0lSMd5eCywHHMFON5jnP9zFw2f8rRDZBauh1oqA+amwil 3gl1G9KrXH5ulMoB00z/KkzlVQKCib7HhPQr+1YlBGwhfjEajMQVbXmdtuMnVpSHyri6 FbNA== X-Gm-Message-State: APjAAAX4nPXsifXd5m7kUGaijz3ixrbLIwtSp8Y8ybZMP4rtEmd8oL52 0UwedTLWOV4zpPBkWOgB1JLMSyw/ X-Google-Smtp-Source: APXvYqwkcWKpVU5ZwGNfGO5SvFQDjPKG3luoGw98I+iSnCVmlNnsuRXX1E2D5KU+sbDmbFUZUzm88w== X-Received: by 2002:adf:de0a:: with SMTP id b10mr11768970wrm.268.1574351518572; Thu, 21 Nov 2019 07:51:58 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a26sm59504wmm.14.2019.11.21.07.51.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2019 07:51:58 -0800 (PST) Message-Id: In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Thu, 21 Nov 2019 15:51:55 +0000 Subject: [PATCH v4 1/2] progress: create GIT_PROGRESS_DELAY Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: ryenus@gmail.com, stolee@gmail.com, peff@peff.net, szeder.dev@gmail.com, Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee The start_delayed_progress() method is a preferred way to show optional progress to users as it ignores steps that take less than two seconds. However, this makes testing unreliable as tests expect to be very fast. In addition, users may want to decrease or increase this time interval depending on their preferences for terminal noise. Create the GIT_PROGRESS_DELAY environment variable to control the delay set during start_delayed_progress(). Set the value in some tests to guarantee their output remains consistent. Helped-by: Jeff King Signed-off-by: Derrick Stolee --- Documentation/git.txt | 4 ++++ progress.c | 15 +++++++++++++-- t/t5318-commit-graph.sh | 4 ++-- t/t6500-gc.sh | 3 +-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index 9b82564d1a..1c420da208 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -544,6 +544,10 @@ other a pager. See also the `core.pager` option in linkgit:git-config[1]. +`GIT_PROGRESS_DELAY`:: + A number controlling how many seconds to delay before showing + optional progress indicators. Defaults to 2. + `GIT_EDITOR`:: This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, diff --git a/progress.c b/progress.c index 0063559aab..19805ac646 100644 --- a/progress.c +++ b/progress.c @@ -14,6 +14,7 @@ #include "strbuf.h" #include "trace.h" #include "utf8.h" +#include "config.h" #define TP_IDX_MAX 8 @@ -267,9 +268,19 @@ static struct progress *start_progress_delay(const char *title, uint64_t total, return progress; } +static int get_default_delay(void) +{ + static int delay_in_secs = -1; + + if (delay_in_secs < 0) + delay_in_secs = git_env_ulong("GIT_PROGRESS_DELAY", 2); + + return delay_in_secs; +} + struct progress *start_delayed_progress(const char *title, uint64_t total) { - return start_progress_delay(title, total, 2, 0); + return start_progress_delay(title, total, get_default_delay(), 0); } struct progress *start_progress(const char *title, uint64_t total) @@ -294,7 +305,7 @@ struct progress *start_sparse_progress(const char *title, uint64_t total) struct progress *start_delayed_sparse_progress(const char *title, uint64_t total) { - return start_progress_delay(title, total, 2, 1); + return start_progress_delay(title, total, get_default_delay(), 1); } static void finish_if_sparse(struct progress *progress) diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index d42b3efe39..0824857e1f 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -132,7 +132,7 @@ test_expect_success 'commit-graph write progress off for redirected stderr' ' test_expect_success 'commit-graph write force progress on for stderr' ' cd "$TRASH_DIRECTORY/full" && - git commit-graph write --progress 2>err && + GIT_PROGRESS_DELAY=0 git commit-graph write --progress 2>err && test_file_not_empty err ' @@ -150,7 +150,7 @@ test_expect_success 'commit-graph verify progress off for redirected stderr' ' test_expect_success 'commit-graph verify force progress on for stderr' ' cd "$TRASH_DIRECTORY/full" && - git commit-graph verify --progress 2>err && + GIT_PROGRESS_DELAY=0 git commit-graph verify --progress 2>err && test_file_not_empty err ' diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index c0f04dc6b0..7f79eedd1c 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -103,9 +103,8 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre ' test_expect_success 'gc --no-quiet' ' - git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && + GIT_PROGRESS_DELAY=0 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && test_must_be_empty stdout && - test_line_count = 1 stderr && test_i18ngrep "Computing commit graph generation numbers" stderr ' -- gitgitgadget