Du kannst nicht mehr als 25 Themen auswählen Themen müssen mit entweder einem Buchstaben oder einer Ziffer beginnen. Sie können Bindestriche („-“) enthalten und bis zu 35 Zeichen lang sein.

RepositoryResolveTest.java 15KB

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