motiejus
/
jgit
1
Fork 0
Code Releases Activity

Inline PackWriterBitmapWalker.newRevFilter into callers 

Instead of using the newRevFilter helper, call the appropriate
RevFilter constructor directly.  This means one less hop to find
documentation about what the RevFilter will do.

Change-Id: Ida6ff1c0457a47a1bd1e4ed0fd1dd42a616d214f
This commit is contained in:
Jonathan Nieder 2015-11-03 22:29:31 -08:00
parent af4ee73454
commit e87f0cd866
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java
View File

@ -63,6 +63,7 @@
import org.eclipse.jgit.internal.storage.file.PackBitmapIndex;
import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder;
import org.eclipse.jgit.internal.storage.file.PackBitmapIndexRemapper;
import org.eclipse.jgit.internal.storage.pack.PackWriterBitmapWalker.AddUnseenToBitmapFilter;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
@ -262,7 +263,7 @@ Collection<BitmapCommit> selectCommits(int expectedCommitCount)
BitmapBuilder fullBitmap = commitBitmapIndex.newBitmapBuilder();
rw.reset();
rw.markStart(c);
rw.setRevFilter(PackWriterBitmapWalker.newRevFilter(
rw.setRevFilter(new AddUnseenToBitmapFilter(
selectionHelper.reusedCommitsBitmap, fullBitmap));
while (rw.next() != null) {

19
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java
View File

@ -110,8 +110,12 @@ BitmapBuilder findObjects(Set<? extends ObjectId> start, BitmapBuilder seen, boo
}
if (marked) {
RevFilter filter = newRevFilter(seen, bitmapResult);
walker.setRevFilter(filter);
if (seen == null) {
walker.setRevFilter(new AddToBitmapFilter(bitmapResult));
} else {
walker.setRevFilter(
new AddUnseenToBitmapFilter(seen, bitmapResult));
}
while (walker.next() != null) {
// Iterate through all of the commits. The BitmapRevFilter does
@ -141,13 +145,6 @@ void reset() {
walker.reset();
}
static RevFilter newRevFilter(BitmapBuilder seen, BitmapBuilder bitmapResult) {
if (seen != null) {
return new AddUnseenToBitmapFilter(seen, bitmapResult);
}
return new AddToBitmapFilter(bitmapResult);
}
/**
* A RevFilter that adds the visited commits to {@code bitmap} as a side
* effect.
@ -158,7 +155,7 @@ static RevFilter newRevFilter(BitmapBuilder seen, BitmapBuilder bitmapResult) {
* have to visit its ancestors. This ensures the walk is very short if
* there is good bitmap coverage.
*/
private static class AddToBitmapFilter extends RevFilter {
static class AddToBitmapFilter extends RevFilter {
private final BitmapBuilder bitmap;
AddToBitmapFilter(BitmapBuilder bitmap) {
@ -209,7 +206,7 @@ public final boolean requiresCommitBody() {
* encountered, that commit and its parents will be marked with the SEEN
* flag to prevent the walk from visiting its ancestors.
*/
private static class AddUnseenToBitmapFilter extends RevFilter {
static class AddUnseenToBitmapFilter extends RevFilter {
private final BitmapBuilder seen;
private final BitmapBuilder bitmap;