From: Jeff King <peff@peff.net>
To: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, ryenus@gmail.com, stolee@gmail.com,
szeder.dev@gmail.com, Derrick Stolee <dstolee@microsoft.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v4 1/2] progress: create GIT_PROGRESS_DELAY
Date: Fri, 22 Nov 2019 02:15:36 -0500 [thread overview]
Message-ID: <20191122071536.GC23225@sigill.intra.peff.net> (raw)
In-Reply-To: <a7acdf9c8f8c85f9f39750315716f21e83ce67c6.1574351516.git.gitgitgadget@gmail.com>
On Thu, Nov 21, 2019 at 03:51:55PM +0000, Derrick Stolee via GitGitGadget wrote:
> @@ -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;
> +}
Thanks, this factoring out looks good.
Since the only callers of start_progress_delay() pass in either the
result of this function or "0", it _could_ become a bool flag and we
could just resolve it inside that function. But I don't think there's a
big advantage to doing so.
> 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
> '
I'm tempted to suggest that we should just set GIT_PROGRESS_DELAY=0 for
the whole test suite. That would root out any potentially racy tests,
though given that the default is 2 seconds, it would probably take a
pretty horribly loaded system to trigger such a race.
Curiously, doing this:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 46c4440843..63357ed6c4 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -423,6 +423,9 @@ export EDITOR
GIT_TRACE_BARE=1
export GIT_TRACE_BARE
+GIT_PROGRESS_DELAY=0
+export GIT_PROGRESS_DELAY
+
check_var_migration () {
# the warnings and hints given from this helper depends
# on end-user settings, which will disrupt the self-test
results in a few test failures. It looks like unpack-trees is eager to
print the "Updating files" progress meter even when stderr is redirected
to a file. Which seems like a bug. I don't mind if we put that off for
now, though, in order to get your fix here merged more quickly.
-Peff
next prev parent reply other threads:[~2019-11-22 7:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 16:05 [PATCH 0/1] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-05 16:05 ` [PATCH 1/1] " Derrick Stolee via GitGitGadget
2019-11-05 17:38 ` Derrick Stolee
2019-11-05 20:14 ` [PATCH v2 0/1] " Derrick Stolee via GitGitGadget
2019-11-05 20:14 ` [PATCH v2 1/1] " Derrick Stolee via GitGitGadget
2019-11-06 4:09 ` Jeff King
2019-11-06 13:21 ` Derrick Stolee
2019-11-07 6:40 ` Jeff King
2019-11-07 13:30 ` Derrick Stolee
2019-11-07 4:37 ` Junio C Hamano
2019-11-07 6:43 ` Jeff King
2019-11-07 9:51 ` Junio C Hamano
2019-11-07 17:46 ` [PATCH v3 0/2] " Derrick Stolee via GitGitGadget
2019-11-07 17:46 ` [PATCH v3 1/2] progress: create GIT_PROGRESS_DELAY Derrick Stolee via GitGitGadget
2019-11-07 21:22 ` Jeff King
2019-11-11 14:27 ` SZEDER Gábor
2019-11-07 17:46 ` [PATCH v3 2/2] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-07 21:26 ` Jeff King
2019-11-21 23:03 ` SZEDER Gábor
2019-11-21 15:51 ` [PATCH v4 0/2] " Derrick Stolee via GitGitGadget
2019-11-21 15:51 ` [PATCH v4 1/2] progress: create GIT_PROGRESS_DELAY Derrick Stolee via GitGitGadget
2019-11-22 7:15 ` Jeff King [this message]
2019-11-21 15:51 ` [PATCH v4 2/2] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-22 7:17 ` Jeff King
2019-11-25 18:57 ` Derrick Stolee
2019-11-25 21:28 ` [PATCH v5 0/2] " Derrick Stolee via GitGitGadget
2019-11-25 21:28 ` [PATCH v5 1/2] progress: create GIT_PROGRESS_DELAY Derrick Stolee via GitGitGadget
2019-11-25 21:28 ` [PATCH v5 2/2] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-26 12:20 ` [PATCH v5 0/2] " Jeff King
2019-11-26 15:39 ` Derrick Stolee
2019-11-30 14:36 ` Junio C Hamano
2019-12-01 9:33 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191122071536.GC23225@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=ryenus@gmail.com \
--cc=stolee@gmail.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).