Pārlūkot izejas kodu

Close RevWalk in BranchTrackingStatus.of()

Bug: 530757
Change-Id: I985ee5395e1468981c28ae0a80797732e2f528d2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v4.11.0.201803080745-r
Matthias Sohn pirms 6 gadiem
vecāks
revīzija
f7244b81cc

+ 15
- 12
org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java Parādīt failu

@@ -87,22 +87,25 @@ public class BranchTrackingStatus {
if (local == null)
return null;

RevWalk walk = new RevWalk(repository);
try (RevWalk walk = new RevWalk(repository)) {

RevCommit localCommit = walk.parseCommit(local.getObjectId());
RevCommit trackingCommit = walk.parseCommit(tracking.getObjectId());
RevCommit localCommit = walk.parseCommit(local.getObjectId());
RevCommit trackingCommit = walk.parseCommit(tracking.getObjectId());

walk.setRevFilter(RevFilter.MERGE_BASE);
walk.markStart(localCommit);
walk.markStart(trackingCommit);
RevCommit mergeBase = walk.next();
walk.setRevFilter(RevFilter.MERGE_BASE);
walk.markStart(localCommit);
walk.markStart(trackingCommit);
RevCommit mergeBase = walk.next();

walk.reset();
walk.setRevFilter(RevFilter.ALL);
int aheadCount = RevWalkUtils.count(walk, localCommit, mergeBase);
int behindCount = RevWalkUtils.count(walk, trackingCommit, mergeBase);
walk.reset();
walk.setRevFilter(RevFilter.ALL);
int aheadCount = RevWalkUtils.count(walk, localCommit, mergeBase);
int behindCount = RevWalkUtils.count(walk, trackingCommit,
mergeBase);

return new BranchTrackingStatus(trackingBranch, aheadCount, behindCount);
return new BranchTrackingStatus(trackingBranch, aheadCount,
behindCount);
}
}

private final String remoteTrackingBranch;

Notiek ielāde…
Atcelt
Saglabāt