From b0326235e1188e1931a9429c60c59495e43bd740 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 3 May 2013 11:22:25 -0700 Subject: [PATCH] Remove unused repository field from RevWalk The comment about legacy Tag and Object types no longer applies, though prior to Idb273d5a92849b42935ac14eed73b796b80aad50 the field was still being used by RewriteTreeFilter. Change-Id: I9ee5da8f8a3b61c9cf543817c03117ee0609dd8f --- .../org/eclipse/jgit/revwalk/RevWalkShallowTest.java | 2 +- .../src/org/eclipse/jgit/revwalk/RevWalk.java | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkShallowTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkShallowTest.java index 479d9d304..3e45d2eb9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkShallowTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkShallowTest.java @@ -189,7 +189,7 @@ private void createShallowFile(ObjectId... shallowCommits) final StringBuilder builder = new StringBuilder(); for (ObjectId commit : shallowCommits) builder.append(commit.getName() + "\n"); - JGitTestUtil.write(new File(rw.repository.getDirectory(), "shallow"), + JGitTestUtil.write(new File(db.getDirectory(), "shallow"), builder.toString()); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index 8e07048e2..ca5f4fe61 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -163,9 +163,6 @@ public class RevWalk implements Iterable { private static final int APP_FLAGS = -1 & ~((1 << RESERVED_FLAGS) - 1); - /** Exists ONLY to support legacy Tag and Commit objects. */ - final Repository repository; - final ObjectReader reader; final MutableObjectId idBuffer; @@ -203,7 +200,7 @@ public class RevWalk implements Iterable { * released by the caller. */ public RevWalk(final Repository repo) { - this(repo, repo.newObjectReader()); + this(repo.newObjectReader()); } /** @@ -215,11 +212,6 @@ public RevWalk(final Repository repo) { * required. */ public RevWalk(ObjectReader or) { - this(null, or); - } - - private RevWalk(final Repository repo, final ObjectReader or) { - repository = repo; reader = or; idBuffer = new MutableObjectId(); objects = new ObjectIdOwnerMap();