[PATCH v4 0/2] commit-graph: use start_delayed_progress()
- From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Nov 21, 2019, 15:51 UTC
- Message-ID
- <pull.450.v4.git.1574351516.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.450.v3.git.1573148818.gitgitgadget@gmail.com>
Thanks, Ryenus, for reporting this problem.
Update in V3:
Based on our discussion, I've added the suggested GIT_PROGRESS_DELAY environment variable. This allowed the existing tests to stick around with one exception in the GC tests. The test remains, but we can no longer look at the commit-graph output.
Update in V4:
The GIT_PROGRESS_DELAY check is extracted to a helper method so it can be used with start_delayed_sparse_progress().
Derrick Stolee (2): progress: create GIT_PROGRESS_DELAY commit-graph: use start_delayed_progress()
Documentation/git.txt | 4 ++++ commit-graph.c | 2 +- progress.c | 15 +++++++++++++-- t/t5318-commit-graph.sh | 4 ++-- t/t6500-gc.sh | 6 ++---- 5 files changed, 22 insertions(+), 9 deletions(-)
base-commit: da72936f544fec5a335e66432610e4cef4430991 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-450%2Fderrickstolee%2Fcommit-graph-progress-fix-v4 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-450/derrickstolee/commit-graph-progress-fix-v4 Pull-Request: https://github.com/gitgitgadget/git/pull/450
Range-diff vs v3:
1: 656dba5afb ! 1: a7acdf9c8f progress: create GIT_PROGRESS_DELAY
@@ -44,19 +44,35 @@
#define TP_IDX_MAX 8
@@
+ return progress;
+ }
- struct progress *start_delayed_progress(const char *title, uint64_t total)
- {
-- return start_progress_delay(title, total, 2, 0);
++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 start_progress_delay(title, total, delay_in_secs, 0);
++ 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)
+@@
+ 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
--- a/t/t5318-commit-graph.sh
2: 3c0c9675e1 = 2: e62dcc1ce5 commit-graph: use start_delayed_progress()-- gitgitgadget