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.

ReflogResolveTest.java 6.1KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182
  1. /*
  2. * Copyright (C) 2011, GitHub 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.lib;
  44. import static org.junit.Assert.assertEquals;
  45. import static org.junit.Assert.assertNotNull;
  46. import static org.junit.Assert.assertNull;
  47. import static org.junit.Assert.fail;
  48. import org.eclipse.jgit.api.Git;
  49. import org.eclipse.jgit.errors.RevisionSyntaxException;
  50. import org.eclipse.jgit.junit.RepositoryTestCase;
  51. import org.eclipse.jgit.revwalk.RevCommit;
  52. import org.junit.Test;
  53. /**
  54. * Unit tests for resolving reflog-based revisions
  55. */
  56. public class ReflogResolveTest extends RepositoryTestCase {
  57. @Test
  58. public void resolveMasterCommits() throws Exception {
  59. try (Git git = new Git(db)) {
  60. writeTrashFile("file.txt", "content");
  61. git.add().addFilepattern("file.txt").call();
  62. RevCommit c1 = git.commit().setMessage("create file").call();
  63. writeTrashFile("file.txt", "content2");
  64. git.add().addFilepattern("file.txt").call();
  65. RevCommit c2 = git.commit().setMessage("edit file").call();
  66. assertEquals(c2, db.resolve("master@{0}"));
  67. assertEquals(c1, db.resolve("master@{1}"));
  68. }
  69. }
  70. @Test
  71. public void resolveUnnamedCurrentBranchCommits() throws Exception {
  72. try (Git git = new Git(db)) {
  73. writeTrashFile("file.txt", "content");
  74. git.add().addFilepattern("file.txt").call();
  75. RevCommit c1 = git.commit().setMessage("create file").call();
  76. writeTrashFile("file.txt", "content2");
  77. git.add().addFilepattern("file.txt").call();
  78. RevCommit c2 = git.commit().setMessage("edit file").call();
  79. assertEquals(c2, db.resolve("master@{0}"));
  80. assertEquals(c1, db.resolve("master@{1}"));
  81. git.checkout().setCreateBranch(true).setName("newbranch")
  82. .setStartPoint(c1).call();
  83. // same as current branch, e.g. master
  84. assertEquals(c1, db.resolve("@{0}"));
  85. try {
  86. assertEquals(c1, db.resolve("@{1}"));
  87. fail(); // Looking at wrong ref, e.g HEAD
  88. } catch (RevisionSyntaxException e) {
  89. assertNotNull(e);
  90. }
  91. // detached head, read HEAD reflog
  92. git.checkout().setName(c2.getName()).call();
  93. assertEquals(c2, db.resolve("@{0}"));
  94. assertEquals(c1, db.resolve("@{1}"));
  95. assertEquals(c2, db.resolve("@{2}"));
  96. }
  97. }
  98. @Test
  99. public void resolveReflogParent() throws Exception {
  100. try (Git git = new Git(db)) {
  101. writeTrashFile("file.txt", "content");
  102. git.add().addFilepattern("file.txt").call();
  103. RevCommit c1 = git.commit().setMessage("create file").call();
  104. writeTrashFile("file.txt", "content2");
  105. git.add().addFilepattern("file.txt").call();
  106. git.commit().setMessage("edit file").call();
  107. assertEquals(c1, db.resolve("master@{0}~1"));
  108. }
  109. }
  110. @Test
  111. public void resolveNonExistingBranch() throws Exception {
  112. try (Git git = new Git(db)) {
  113. writeTrashFile("file.txt", "content");
  114. git.add().addFilepattern("file.txt").call();
  115. git.commit().setMessage("create file").call();
  116. assertNull(db.resolve("notabranch@{7}"));
  117. }
  118. }
  119. @Test
  120. public void resolvePreviousBranch() throws Exception {
  121. try (Git git = new Git(db)) {
  122. writeTrashFile("file.txt", "content");
  123. git.add().addFilepattern("file.txt").call();
  124. RevCommit c1 = git.commit().setMessage("create file").call();
  125. writeTrashFile("file.txt", "content2");
  126. git.add().addFilepattern("file.txt").call();
  127. RevCommit c2 = git.commit().setMessage("edit file").call();
  128. git.checkout().setCreateBranch(true).setName("newbranch")
  129. .setStartPoint(c1).call();
  130. git.checkout().setName(c1.getName()).call();
  131. git.checkout().setName("master").call();
  132. assertEquals(c1.getName(), db.simplify("@{-1}"));
  133. assertEquals("newbranch", db.simplify("@{-2}"));
  134. assertEquals("master", db.simplify("@{-3}"));
  135. // chained expression
  136. try {
  137. // Cannot refer to reflog of detached head
  138. db.resolve("@{-1}@{0}");
  139. fail();
  140. } catch (RevisionSyntaxException e) {
  141. // good
  142. }
  143. assertEquals(c1.getName(), db.resolve("@{-2}@{0}").getName());
  144. assertEquals(c2.getName(), db.resolve("@{-3}@{0}").getName());
  145. }
  146. }
  147. @Test
  148. public void resolveDate() throws Exception {
  149. try (Git git = new Git(db)) {
  150. writeTrashFile("file.txt", "content");
  151. git.add().addFilepattern("file.txt").call();
  152. git.commit().setMessage("create file").call();
  153. try {
  154. db.resolve("master@{yesterday}");
  155. fail("Exception not thrown");
  156. } catch (RevisionSyntaxException e) {
  157. assertNotNull(e);
  158. }
  159. }
  160. }
  161. }