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.

NameConflictTreeWalkTest.java 8.6KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256
  1. /*
  2. * Copyright (C) 2008, 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.treewalk;
  44. import static org.junit.Assert.assertEquals;
  45. import static org.junit.Assert.assertFalse;
  46. import static org.junit.Assert.assertTrue;
  47. import org.eclipse.jgit.dircache.DirCache;
  48. import org.eclipse.jgit.dircache.DirCacheBuilder;
  49. import org.eclipse.jgit.dircache.DirCacheIterator;
  50. import org.eclipse.jgit.junit.RepositoryTestCase;
  51. import org.eclipse.jgit.lib.FileMode;
  52. import org.junit.Test;
  53. public class NameConflictTreeWalkTest extends RepositoryTestCase {
  54. private static final FileMode TREE = FileMode.TREE;
  55. private static final FileMode SYMLINK = FileMode.SYMLINK;
  56. private static final FileMode MISSING = FileMode.MISSING;
  57. private static final FileMode REGULAR_FILE = FileMode.REGULAR_FILE;
  58. private static final FileMode EXECUTABLE_FILE = FileMode.EXECUTABLE_FILE;
  59. @Test
  60. public void testNoDF_NoGap() throws Exception {
  61. final DirCache tree0 = db.readDirCache();
  62. final DirCache tree1 = db.readDirCache();
  63. {
  64. final DirCacheBuilder b0 = tree0.builder();
  65. final DirCacheBuilder b1 = tree1.builder();
  66. b0.add(createEntry("a", REGULAR_FILE));
  67. b0.add(createEntry("a.b", EXECUTABLE_FILE));
  68. b1.add(createEntry("a/b", REGULAR_FILE));
  69. b0.add(createEntry("a0b", SYMLINK));
  70. b0.finish();
  71. b1.finish();
  72. assertEquals(3, tree0.getEntryCount());
  73. assertEquals(1, tree1.getEntryCount());
  74. }
  75. final TreeWalk tw = new TreeWalk(db);
  76. tw.addTree(new DirCacheIterator(tree0));
  77. tw.addTree(new DirCacheIterator(tree1));
  78. assertModes("a", REGULAR_FILE, MISSING, tw);
  79. assertModes("a.b", EXECUTABLE_FILE, MISSING, tw);
  80. assertModes("a", MISSING, TREE, tw);
  81. tw.enterSubtree();
  82. assertModes("a/b", MISSING, REGULAR_FILE, tw);
  83. assertModes("a0b", SYMLINK, MISSING, tw);
  84. }
  85. @Test
  86. public void testDF_NoGap() throws Exception {
  87. final DirCache tree0 = db.readDirCache();
  88. final DirCache tree1 = db.readDirCache();
  89. {
  90. final DirCacheBuilder b0 = tree0.builder();
  91. final DirCacheBuilder b1 = tree1.builder();
  92. b0.add(createEntry("a", REGULAR_FILE));
  93. b0.add(createEntry("a.b", EXECUTABLE_FILE));
  94. b1.add(createEntry("a/b", REGULAR_FILE));
  95. b0.add(createEntry("a0b", SYMLINK));
  96. b0.finish();
  97. b1.finish();
  98. assertEquals(3, tree0.getEntryCount());
  99. assertEquals(1, tree1.getEntryCount());
  100. }
  101. final NameConflictTreeWalk tw = new NameConflictTreeWalk(db);
  102. tw.addTree(new DirCacheIterator(tree0));
  103. tw.addTree(new DirCacheIterator(tree1));
  104. assertModes("a", REGULAR_FILE, TREE, tw);
  105. assertTrue(tw.isDirectoryFileConflict());
  106. assertTrue(tw.isSubtree());
  107. tw.enterSubtree();
  108. assertModes("a/b", MISSING, REGULAR_FILE, tw);
  109. assertTrue(tw.isDirectoryFileConflict());
  110. assertModes("a.b", EXECUTABLE_FILE, MISSING, tw);
  111. assertFalse(tw.isDirectoryFileConflict());
  112. assertModes("a0b", SYMLINK, MISSING, tw);
  113. assertFalse(tw.isDirectoryFileConflict());
  114. }
  115. @Test
  116. public void testDF_GapByOne() throws Exception {
  117. final DirCache tree0 = db.readDirCache();
  118. final DirCache tree1 = db.readDirCache();
  119. {
  120. final DirCacheBuilder b0 = tree0.builder();
  121. final DirCacheBuilder b1 = tree1.builder();
  122. b0.add(createEntry("a", REGULAR_FILE));
  123. b0.add(createEntry("a.b", EXECUTABLE_FILE));
  124. b1.add(createEntry("a.b", EXECUTABLE_FILE));
  125. b1.add(createEntry("a/b", REGULAR_FILE));
  126. b0.add(createEntry("a0b", SYMLINK));
  127. b0.finish();
  128. b1.finish();
  129. assertEquals(3, tree0.getEntryCount());
  130. assertEquals(2, tree1.getEntryCount());
  131. }
  132. final NameConflictTreeWalk tw = new NameConflictTreeWalk(db);
  133. tw.addTree(new DirCacheIterator(tree0));
  134. tw.addTree(new DirCacheIterator(tree1));
  135. assertModes("a", REGULAR_FILE, TREE, tw);
  136. assertTrue(tw.isSubtree());
  137. assertTrue(tw.isDirectoryFileConflict());
  138. tw.enterSubtree();
  139. assertModes("a/b", MISSING, REGULAR_FILE, tw);
  140. assertTrue(tw.isDirectoryFileConflict());
  141. assertModes("a.b", EXECUTABLE_FILE, EXECUTABLE_FILE, tw);
  142. assertFalse(tw.isDirectoryFileConflict());
  143. assertModes("a0b", SYMLINK, MISSING, tw);
  144. assertFalse(tw.isDirectoryFileConflict());
  145. }
  146. @Test
  147. public void testDF_SkipsSeenSubtree() throws Exception {
  148. final DirCache tree0 = db.readDirCache();
  149. final DirCache tree1 = db.readDirCache();
  150. {
  151. final DirCacheBuilder b0 = tree0.builder();
  152. final DirCacheBuilder b1 = tree1.builder();
  153. b0.add(createEntry("a", REGULAR_FILE));
  154. b1.add(createEntry("a.b", EXECUTABLE_FILE));
  155. b1.add(createEntry("a/b", REGULAR_FILE));
  156. b0.add(createEntry("a0b", SYMLINK));
  157. b1.add(createEntry("a0b", SYMLINK));
  158. b0.finish();
  159. b1.finish();
  160. assertEquals(2, tree0.getEntryCount());
  161. assertEquals(3, tree1.getEntryCount());
  162. }
  163. final NameConflictTreeWalk tw = new NameConflictTreeWalk(db);
  164. tw.addTree(new DirCacheIterator(tree0));
  165. tw.addTree(new DirCacheIterator(tree1));
  166. assertModes("a", REGULAR_FILE, TREE, tw);
  167. assertTrue(tw.isSubtree());
  168. assertTrue(tw.isDirectoryFileConflict());
  169. tw.enterSubtree();
  170. assertModes("a/b", MISSING, REGULAR_FILE, tw);
  171. assertTrue(tw.isDirectoryFileConflict());
  172. assertModes("a.b", MISSING, EXECUTABLE_FILE, tw);
  173. assertFalse(tw.isDirectoryFileConflict());
  174. assertModes("a0b", SYMLINK, SYMLINK, tw);
  175. assertFalse(tw.isDirectoryFileConflict());
  176. }
  177. @Test
  178. public void testDF_DetectConflict() throws Exception {
  179. final DirCache tree0 = db.readDirCache();
  180. final DirCache tree1 = db.readDirCache();
  181. {
  182. final DirCacheBuilder b0 = tree0.builder();
  183. final DirCacheBuilder b1 = tree1.builder();
  184. b0.add(createEntry("0", REGULAR_FILE));
  185. b0.add(createEntry("a", REGULAR_FILE));
  186. b1.add(createEntry("0", REGULAR_FILE));
  187. b1.add(createEntry("a.b", REGULAR_FILE));
  188. b1.add(createEntry("a/b", REGULAR_FILE));
  189. b1.add(createEntry("a/c/e", REGULAR_FILE));
  190. b0.finish();
  191. b1.finish();
  192. assertEquals(2, tree0.getEntryCount());
  193. assertEquals(4, tree1.getEntryCount());
  194. }
  195. final NameConflictTreeWalk tw = new NameConflictTreeWalk(db);
  196. tw.addTree(new DirCacheIterator(tree0));
  197. tw.addTree(new DirCacheIterator(tree1));
  198. assertModes("0", REGULAR_FILE, REGULAR_FILE, tw);
  199. assertFalse(tw.isDirectoryFileConflict());
  200. assertModes("a", REGULAR_FILE, TREE, tw);
  201. assertTrue(tw.isSubtree());
  202. assertTrue(tw.isDirectoryFileConflict());
  203. tw.enterSubtree();
  204. assertModes("a/b", MISSING, REGULAR_FILE, tw);
  205. assertTrue(tw.isDirectoryFileConflict());
  206. assertModes("a/c", MISSING, TREE, tw);
  207. assertTrue(tw.isDirectoryFileConflict());
  208. tw.enterSubtree();
  209. assertModes("a/c/e", MISSING, REGULAR_FILE, tw);
  210. assertTrue(tw.isDirectoryFileConflict());
  211. assertModes("a.b", MISSING, REGULAR_FILE, tw);
  212. assertFalse(tw.isDirectoryFileConflict());
  213. }
  214. private static void assertModes(final String path, final FileMode mode0,
  215. final FileMode mode1, final TreeWalk tw) throws Exception {
  216. assertTrue("has " + path, tw.next());
  217. assertEquals(path, tw.getPathString());
  218. assertEquals(mode0, tw.getFileMode(0));
  219. assertEquals(mode1, tw.getFileMode(1));
  220. }
  221. }