motiejus
/
jgit
1
Fork 0
Code Releases Activity

PackWriter: Correct 'Compressing objects' progress message 

The first 'Compressing objects' progress message is wrong, its
actually PackWriter looking up the sizes of each object in the
ObjectDatabase, so objects can be sorted correctly in the later
type-size sort that tries to take advantage of "Linus' Law" to
improve delta compression.

Rename the progress to say 'Getting sizes', which is an accurate
description of what it is doing.

Change-Id: Ida0a052ad2f6e994996189ca12959caab9e556a3
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
This commit is contained in:
Shawn O. Pearce 2011-01-31 08:37:54 -08:00 committed by Chris Aniszczyk
parent eb5658e629
commit 8f63dface2
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
View File

@ -380,6 +380,7 @@ resettingHead=Resetting head to {0}
resultLengthIncorrect=result length incorrect
rewinding=Rewinding to commit {0}
searchForReuse=Finding sources
searchForSizes=Getting sizes
sequenceTooLargeForDiffAlgorithm=Sequence too large for difference algorithm.
serviceNotPermitted={0} not permitted
shortCompressedStreamAt=Short compressed stream at {0}

1
org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
View File

@ -440,6 +440,7 @@ public static JGitText get() {
/***/ public String resultLengthIncorrect;
/***/ public String rewinding;
/***/ public String searchForReuse;
/***/ public String searchForSizes;
/***/ public String sequenceTooLargeForDiffAlgorithm;
/***/ public String serviceNotPermitted;
/***/ public String shortCompressedStreamAt;

2
org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
View File

@ -557,7 +557,7 @@ private void searchForDeltas(ProgressMonitor monitor)
// search code to discover the missing object and skip over it, or
// abort with an exception if we actually had to have it.
//
monitor.beginTask(JGitText.get().compressingObjects, cnt);
monitor.beginTask(JGitText.get().searchForSizes, cnt);
AsyncObjectSizeQueue<ObjectToPack> sizeQueue = reader.getObjectSize(
Arrays.<ObjectToPack> asList(list).subList(0, cnt), false);
try {