1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
/*
* Copyright (C) 2011, Chris Aniszczyk <caniszczyk@gmail.com> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Collection;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ReflogEntry;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Before;
import org.junit.Test;
public class ReflogCommandTest extends RepositoryTestCase {
private Git git;
private RevCommit commit1, commit2;
private static final String FILE = "test.txt";
@Override
@Before
public void setUp() throws Exception {
super.setUp();
git = new Git(db);
// commit something
writeTrashFile(FILE, "Hello world");
git.add().addFilepattern(FILE).call();
commit1 = git.commit().setMessage("Initial commit").call();
git.checkout().setCreateBranch(true).setName("b1").call();
git.rm().addFilepattern(FILE).call();
commit2 = git.commit().setMessage("Removed file").call();
git.notesAdd().setObjectId(commit1).setMessage("data").call();
}
/**
* Test getting the HEAD reflog
*
* @throws Exception
*/
@Test
public void testHeadReflog() throws Exception {
Collection<ReflogEntry> reflog = git.reflog().call();
assertNotNull(reflog);
assertEquals(3, reflog.size());
ReflogEntry[] reflogs = reflog.toArray(new ReflogEntry[0]);
assertEquals(reflogs[2].getComment(),
"commit (initial): Initial commit");
assertEquals(reflogs[2].getNewId(), commit1.getId());
assertEquals(reflogs[2].getOldId(), ObjectId.zeroId());
assertEquals(reflogs[1].getComment(),
"checkout: moving from master to b1");
assertEquals(reflogs[1].getNewId(), commit1.getId());
assertEquals(reflogs[1].getOldId(), commit1.getId());
assertEquals(reflogs[0].getComment(), "commit: Removed file");
assertEquals(reflogs[0].getNewId(), commit2.getId());
assertEquals(reflogs[0].getOldId(), commit1.getId());
}
/**
* Test getting the reflog for an explicit branch
*
* @throws Exception
*/
@Test
public void testBranchReflog() throws Exception {
Collection<ReflogEntry> reflog = git.reflog()
.setRef(Constants.R_HEADS + "b1").call();
assertNotNull(reflog);
assertEquals(2, reflog.size());
ReflogEntry[] reflogs = reflog.toArray(new ReflogEntry[0]);
assertEquals(reflogs[0].getComment(), "commit: Removed file");
assertEquals(reflogs[0].getNewId(), commit2.getId());
assertEquals(reflogs[0].getOldId(), commit1.getId());
assertEquals(reflogs[1].getComment(),
"branch: Created from commit Initial commit");
assertEquals(reflogs[1].getNewId(), commit1.getId());
assertEquals(reflogs[1].getOldId(), ObjectId.zeroId());
}
/**
* Test getting the reflog for an amend commit
*
* @throws Exception
*/
@Test
public void testAmendReflog() throws Exception {
RevCommit commit2a = git.commit().setAmend(true)
.setMessage("Deleted file").call();
Collection<ReflogEntry> reflog = git.reflog().call();
assertNotNull(reflog);
assertEquals(4, reflog.size());
ReflogEntry[] reflogs = reflog.toArray(new ReflogEntry[0]);
assertEquals(reflogs[3].getComment(),
"commit (initial): Initial commit");
assertEquals(reflogs[3].getNewId(), commit1.getId());
assertEquals(reflogs[3].getOldId(), ObjectId.zeroId());
assertEquals(reflogs[2].getComment(),
"checkout: moving from master to b1");
assertEquals(reflogs[2].getNewId(), commit1.getId());
assertEquals(reflogs[2].getOldId(), commit1.getId());
assertEquals(reflogs[1].getComment(), "commit: Removed file");
assertEquals(reflogs[1].getNewId(), commit2.getId());
assertEquals(reflogs[1].getOldId(), commit1.getId());
assertEquals(reflogs[0].getComment(), "commit (amend): Deleted file");
assertEquals(reflogs[0].getNewId(), commit2a.getId());
assertEquals(reflogs[0].getOldId(), commit2.getId());
}
}
|
