git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 0/2] commit-graph: use start_delayed_progress()

From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Date
Nov 7, 2019, 17:46 UTC
Message-ID
<pull.450.v3.git.1573148818.gitgitgadget@gmail.com>
In-Reply-To
<pull.450.v2.git.1572984842.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.

Derrick Stolee (2):
  progress: create GIT_PROGRESS_DELAY
  commit-graph: use start_delayed_progress()
 Documentation/git.txt   | 4 ++++
 commit-graph.c          | 2 +-
 progress.c              | 8 +++++++-
 t/t5318-commit-graph.sh | 4 ++--
 t/t6500-gc.sh           | 6 ++----
 5 files changed, 16 insertions(+), 8 deletions(-)
base-commit: da72936f544fec5a335e66432610e4cef4430991
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-450%2Fderrickstolee%2Fcommit-graph-progress-fix-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-450/derrickstolee/commit-graph-progress-fix-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/450
Range-diff vs v2:
 -:  ---------- > 1:  656dba5afb progress: create GIT_PROGRESS_DELAY
 1:  78bd6bc2c0 ! 2:  3c0c9675e1 commit-graph: use start_delayed_progress()
     @@ -11,9 +11,13 @@
          previous step. But, this is showing up for all users no matter how few
          commits are being added.
      
     -    Now that we changed this method, very fast commands show no progess at
     -    all. This means we need to stop testing for seeing these progress lines
     -    in the test suite.
     +    The tests that check for the progress output have already been updated
     +    to use GIT_PROGRESS_DELAY=0 to force the expected output. However, there
     +    is one test in t6500-gc.sh that uses the test_terminal method. This
     +    mechanism does not preserve the GIT_PROGRESS_DELAY environment variable,
     +    so we need to modify check on the output. We still watch for the
     +    "Enumerating objects" progress but no longer look for "Computing
     +    commit graph generation numbers".
      
          Reported-by: ryenus <ryenus@gmail.com>
          Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
     @@ -31,44 +35,16 @@
       					ctx->commits.nr);
       	for (i = 0; i < ctx->commits.nr; i++) {
      
     - diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
     - --- a/t/t5318-commit-graph.sh
     - +++ b/t/t5318-commit-graph.sh
     -@@
     - 	test_line_count = 0 err
     - '
     - 
     --test_expect_success 'commit-graph write force progress on for stderr' '
     --	cd "$TRASH_DIRECTORY/full" &&
     --	git commit-graph write --progress 2>err &&
     --	test_file_not_empty err
     --'
     --
     - test_expect_success 'commit-graph write with the --no-progress option' '
     - 	cd "$TRASH_DIRECTORY/full" &&
     - 	git commit-graph write --no-progress 2>err &&
     -
       diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
       --- a/t/t6500-gc.sh
       +++ b/t/t6500-gc.sh
      @@
     - 	test_line_count = 2 new # There is one new pack and its .idx
     - '
     - 
     --test_expect_success 'gc --no-quiet' '
     --	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
     --'
     --
     --test_expect_success TTY 'with TTY: gc --no-quiet' '
     --	test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
     --	test_must_be_empty stdout &&
     + test_expect_success TTY 'with TTY: gc --no-quiet' '
     + 	test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
     + 	test_must_be_empty stdout &&
      -	test_i18ngrep "Enumerating objects" stderr &&
      -	test_i18ngrep "Computing commit graph generation numbers" stderr
     --'
     --
     ++	test_i18ngrep "Enumerating objects" stderr
     + '
     + 
       test_expect_success 'gc --quiet' '
     - 	git -c gc.writeCommitGraph=true gc --quiet >stdout 2>stderr &&
     - 	test_must_be_empty stdout &&
-- 
gitgitgadget
Previous: Junio C HamanoNext: Derrick Stolee via GitGitGadget
Message 13 of 32 in “commit-graph: use start_delayed_progress()”
  1. 0/1 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 5, 2019
  2. 1/1 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 5, 2019
  3. Derrick StoleeNov 5, 2019
  4. 0/1 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 5, 2019
  5. 1/1 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 5, 2019
  6. Jeff KingNov 6, 2019
  7. Derrick StoleeNov 6, 2019
  8. Jeff KingNov 7, 2019
  9. Derrick StoleeNov 7, 2019
  10. Junio C HamanoNov 7, 2019
  11. Jeff KingNov 7, 2019
  12. Junio C HamanoNov 7, 2019
  13. 0/2 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 7, 2019
  14. 1/2 progress: create GIT_PROGRESS_DELAYDerrick Stolee via GitGitGadget, Nov 7, 2019
  15. Jeff KingNov 7, 2019
  16. SZEDER GáborNov 11, 2019
  17. 2/2 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 7, 2019
  18. Jeff KingNov 7, 2019
  19. SZEDER GáborNov 21, 2019
  20. 0/2 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 21, 2019
  21. 2/2 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 21, 2019
  22. Jeff KingNov 22, 2019
  23. Derrick StoleeNov 25, 2019
  24. 1/2 progress: create GIT_PROGRESS_DELAYDerrick Stolee via GitGitGadget, Nov 21, 2019
  25. Jeff KingNov 22, 2019
  26. 0/2 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 25, 2019
  27. 1/2 progress: create GIT_PROGRESS_DELAYDerrick Stolee via GitGitGadget, Nov 25, 2019
  28. 2/2 commit-graph: use start_delayed_progress()Derrick Stolee via GitGitGadget, Nov 25, 2019
  29. Jeff KingNov 26, 2019
  30. Derrick StoleeNov 26, 2019
  31. Junio C HamanoNov 30, 2019
  32. SZEDER GáborDec 1, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.