Skip to content

Commit e93294f

Browse files
msohnmsohn
committed
Deprecate Repository#getReflogReader methods
instead use Repository.getRefDatabase().getReflogReader(). Change-Id: I5e66a512c12e11d0ec3275fffde4adb8483430f2
1 parent fda44a4 commit e93294f

22 files changed

+288
-191
lines changed

‎org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1728,7 +1728,8 @@ public void testPush_CreateBranch() throws Exception {
17281728
assertEquals(Q, remoteRepository.exactRef(dstName).getObjectId());
17291729
fsck(remoteRepository, Q);
17301730

1731-
final ReflogReader log = remoteRepository.getReflogReader(dstName);
1731+
final ReflogReader log = remoteRepository.getRefDatabase()
1732+
.getReflogReader(dstName);
17321733
assertNotNull("has log for " + dstName, log);
17331734

17341735
final ReflogEntry last = log.getLastEntry();

‎org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.eclipse.jgit.lib.Constants;
3535
import org.eclipse.jgit.lib.FileMode;
3636
import org.eclipse.jgit.lib.ObjectId;
37+
import org.eclipse.jgit.lib.RefDatabase;
3738
import org.eclipse.jgit.lib.ReflogReader;
3839
import org.eclipse.jgit.lib.RepositoryState;
3940
import org.eclipse.jgit.merge.ContentMergeStrategy;
@@ -529,10 +530,11 @@ private void doCherryPickAndCheckResult(final Git git,
529530
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
530531

531532
if (reason == null) {
532-
ReflogReader reader = db.getReflogReader(Constants.HEAD);
533+
RefDatabase refDb = db.getRefDatabase();
534+
ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
533535
assertTrue(reader.getLastEntry().getComment()
534536
.startsWith("cherry-pick: "));
535-
reader = db.getReflogReader(db.getBranch());
537+
reader = refDb.getReflogReader(db.getBranch());
536538
assertTrue(reader.getLastEntry().getComment()
537539
.startsWith("cherry-pick: "));
538540
}

‎org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ private static boolean isLocalHead(Ref ref) {
182182

183183
private static boolean hasRefLog(Repository repo, Ref ref) {
184184
try {
185-
return repo.getReflogReader(ref.getName()).getLastEntry() != null;
185+
return repo.getRefDatabase().getReflogReader(ref.getName())
186+
.getLastEntry() != null;
186187
} catch (IOException ioe) {
187188
throw new IllegalStateException(ioe);
188189
}

‎org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.eclipse.jgit.lib.Constants;
2727
import org.eclipse.jgit.lib.ObjectId;
2828
import org.eclipse.jgit.lib.PersonIdent;
29+
import org.eclipse.jgit.lib.RefDatabase;
2930
import org.eclipse.jgit.lib.RefUpdate;
3031
import org.eclipse.jgit.lib.ReflogReader;
3132
import org.eclipse.jgit.revwalk.RevCommit;
@@ -69,10 +70,11 @@ public void testSomeCommits() throws Exception {
6970
l--;
7071
}
7172
assertEquals(l, -1);
72-
ReflogReader reader = db.getReflogReader(Constants.HEAD);
73+
RefDatabase refDb = db.getRefDatabase();
74+
ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
7375
assertTrue(
7476
reader.getLastEntry().getComment().startsWith("commit:"));
75-
reader = db.getReflogReader(db.getBranch());
77+
reader = refDb.getReflogReader(db.getBranch());
7678
assertTrue(
7779
reader.getLastEntry().getComment().startsWith("commit:"));
7880
}
@@ -248,10 +250,11 @@ public void testCommitAmend() throws Exception {
248250
c++;
249251
}
250252
assertEquals(1, c);
251-
ReflogReader reader = db.getReflogReader(Constants.HEAD);
253+
RefDatabase refDb = db.getRefDatabase();
254+
ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
252255
assertTrue(reader.getLastEntry().getComment()
253256
.startsWith("commit (amend):"));
254-
reader = db.getReflogReader(db.getBranch());
257+
reader = refDb.getReflogReader(db.getBranch());
255258
assertTrue(reader.getLastEntry().getComment()
256259
.startsWith("commit (amend):"));
257260
}

‎org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java

+12-7
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,12 @@ public void commitAfterSquashMerge() throws Exception {
435435

436436
assertEquals(1, squashedCommit.getParentCount());
437437
assertNull(db.readSquashCommitMsg());
438-
assertEquals("commit: Squashed commit of the following:", db
439-
.getReflogReader(Constants.HEAD).getLastEntry().getComment());
440-
assertEquals("commit: Squashed commit of the following:", db
441-
.getReflogReader(db.getBranch()).getLastEntry().getComment());
438+
assertEquals("commit: Squashed commit of the following:",
439+
db.getRefDatabase().getReflogReader(Constants.HEAD)
440+
.getLastEntry().getComment());
441+
assertEquals("commit: Squashed commit of the following:",
442+
db.getRefDatabase().getReflogReader(db.getBranch())
443+
.getLastEntry().getComment());
442444
}
443445
}
444446

@@ -455,12 +457,15 @@ public void testReflogs() throws Exception {
455457
git.commit().setMessage("c3").setAll(true)
456458
.setReflogComment("testRl").call();
457459

458-
db.getReflogReader(Constants.HEAD).getReverseEntries();
460+
db.getRefDatabase().getReflogReader(Constants.HEAD)
461+
.getReverseEntries();
459462

460463
assertEquals("testRl;commit (initial): c1;", reflogComments(
461-
db.getReflogReader(Constants.HEAD).getReverseEntries()));
464+
db.getRefDatabase().getReflogReader(Constants.HEAD)
465+
.getReverseEntries()));
462466
assertEquals("testRl;commit (initial): c1;", reflogComments(
463-
db.getReflogReader(db.getBranch()).getReverseEntries()));
467+
db.getRefDatabase().getReflogReader(db.getBranch())
468+
.getReverseEntries()));
464469
}
465470
}
466471

‎org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchCommandTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public void testFetchHasRefLogForRemoteRef() throws Exception {
9292

9393
assertTrue(remoteRef.getName().startsWith(Constants.R_REMOTES));
9494
assertEquals(defaultBranchSha1, remoteRef.getObjectId());
95-
assertNotNull(git.getRepository().getReflogReader(remoteRef.getName())
96-
.getLastEntry());
95+
assertNotNull(git.getRepository().getRefDatabase()
96+
.getReflogReader(remoteRef.getName()).getLastEntry());
9797
}
9898

9999
@Test

‎org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java

+35-24
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.eclipse.jgit.junit.TestRepository.BranchBuilder;
3434
import org.eclipse.jgit.lib.Constants;
3535
import org.eclipse.jgit.lib.Ref;
36+
import org.eclipse.jgit.lib.RefDatabase;
3637
import org.eclipse.jgit.lib.Repository;
3738
import org.eclipse.jgit.lib.RepositoryState;
3839
import org.eclipse.jgit.lib.Sets;
@@ -76,11 +77,10 @@ public void testMergeInItself() throws Exception {
7677
assertEquals(MergeResult.MergeStatus.ALREADY_UP_TO_DATE, result.getMergeStatus());
7778
}
7879
// no reflog entry written by merge
79-
assertEquals("commit (initial): initial commit",
80-
db
80+
RefDatabase refDb = db.getRefDatabase();
81+
assertEquals("commit (initial): initial commit", refDb
8182
.getReflogReader(Constants.HEAD).getLastEntry().getComment());
82-
assertEquals("commit (initial): initial commit",
83-
db
83+
assertEquals("commit (initial): initial commit", refDb
8484
.getReflogReader(db.getBranch()).getLastEntry().getComment());
8585
}
8686

@@ -96,9 +96,9 @@ public void testAlreadyUpToDate() throws Exception {
9696
assertEquals(second, result.getNewHead());
9797
}
9898
// no reflog entry written by merge
99-
assertEquals("commit: second commit", db
99+
assertEquals("commit: second commit", db.getRefDatabase()
100100
.getReflogReader(Constants.HEAD).getLastEntry().getComment());
101-
assertEquals("commit: second commit", db
101+
assertEquals("commit: second commit", db.getRefDatabase()
102102
.getReflogReader(db.getBranch()).getLastEntry().getComment());
103103
}
104104

@@ -117,10 +117,13 @@ public void testFastForward() throws Exception {
117117
assertEquals(MergeResult.MergeStatus.FAST_FORWARD, result.getMergeStatus());
118118
assertEquals(second, result.getNewHead());
119119
}
120+
RefDatabase refDb = db.getRefDatabase();
120121
assertEquals("merge refs/heads/master: Fast-forward",
121-
db.getReflogReader(Constants.HEAD).getLastEntry().getComment());
122+
refDb.getReflogReader(Constants.HEAD)
123+
.getLastEntry().getComment());
122124
assertEquals("merge refs/heads/master: Fast-forward",
123-
db.getReflogReader(db.getBranch()).getLastEntry().getComment());
125+
refDb.getReflogReader(db.getBranch())
126+
.getLastEntry().getComment());
124127
}
125128

126129
@Test
@@ -140,9 +143,10 @@ public void testFastForwardNoCommit() throws Exception {
140143
result.getMergeStatus());
141144
assertEquals(second, result.getNewHead());
142145
}
143-
assertEquals("merge refs/heads/master: Fast-forward", db
146+
RefDatabase refDb = db.getRefDatabase();
147+
assertEquals("merge refs/heads/master: Fast-forward", refDb
144148
.getReflogReader(Constants.HEAD).getLastEntry().getComment());
145-
assertEquals("merge refs/heads/master: Fast-forward", db
149+
assertEquals("merge refs/heads/master: Fast-forward", refDb
146150
.getReflogReader(db.getBranch()).getLastEntry().getComment());
147151
}
148152

@@ -171,10 +175,11 @@ public void testFastForwardWithFiles() throws Exception {
171175
assertEquals(MergeResult.MergeStatus.FAST_FORWARD, result.getMergeStatus());
172176
assertEquals(second, result.getNewHead());
173177
}
174-
assertEquals("merge refs/heads/master: Fast-forward",
175-
db.getReflogReader(Constants.HEAD).getLastEntry().getComment());
176-
assertEquals("merge refs/heads/master: Fast-forward",
177-
db.getReflogReader(db.getBranch()).getLastEntry().getComment());
178+
RefDatabase refDb = db.getRefDatabase();
179+
assertEquals("merge refs/heads/master: Fast-forward", refDb
180+
.getReflogReader(Constants.HEAD).getLastEntry().getComment());
181+
assertEquals("merge refs/heads/master: Fast-forward", refDb
182+
.getReflogReader(db.getBranch()).getLastEntry().getComment());
178183
}
179184

180185
@Test
@@ -229,14 +234,17 @@ public void testMergeSuccessAllStrategies(MergeStrategy mergeStrategy)
229234
.include(db.exactRef(R_HEADS + MASTER)).call();
230235
assertEquals(MergeStatus.MERGED, result.getMergeStatus());
231236
}
237+
RefDatabase refDb = db.getRefDatabase();
232238
assertEquals(
233239
"merge refs/heads/master: Merge made by "
234240
+ mergeStrategy.getName() + ".",
235-
db.getReflogReader(Constants.HEAD).getLastEntry().getComment());
241+
refDb.getReflogReader(Constants.HEAD).getLastEntry()
242+
.getComment());
236243
assertEquals(
237244
"merge refs/heads/master: Merge made by "
238245
+ mergeStrategy.getName() + ".",
239-
db.getReflogReader(db.getBranch()).getLastEntry().getComment());
246+
refDb.getReflogReader(db.getBranch()).getLastEntry()
247+
.getComment());
240248
}
241249

242250
@Theory
@@ -662,14 +670,17 @@ public void testMultipleCreationsSameContent() throws Exception {
662670
.setStrategy(MergeStrategy.RESOLVE).call();
663671
assertEquals(MergeStatus.MERGED, result.getMergeStatus());
664672
assertEquals("1\nb(1)\n3\n", read(new File(db.getWorkTree(), "b")));
665-
assertEquals("merge " + secondCommit.getId().getName()
666-
+ ": Merge made by resolve.", db
667-
.getReflogReader(Constants.HEAD)
668-
.getLastEntry().getComment());
669-
assertEquals("merge " + secondCommit.getId().getName()
670-
+ ": Merge made by resolve.", db
671-
.getReflogReader(db.getBranch())
672-
.getLastEntry().getComment());
673+
RefDatabase refDb = db.getRefDatabase();
674+
assertEquals(
675+
"merge " + secondCommit.getId().getName()
676+
+ ": Merge made by resolve.",
677+
refDb.getReflogReader(Constants.HEAD).getLastEntry()
678+
.getComment());
679+
assertEquals(
680+
"merge " + secondCommit.getId().getName()
681+
+ ": Merge made by resolve.",
682+
refDb.getReflogReader(db.getBranch()).getLastEntry()
683+
.getComment());
673684
}
674685
}
675686

‎org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java

+28-21
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.eclipse.jgit.lib.PersonIdent;
5858
import org.eclipse.jgit.lib.RebaseTodoLine;
5959
import org.eclipse.jgit.lib.RebaseTodoLine.Action;
60+
import org.eclipse.jgit.lib.RefDatabase;
6061
import org.eclipse.jgit.lib.RefUpdate;
6162
import org.eclipse.jgit.lib.ReflogEntry;
6263
import org.eclipse.jgit.lib.RepositoryState;
@@ -133,11 +134,12 @@ public void testFastForwardWithNewFile() throws Exception {
133134
checkFile(file2, "file2");
134135
assertEquals(Status.FAST_FORWARD, res.getStatus());
135136

136-
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
137+
RefDatabase refDb = db.getRefDatabase();
138+
List<ReflogEntry> headLog = refDb.getReflogReader(Constants.HEAD)
137139
.getReverseEntries();
138-
List<ReflogEntry> topicLog = db.getReflogReader("refs/heads/topic")
140+
List<ReflogEntry> topicLog = refDb.getReflogReader("refs/heads/topic")
139141
.getReverseEntries();
140-
List<ReflogEntry> masterLog = db.getReflogReader("refs/heads/master")
142+
List<ReflogEntry> masterLog = refDb.getReflogReader("refs/heads/master")
141143
.getReverseEntries();
142144
assertEquals("rebase finished: returning to refs/heads/topic", headLog
143145
.get(0).getComment());
@@ -179,11 +181,12 @@ public void testFastForwardWithMultipleCommits() throws Exception {
179181
checkFile(file2, "file2 new content");
180182
assertEquals(Status.FAST_FORWARD, res.getStatus());
181183

182-
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
184+
RefDatabase refDb = db.getRefDatabase();
185+
List<ReflogEntry> headLog = refDb.getReflogReader(Constants.HEAD)
183186
.getReverseEntries();
184-
List<ReflogEntry> topicLog = db.getReflogReader("refs/heads/topic")
187+
List<ReflogEntry> topicLog = refDb.getReflogReader("refs/heads/topic")
185188
.getReverseEntries();
186-
List<ReflogEntry> masterLog = db.getReflogReader("refs/heads/master")
189+
List<ReflogEntry> masterLog = refDb.getReflogReader("refs/heads/master")
187190
.getReverseEntries();
188191
assertEquals("rebase finished: returning to refs/heads/topic", headLog
189192
.get(0).getComment());
@@ -447,13 +450,14 @@ public void testRebaseShouldIgnoreMergeCommits()
447450
assertEquals(a, rw.next());
448451
}
449452

450-
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
453+
RefDatabase refDb = db.getRefDatabase();
454+
List<ReflogEntry> headLog = refDb.getReflogReader(Constants.HEAD)
451455
.getReverseEntries();
452-
List<ReflogEntry> sideLog = db.getReflogReader("refs/heads/side")
456+
List<ReflogEntry> sideLog = refDb.getReflogReader("refs/heads/side")
453457
.getReverseEntries();
454-
List<ReflogEntry> topicLog = db.getReflogReader("refs/heads/topic")
458+
List<ReflogEntry> topicLog = refDb.getReflogReader("refs/heads/topic")
455459
.getReverseEntries();
456-
List<ReflogEntry> masterLog = db.getReflogReader("refs/heads/master")
460+
List<ReflogEntry> masterLog = refDb.getReflogReader("refs/heads/master")
457461
.getReverseEntries();
458462
assertEquals("rebase finished: returning to refs/heads/topic", headLog
459463
.get(0).getComment());
@@ -768,9 +772,10 @@ public void testRebaseParentOntoHeadShouldBeUptoDate() throws Exception {
768772
RebaseResult result = git.rebase().setUpstream(parent).call();
769773
assertEquals(Status.UP_TO_DATE, result.getStatus());
770774

771-
assertEquals(2, db.getReflogReader(Constants.HEAD).getReverseEntries()
772-
.size());
773-
assertEquals(2, db.getReflogReader("refs/heads/master")
775+
RefDatabase refDb = db.getRefDatabase();
776+
assertEquals(2, refDb.getReflogReader(Constants.HEAD)
777+
.getReverseEntries().size());
778+
assertEquals(2, refDb.getReflogReader("refs/heads/master")
774779
.getReverseEntries().size());
775780
}
776781

@@ -786,9 +791,10 @@ public void testUpToDate() throws Exception {
786791
RebaseResult res = git.rebase().setUpstream(first).call();
787792
assertEquals(Status.UP_TO_DATE, res.getStatus());
788793

789-
assertEquals(1, db.getReflogReader(Constants.HEAD).getReverseEntries()
790-
.size());
791-
assertEquals(1, db.getReflogReader("refs/heads/master")
794+
RefDatabase refDb = db.getRefDatabase();
795+
assertEquals(1, refDb.getReflogReader(Constants.HEAD)
796+
.getReverseEntries().size());
797+
assertEquals(1, refDb.getReflogReader("refs/heads/master")
792798
.getReverseEntries().size());
793799
}
794800

@@ -846,11 +852,12 @@ public void testConflictFreeWithSingleFile() throws Exception {
846852
db.resolve(Constants.HEAD)).getParent(0));
847853
}
848854
assertEquals(origHead, db.readOrigHead());
849-
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
855+
RefDatabase refDb = db.getRefDatabase();
856+
List<ReflogEntry> headLog = refDb.getReflogReader(Constants.HEAD)
850857
.getReverseEntries();
851-
List<ReflogEntry> topicLog = db.getReflogReader("refs/heads/topic")
858+
List<ReflogEntry> topicLog = refDb.getReflogReader("refs/heads/topic")
852859
.getReverseEntries();
853-
List<ReflogEntry> masterLog = db.getReflogReader("refs/heads/master")
860+
List<ReflogEntry> masterLog = refDb.getReflogReader("refs/heads/master")
854861
.getReverseEntries();
855862
assertEquals(2, masterLog.size());
856863
assertEquals(3, topicLog.size());
@@ -898,8 +905,8 @@ public void testDetachedHead() throws Exception {
898905
db.resolve(Constants.HEAD)).getParent(0));
899906
}
900907

901-
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
902-
.getReverseEntries();
908+
List<ReflogEntry> headLog = db.getRefDatabase()
909+
.getReflogReader(Constants.HEAD).getReverseEntries();
903910
assertEquals(8, headLog.size());
904911
assertEquals("rebase: change file1 in topic", headLog.get(0)
905912
.getComment());

0 commit comments

Comments
 (0)