You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

TestRepositoryTest.java 14KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423
  1. /*
  2. * Copyright (C) 2015, Google Inc.
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. */
  43. package org.eclipse.jgit.junit;
  44. import static java.nio.charset.StandardCharsets.UTF_8;
  45. import static org.junit.Assert.assertEquals;
  46. import static org.junit.Assert.assertFalse;
  47. import static org.junit.Assert.assertNotEquals;
  48. import static org.junit.Assert.assertNull;
  49. import static org.junit.Assert.assertSame;
  50. import static org.junit.Assert.assertTrue;
  51. import java.util.Date;
  52. import java.util.regex.Pattern;
  53. import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
  54. import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
  55. import org.eclipse.jgit.lib.AnyObjectId;
  56. import org.eclipse.jgit.lib.Constants;
  57. import org.eclipse.jgit.lib.ObjectId;
  58. import org.eclipse.jgit.lib.ObjectLoader;
  59. import org.eclipse.jgit.lib.PersonIdent;
  60. import org.eclipse.jgit.lib.Ref;
  61. import org.eclipse.jgit.lib.RefUpdate;
  62. import org.eclipse.jgit.revwalk.RevBlob;
  63. import org.eclipse.jgit.revwalk.RevCommit;
  64. import org.eclipse.jgit.revwalk.RevObject;
  65. import org.eclipse.jgit.revwalk.RevWalk;
  66. import org.eclipse.jgit.treewalk.TreeWalk;
  67. import org.junit.After;
  68. import org.junit.Before;
  69. import org.junit.Test;
  70. public class TestRepositoryTest {
  71. private TestRepository<InMemoryRepository> tr;
  72. private InMemoryRepository repo;
  73. private RevWalk rw;
  74. @Before
  75. public void setUp() throws Exception {
  76. tr = new TestRepository<>(new InMemoryRepository(
  77. new DfsRepositoryDescription("test")));
  78. repo = tr.getRepository();
  79. rw = tr.getRevWalk();
  80. }
  81. @After
  82. public void tearDown() {
  83. rw.close();
  84. repo.close();
  85. }
  86. @Test
  87. public void insertChangeId() throws Exception {
  88. RevCommit c1 = tr.commit().message("message").insertChangeId().create();
  89. rw.parseBody(c1);
  90. assertTrue(Pattern.matches(
  91. "^message\n\nChange-Id: I[0-9a-f]{40}\n$", c1.getFullMessage()));
  92. RevCommit c2 = tr.commit().message("").insertChangeId().create();
  93. rw.parseBody(c2);
  94. assertEquals("\n\nChange-Id: I0000000000000000000000000000000000000000\n",
  95. c2.getFullMessage());
  96. }
  97. @Test
  98. public void insertChangeIdIgnoresExisting() throws Exception {
  99. String msg = "message\n"
  100. + "\n"
  101. + "Change-Id: Ideadbeefdeadbeefdeadbeefdeadbeefdeadbeef\n";
  102. RevCommit c = tr.commit().message(msg).insertChangeId().create();
  103. rw.parseBody(c);
  104. assertEquals(msg, c.getFullMessage());
  105. }
  106. @Test
  107. public void insertExplicitChangeId() throws Exception {
  108. RevCommit c = tr.commit().message("message")
  109. .insertChangeId("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")
  110. .create();
  111. rw.parseBody(c);
  112. assertEquals("message\n\n"
  113. + "Change-Id: Ideadbeefdeadbeefdeadbeefdeadbeefdeadbeef\n"
  114. , c.getFullMessage());
  115. }
  116. @Test
  117. public void resetFromSymref() throws Exception {
  118. repo.updateRef("HEAD").link("refs/heads/master");
  119. Ref head = repo.exactRef("HEAD");
  120. RevCommit master = tr.branch("master").commit().create();
  121. RevCommit branch = tr.branch("branch").commit().create();
  122. RevCommit detached = tr.commit().create();
  123. assertTrue(head.isSymbolic());
  124. assertEquals("refs/heads/master", head.getTarget().getName());
  125. assertEquals(master, repo.exactRef("refs/heads/master").getObjectId());
  126. assertEquals(branch, repo.exactRef("refs/heads/branch").getObjectId());
  127. // Reset to branches preserves symref.
  128. tr.reset("master");
  129. head = repo.exactRef("HEAD");
  130. assertEquals(master, head.getObjectId());
  131. assertTrue(head.isSymbolic());
  132. assertEquals("refs/heads/master", head.getTarget().getName());
  133. tr.reset("branch");
  134. head = repo.exactRef("HEAD");
  135. assertEquals(branch, head.getObjectId());
  136. assertTrue(head.isSymbolic());
  137. assertEquals("refs/heads/master", head.getTarget().getName());
  138. ObjectId lastHeadBeforeDetach = head.getObjectId().copy();
  139. // Reset to a SHA-1 detaches.
  140. tr.reset(detached);
  141. head = repo.exactRef("HEAD");
  142. assertEquals(detached, head.getObjectId());
  143. assertFalse(head.isSymbolic());
  144. tr.reset(detached.name());
  145. head = repo.exactRef("HEAD");
  146. assertEquals(detached, head.getObjectId());
  147. assertFalse(head.isSymbolic());
  148. // Reset back to a branch remains detached.
  149. tr.reset("master");
  150. head = repo.exactRef("HEAD");
  151. assertEquals(lastHeadBeforeDetach, head.getObjectId());
  152. assertFalse(head.isSymbolic());
  153. }
  154. @Test
  155. public void resetFromDetachedHead() throws Exception {
  156. Ref head = repo.exactRef("HEAD");
  157. RevCommit master = tr.branch("master").commit().create();
  158. RevCommit branch = tr.branch("branch").commit().create();
  159. RevCommit detached = tr.commit().create();
  160. assertNull(head);
  161. assertEquals(master, repo.exactRef("refs/heads/master").getObjectId());
  162. assertEquals(branch, repo.exactRef("refs/heads/branch").getObjectId());
  163. tr.reset("master");
  164. head = repo.exactRef("HEAD");
  165. assertEquals(master, head.getObjectId());
  166. assertFalse(head.isSymbolic());
  167. tr.reset("branch");
  168. head = repo.exactRef("HEAD");
  169. assertEquals(branch, head.getObjectId());
  170. assertFalse(head.isSymbolic());
  171. tr.reset(detached);
  172. head = repo.exactRef("HEAD");
  173. assertEquals(detached, head.getObjectId());
  174. assertFalse(head.isSymbolic());
  175. tr.reset(detached.name());
  176. head = repo.exactRef("HEAD");
  177. assertEquals(detached, head.getObjectId());
  178. assertFalse(head.isSymbolic());
  179. }
  180. @Test
  181. public void amendRef() throws Exception {
  182. RevCommit root = tr.commit()
  183. .add("todelete", "to be deleted")
  184. .create();
  185. RevCommit orig = tr.commit().parent(root)
  186. .rm("todelete")
  187. .add("foo", "foo contents")
  188. .add("bar", "bar contents")
  189. .add("dir/baz", "baz contents")
  190. .create();
  191. rw.parseBody(orig);
  192. tr.branch("master").update(orig);
  193. assertEquals("foo contents", blobAsString(orig, "foo"));
  194. assertEquals("bar contents", blobAsString(orig, "bar"));
  195. assertEquals("baz contents", blobAsString(orig, "dir/baz"));
  196. RevCommit amended = tr.amendRef("master")
  197. .tick(3)
  198. .add("bar", "fixed bar contents")
  199. .create();
  200. assertEquals(amended, repo.exactRef("refs/heads/master").getObjectId());
  201. rw.parseBody(amended);
  202. assertEquals(1, amended.getParentCount());
  203. assertEquals(root, amended.getParent(0));
  204. assertEquals(orig.getFullMessage(), amended.getFullMessage());
  205. assertEquals(orig.getAuthorIdent(), amended.getAuthorIdent());
  206. // Committer name/email is the same, but time was incremented.
  207. assertEquals(new PersonIdent(orig.getCommitterIdent(), new Date(0)),
  208. new PersonIdent(amended.getCommitterIdent(), new Date(0)));
  209. assertTrue(orig.getCommitTime() < amended.getCommitTime());
  210. assertEquals("foo contents", blobAsString(amended, "foo"));
  211. assertEquals("fixed bar contents", blobAsString(amended, "bar"));
  212. assertEquals("baz contents", blobAsString(amended, "dir/baz"));
  213. assertNull(TreeWalk.forPath(repo, "todelete", amended.getTree()));
  214. }
  215. @Test
  216. public void amendHead() throws Exception {
  217. repo.updateRef("HEAD").link("refs/heads/master");
  218. RevCommit root = tr.commit()
  219. .add("foo", "foo contents")
  220. .create();
  221. RevCommit orig = tr.commit().parent(root)
  222. .message("original message")
  223. .add("bar", "bar contents")
  224. .create();
  225. tr.branch("master").update(orig);
  226. RevCommit amended = tr.amendRef("HEAD")
  227. .add("foo", "fixed foo contents")
  228. .create();
  229. Ref head = repo.exactRef(Constants.HEAD);
  230. assertEquals(amended, head.getObjectId());
  231. assertTrue(head.isSymbolic());
  232. assertEquals("refs/heads/master", head.getTarget().getName());
  233. rw.parseBody(amended);
  234. assertEquals("original message", amended.getFullMessage());
  235. assertEquals("fixed foo contents", blobAsString(amended, "foo"));
  236. assertEquals("bar contents", blobAsString(amended, "bar"));
  237. }
  238. @Test
  239. public void amendCommit() throws Exception {
  240. RevCommit root = tr.commit()
  241. .add("foo", "foo contents")
  242. .create();
  243. RevCommit orig = tr.commit().parent(root)
  244. .message("original message")
  245. .add("bar", "bar contents")
  246. .create();
  247. RevCommit amended = tr.amend(orig.copy())
  248. .add("foo", "fixed foo contents")
  249. .create();
  250. rw.parseBody(amended);
  251. assertEquals("original message", amended.getFullMessage());
  252. assertEquals("fixed foo contents", blobAsString(amended, "foo"));
  253. assertEquals("bar contents", blobAsString(amended, "bar"));
  254. }
  255. @Test
  256. public void commitToUnbornHead() throws Exception {
  257. repo.updateRef("HEAD").link("refs/heads/master");
  258. RevCommit root = tr.branch("HEAD").commit().create();
  259. Ref ref = repo.exactRef(Constants.HEAD);
  260. assertEquals(root, ref.getObjectId());
  261. assertTrue(ref.isSymbolic());
  262. assertEquals("refs/heads/master", ref.getTarget().getName());
  263. }
  264. @Test
  265. public void cherryPick() throws Exception {
  266. repo.updateRef("HEAD").link("refs/heads/master");
  267. RevCommit head = tr.branch("master").commit()
  268. .add("foo", "foo contents\n")
  269. .create();
  270. rw.parseBody(head);
  271. RevCommit toPick = tr.commit()
  272. .parent(tr.commit().create()) // Can't cherry-pick root.
  273. .author(new PersonIdent("Cherrypick Author", "cpa@example.com",
  274. tr.getDate(), tr.getTimeZone()))
  275. .author(new PersonIdent("Cherrypick Committer", "cpc@example.com",
  276. tr.getDate(), tr.getTimeZone()))
  277. .message("message to cherry-pick")
  278. .add("bar", "bar contents\n")
  279. .create();
  280. RevCommit result = tr.cherryPick(toPick);
  281. rw.parseBody(result);
  282. Ref headRef = tr.getRepository().exactRef("HEAD");
  283. assertEquals(result, headRef.getObjectId());
  284. assertTrue(headRef.isSymbolic());
  285. assertEquals("refs/heads/master", headRef.getLeaf().getName());
  286. assertEquals(1, result.getParentCount());
  287. assertEquals(head, result.getParent(0));
  288. assertEquals(toPick.getAuthorIdent(), result.getAuthorIdent());
  289. // Committer name/email matches default, and time was incremented.
  290. assertEquals(new PersonIdent(head.getCommitterIdent(), new Date(0)),
  291. new PersonIdent(result.getCommitterIdent(), new Date(0)));
  292. assertTrue(toPick.getCommitTime() < result.getCommitTime());
  293. assertEquals("message to cherry-pick", result.getFullMessage());
  294. assertEquals("foo contents\n", blobAsString(result, "foo"));
  295. assertEquals("bar contents\n", blobAsString(result, "bar"));
  296. }
  297. @Test
  298. public void cherryPickWithContentMerge() throws Exception {
  299. RevCommit base = tr.branch("HEAD").commit()
  300. .add("foo", "foo contents\n\n")
  301. .create();
  302. tr.branch("HEAD").commit()
  303. .add("foo", "foo contents\n\nlast line\n")
  304. .create();
  305. RevCommit toPick = tr.commit()
  306. .message("message to cherry-pick")
  307. .parent(base)
  308. .add("foo", "changed foo contents\n\n")
  309. .create();
  310. RevCommit result = tr.cherryPick(toPick);
  311. rw.parseBody(result);
  312. assertEquals("message to cherry-pick", result.getFullMessage());
  313. assertEquals("changed foo contents\n\nlast line\n",
  314. blobAsString(result, "foo"));
  315. }
  316. @Test
  317. public void cherryPickWithIdenticalContents() throws Exception {
  318. RevCommit base = tr.branch("HEAD").commit().add("foo", "foo contents\n")
  319. .create();
  320. RevCommit head = tr.branch("HEAD").commit()
  321. .parent(base)
  322. .add("bar", "bar contents\n")
  323. .create();
  324. RevCommit toPick = tr.commit()
  325. .parent(base)
  326. .message("message to cherry-pick")
  327. .add("bar", "bar contents\n")
  328. .create();
  329. assertNotEquals(head, toPick);
  330. assertNull(tr.cherryPick(toPick));
  331. assertEquals(head, repo.exactRef("HEAD").getObjectId());
  332. }
  333. @Test
  334. public void reattachToMaster_Race() throws Exception {
  335. RevCommit commit = tr.branch("master").commit().create();
  336. tr.branch("master").update(commit);
  337. tr.branch("other").update(commit);
  338. repo.updateRef("HEAD").link("refs/heads/master");
  339. // Create a detached HEAD that is not an .
  340. tr.reset(commit);
  341. Ref head = repo.exactRef("HEAD");
  342. assertEquals(commit, head.getObjectId());
  343. assertFalse(head.isSymbolic());
  344. // Try to reattach to master.
  345. RefUpdate refUpdate = repo.updateRef("HEAD");
  346. // Make a change during reattachment.
  347. repo.updateRef("HEAD").link("refs/heads/other");
  348. assertEquals(
  349. RefUpdate.Result.LOCK_FAILURE, refUpdate.link("refs/heads/master"));
  350. }
  351. @Test
  352. public void nonRacingChange() throws Exception {
  353. tr.branch("master").update(tr.branch("master").commit().create());
  354. tr.branch("other").update(tr.branch("other").commit().create());
  355. repo.updateRef("HEAD").link("refs/heads/master");
  356. // Try to update HEAD.
  357. RefUpdate refUpdate = repo.updateRef("HEAD");
  358. // Proceed a master. This should not affect changing HEAD.
  359. tr.branch("master").update(tr.branch("master").commit().create());
  360. assertEquals(RefUpdate.Result.FORCED, refUpdate.link("refs/heads/other"));
  361. }
  362. private String blobAsString(AnyObjectId treeish, String path)
  363. throws Exception {
  364. RevObject obj = tr.get(rw.parseTree(treeish), path);
  365. assertSame(RevBlob.class, obj.getClass());
  366. ObjectLoader loader = rw.getObjectReader().open(obj);
  367. return new String(loader.getCachedBytes(), UTF_8);
  368. }
  369. }