1
2
3
4
5
6
7
8
9
10
11
12
13
14 package org.eclipse.jgit.lib;
15
16 import static org.junit.Assert.assertEquals;
17 import static org.junit.Assert.assertFalse;
18 import static org.junit.Assert.assertNull;
19 import static org.junit.Assert.assertSame;
20 import static org.junit.Assert.assertTrue;
21 import static org.junit.Assert.fail;
22
23 import java.io.IOException;
24
25 import org.eclipse.jgit.api.Git;
26 import org.eclipse.jgit.errors.AmbiguousObjectException;
27 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
28 import org.eclipse.jgit.errors.RevisionSyntaxException;
29 import org.eclipse.jgit.revwalk.RevCommit;
30 import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
31 import org.junit.Test;
32
33 public class RepositoryResolveTest extends SampleDataRepositoryTestCase {
34
35 @Test
36 public void testObjectId_existing() throws IOException {
37 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0").name());
38 }
39
40 @Test
41 public void testObjectId_nonexisting() throws IOException {
42 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c1",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c1").name());
43 }
44
45 @Test
46 public void testObjectId_objectid_implicit_firstparent() throws IOException {
47 assertEquals("6e1475206e57110fcef4b92320436c1e9872a322",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^").name());
48 assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^^").name());
49 assertEquals("bab66b48f836ed950c99134ef666436fb07a09a0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^^^").name());
50 }
51
52 @Test
53 public void testObjectId_objectid_self() throws IOException {
54 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^0").name());
55 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^0^0").name());
56 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^0^0^0").name());
57 }
58
59 @Test
60 public void testObjectId_objectid_explicit_firstparent() throws IOException {
61 assertEquals("6e1475206e57110fcef4b92320436c1e9872a322",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^1").name());
62 assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^1^1").name());
63 assertEquals("bab66b48f836ed950c99134ef666436fb07a09a0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^1^1^1").name());
64 }
65
66 @Test
67 public void testObjectId_objectid_explicit_otherparents() throws IOException {
68 assertEquals("6e1475206e57110fcef4b92320436c1e9872a322",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^1").name());
69 assertEquals("f73b95671f326616d66b2afb3bdfcdbbce110b44",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^2").name());
70 assertEquals("d0114ab8ac326bab30e3a657a0397578c5a1af88",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^3").name());
71 assertEquals("d0114ab8ac326bab30e3a657a0397578c5a1af88",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^03").name());
72 }
73
74 @Test
75 public void testObjectId_objectid_invalid_explicit_parent() throws IOException {
76 assertEquals("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1",db.resolve("6462e7d8024396b14d7651e2ec11e2bbf07a05c4^1").name());
77 assertNull(db.resolve("6462e7d8024396b14d7651e2ec11e2bbf07a05c4^2"));
78 assertEquals("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1",db.resolve("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1^0").name());
79 assertNull(db.resolve("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1^1"));
80 assertNull(db.resolve("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1^2"));
81 }
82
83 @Test
84 public void testRef_refname() throws IOException {
85 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("master^0").name());
86 assertEquals("6e1475206e57110fcef4b92320436c1e9872a322",db.resolve("master^").name());
87 assertEquals("6e1475206e57110fcef4b92320436c1e9872a322",db.resolve("refs/heads/master^1").name());
88 }
89
90 @Test
91 public void testDistance() throws IOException {
92 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~0").name());
93 assertEquals("6e1475206e57110fcef4b92320436c1e9872a322",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~1").name());
94 assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~2").name());
95 assertEquals("bab66b48f836ed950c99134ef666436fb07a09a0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~3").name());
96 assertEquals("bab66b48f836ed950c99134ef666436fb07a09a0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~03").name());
97 assertEquals("6e1475206e57110fcef4b92320436c1e9872a322",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~").name());
98 assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~~").name());
99 assertEquals("bab66b48f836ed950c99134ef666436fb07a09a0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~~~").name());
100 assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~~1").name());
101 assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0~~~0").name());
102 }
103
104 @Test
105 public void testDistance_past_root() throws IOException {
106 assertEquals("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1",db.resolve("6462e7d8024396b14d7651e2ec11e2bbf07a05c4~1").name());
107 assertNull(db.resolve("6462e7d8024396b14d7651e2ec11e2bbf07a05c4~~"));
108 assertNull(db.resolve("6462e7d8024396b14d7651e2ec11e2bbf07a05c4^^"));
109 assertNull(db.resolve("6462e7d8024396b14d7651e2ec11e2bbf07a05c4~2"));
110 assertNull(db.resolve("6462e7d8024396b14d7651e2ec11e2bbf07a05c4~99"));
111 assertNull(db.resolve("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1~~"));
112 assertNull(db.resolve("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1^^"));
113 assertNull(db.resolve("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1~2"));
114 assertNull(db.resolve("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1~99"));
115 assertEquals("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1",db.resolve("master~6").name());
116 assertNull(db.resolve("master~7"));
117 assertNull(db.resolve("master~6~"));
118 }
119
120 @Test
121 public void testTree() throws IOException {
122 assertEquals("6020a3b8d5d636e549ccbd0c53e2764684bb3125",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^{tree}").name());
123 assertEquals("02ba32d3649e510002c21651936b7077aa75ffa9",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^^{tree}").name());
124 }
125
126 @Test
127 public void testHEAD() throws IOException {
128 assertEquals("6020a3b8d5d636e549ccbd0c53e2764684bb3125",db.resolve("HEAD^{tree}").name());
129 }
130
131 @Test
132 public void testDerefCommit() throws IOException {
133 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^{}").name());
134 assertEquals("49322bb17d3acc9146f98c97d078513228bbf3c0",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^{commit}").name());
135
136 assertEquals("6020a3b8d5d636e549ccbd0c53e2764684bb3125",db.resolve("49322bb17d3acc9146f98c97d078513228bbf3c0^{commit}^{tree}").name());
137 }
138
139 @Test
140 public void testDerefTag() throws IOException {
141 assertEquals("17768080a2318cd89bba4c8b87834401e2095703",db.resolve("refs/tags/B").name());
142 assertEquals("d86a2aada2f5e7ccf6f11880bfb9ab404e8a8864",db.resolve("refs/tags/B^{commit}").name());
143 assertEquals("032c063ce34486359e3ee3d4f9e5c225b9e1a4c2",db.resolve("refs/tags/B10th").name());
144 assertEquals("d86a2aada2f5e7ccf6f11880bfb9ab404e8a8864",db.resolve("refs/tags/B10th^{commit}").name());
145 assertEquals("d86a2aada2f5e7ccf6f11880bfb9ab404e8a8864",db.resolve("refs/tags/B10th^{}").name());
146 assertEquals("d86a2aada2f5e7ccf6f11880bfb9ab404e8a8864",db.resolve("refs/tags/B10th^0").name());
147 assertEquals("d86a2aada2f5e7ccf6f11880bfb9ab404e8a8864",db.resolve("refs/tags/B10th~0").name());
148 assertEquals("0966a434eb1a025db6b71485ab63a3bfbea520b6",db.resolve("refs/tags/B10th^").name());
149 assertEquals("2c349335b7f797072cf729c4f3bb0914ecb6dec9",db.resolve("refs/tags/B10th^^").name());
150 assertEquals("0966a434eb1a025db6b71485ab63a3bfbea520b6",db.resolve("refs/tags/B10th^1").name());
151 assertEquals("0966a434eb1a025db6b71485ab63a3bfbea520b6",db.resolve("refs/tags/B10th~1").name());
152 assertEquals("2c349335b7f797072cf729c4f3bb0914ecb6dec9",db.resolve("refs/tags/B10th~2").name());
153 assertEquals("2c349335b7f797072cf729c4f3bb0914ecb6dec9",db.resolve("refs/tags/B10th^~1").name());
154 }
155
156 @Test
157 public void testDerefBlob() throws IOException {
158 assertEquals("fd608fbe625a2b456d9f15c2b1dc41f252057dd7",db.resolve("spearce-gpg-pub^{}").name());
159 assertEquals("fd608fbe625a2b456d9f15c2b1dc41f252057dd7",db.resolve("spearce-gpg-pub^{blob}").name());
160 assertEquals("fd608fbe625a2b456d9f15c2b1dc41f252057dd7",db.resolve("fd608fbe625a2b456d9f15c2b1dc41f252057dd7^{}").name());
161 assertEquals("fd608fbe625a2b456d9f15c2b1dc41f252057dd7",db.resolve("fd608fbe625a2b456d9f15c2b1dc41f252057dd7^{blob}").name());
162 }
163
164 @Test
165 public void testDerefTree() throws IOException {
166 assertEquals("032c063ce34486359e3ee3d4f9e5c225b9e1a4c2",db.resolve("refs/tags/B10th").name());
167 assertEquals("856ec208ae6cadac25a6d74f19b12bb27a24fe24",db.resolve("032c063ce34486359e3ee3d4f9e5c225b9e1a4c2^{tree}").name());
168 assertEquals("856ec208ae6cadac25a6d74f19b12bb27a24fe24",db.resolve("refs/tags/B10th^{tree}").name());
169 }
170
171 @Test
172 public void testParseGitDescribeOutput() throws IOException {
173 ObjectId exp = db.resolve("b");
174 assertEquals(exp, db.resolve("B-g7f82283"));
175 assertEquals(exp, db.resolve("B-6-g7f82283"));
176
177 assertEquals(exp, db.resolve("B-6-g7f82283^0"));
178 assertEquals(exp, db.resolve("B-6-g7f82283^{commit}"));
179
180 try {
181 db.resolve("B-6-g7f82283^{blob}");
182 fail("expected IncorrectObjectTypeException");
183 } catch (IncorrectObjectTypeException badType) {
184
185 }
186
187 assertEquals(db.resolve("b^1"), db.resolve("B-6-g7f82283^1"));
188 assertEquals(db.resolve("b~2"), db.resolve("B-6-g7f82283~2"));
189 }
190
191 @Test
192 public void testParseNonGitDescribe() throws IOException {
193 ObjectId id = id("49322bb17d3acc9146f98c97d078513228bbf3c0");
194 RefUpdate ru = db.updateRef("refs/heads/foo-g032c");
195 ru.setNewObjectId(id);
196 assertSame(RefUpdate.Result.NEW, ru.update());
197
198 assertEquals(id, db.resolve("refs/heads/foo-g032c"));
199 assertEquals(id, db.resolve("foo-g032c"));
200 assertNull(db.resolve("foo-g032"));
201 assertNull(db.resolve("foo-g03"));
202 assertNull(db.resolve("foo-g0"));
203 assertNull(db.resolve("foo-g"));
204
205 ru = db.updateRef("refs/heads/foo-g032c-dev");
206 ru.setNewObjectId(id);
207 assertSame(RefUpdate.Result.NEW, ru.update());
208
209 assertEquals(id, db.resolve("refs/heads/foo-g032c-dev"));
210 assertEquals(id, db.resolve("foo-g032c-dev"));
211 }
212
213 @Test
214 public void testParseLookupPath() throws IOException {
215 ObjectId b2_txt = id("10da5895682013006950e7da534b705252b03be6");
216 ObjectId b3_b2_txt = id("e6bfff5c1d0f0ecd501552b43a1e13d8008abc31");
217 ObjectId b_root = id("acd0220f06f7e4db50ea5ba242f0dfed297b27af");
218 ObjectId master_txt = id("82b1d08466e9505f8666b778744f9a3471a70c81");
219
220 assertEquals(b2_txt, db.resolve("b:b/b2.txt"));
221 assertEquals(b_root, db.resolve("b:"));
222 assertEquals(id("6020a3b8d5d636e549ccbd0c53e2764684bb3125"),
223 db.resolve("master:"));
224 assertEquals(id("10da5895682013006950e7da534b705252b03be6"),
225 db.resolve("master:b/b2.txt"));
226 assertEquals(master_txt, db.resolve(":master.txt"));
227 assertEquals(b3_b2_txt, db.resolve("b~3:b/b2.txt"));
228
229 assertNull("no FOO", db.resolve("b:FOO"));
230 assertNull("no b/FOO", db.resolve("b:b/FOO"));
231 assertNull("no b/FOO", db.resolve(":b/FOO"));
232 assertNull("no not-a-branch:", db.resolve("not-a-branch:"));
233 }
234
235 @Test
236 public void resolveExprSimple() throws Exception {
237 try (Git git = new Git(db)) {
238 writeTrashFile("file.txt", "content");
239 git.add().addFilepattern("file.txt").call();
240 git.commit().setMessage("create file").call();
241 assertEquals("master", db.simplify("master"));
242 assertEquals("refs/heads/master", db.simplify("refs/heads/master"));
243 assertEquals("HEAD", db.simplify("HEAD"));
244 }
245 }
246
247 @Test
248 public void resolveUpstream() throws Exception {
249 try (Git git = new Git(db)) {
250 writeTrashFile("file.txt", "content");
251 git.add().addFilepattern("file.txt").call();
252 RevCommit c1 = git.commit().setMessage("create file").call();
253 writeTrashFile("file2.txt", "content");
254 RefUpdate updateRemoteRef = db.updateRef("refs/remotes/origin/main");
255 updateRemoteRef.setNewObjectId(c1);
256 updateRemoteRef.update();
257 db.getConfig().setString("branch", "master", "remote", "origin");
258 db.getConfig()
259 .setString("branch", "master", "merge", "refs/heads/main");
260 db.getConfig().setString("remote", "origin", "url",
261 "git://example.com/here");
262 db.getConfig().setString("remote", "origin", "fetch",
263 "+refs/heads/*:refs/remotes/origin/*");
264 git.add().addFilepattern("file2.txt").call();
265 git.commit().setMessage("create file").call();
266 assertEquals("refs/remotes/origin/main", db.simplify("@{upstream}"));
267 }
268 }
269
270 @Test
271 public void invalidNames() throws AmbiguousObjectException, IOException {
272 assertTrue(Repository.isValidRefName("x/a"));
273 assertTrue(Repository.isValidRefName("x/a.b"));
274 assertTrue(Repository.isValidRefName("x/a@b"));
275 assertTrue(Repository.isValidRefName("x/a@b{x}"));
276 assertTrue(Repository.isValidRefName("x/a/b"));
277 assertTrue(Repository.isValidRefName("x/a]b"));
278 assertTrue(Repository.isValidRefName("x/\u00a0"));
279
280 assertFalse(Repository.isValidRefName("x/.a"));
281 assertFalse(Repository.isValidRefName("x/a."));
282 assertFalse(Repository.isValidRefName("x/a..b"));
283 assertFalse(Repository.isValidRefName("x//a"));
284 assertFalse(Repository.isValidRefName("x/a/"));
285 assertFalse(Repository.isValidRefName("x/a//b"));
286 assertFalse(Repository.isValidRefName("x/a[b"));
287 assertFalse(Repository.isValidRefName("x/a^b"));
288 assertFalse(Repository.isValidRefName("x/a*b"));
289 assertFalse(Repository.isValidRefName("x/a?b"));
290 assertFalse(Repository.isValidRefName("x/a~1"));
291 assertFalse(Repository.isValidRefName("x/a\\b"));
292 assertFalse(Repository.isValidRefName("x/a\u0000"));
293
294 db.resolve("x/a@");
295
296 assertUnparseable(".");
297 assertUnparseable("x@{3");
298 assertUnparseable("x[b");
299 assertUnparseable("x y");
300 assertUnparseable("x.");
301 assertUnparseable(".x");
302 assertUnparseable("a..b");
303 assertUnparseable("x\\b");
304 assertUnparseable("a~b");
305 assertUnparseable("a^b");
306 assertUnparseable("a\u0000");
307 }
308
309 private void assertUnparseable(String s) throws AmbiguousObjectException,
310 IOException {
311 try {
312 db.resolve(s);
313 fail("'" + s + "' should be unparseable");
314 } catch (RevisionSyntaxException e) {
315
316 }
317 }
318
319 private static ObjectId id(String name) {
320 return ObjectId.fromString(name);
321 }
322 }