diff options
author | Ivan Frade <ifrade@google.com> | 2023-11-07 11:36:51 -0800 |
---|---|---|
committer | Ivan Frade <ifrade@google.com> | 2023-11-07 13:41:54 -0800 |
commit | c46b54eeac1cb2aaf62d4394fb7f60c848eab7b1 (patch) | |
tree | a603b5fd1a4813d7707f86e2c2a97cbf37e5f748 /org.eclipse.jgit/resources | |
parent | 3937300f3eb4dd557ec2d195f21793f737d6cb4e (diff) | |
download | jgit-c46b54eeac1cb2aaf62d4394fb7f60c848eab7b1.tar.gz jgit-c46b54eeac1cb2aaf62d4394fb7f60c848eab7b1.zip |
CommitGraphWriter: Unnest generation-number progress
The ProgressMonitor task to track the calculation of generation
numbers is nested inside the task that follows the writing of all
lines in the commit-graph. ProgressMonitor doesn't support nested
tasks and this confuses the counting.
Move the start/end of the "writing commit graph" task to the
writeCommitData section, after calculating the generation
numbers. Make that task track by commits instead of by lines.
Moving the start/end of the progress task to the chunk-writing
functions is clearer and easier to extend.
Logging of GC before:
Writing out commit-graph in 3 passes: 51% ( 9807/19358)
Computing commit-graph generation numbers: 100% (9551/9551)
Logging of GC after:
Computing commit-graph generation numbers: 100% (9551/9551)
Writing out commit-graph: 100% (9551/9551)
Change-Id: I87d69c06c9a3c7e75be12b6f0d1a63b5924e298a
Diffstat (limited to 'org.eclipse.jgit/resources')
-rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 84f5a7638c..6bd4cb136c 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -886,7 +886,7 @@ writerAlreadyInitialized=Writer already initialized writeTimedOut=Write timed out after {0} ms writingNotPermitted=Writing not permitted writingNotSupported=Writing {0} not supported. -writingOutCommitGraph=Writing out commit-graph in {0} passes +writingOutCommitGraph=Writing out commit-graph writingObjects=Writing objects wrongDecompressedLength=wrong decompressed length wrongRepositoryState=Wrong Repository State: {0} |