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.

WorkDirCheckoutTest.java 5.2KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133
  1. /*
  2. * Copyright (C) 2007, Dave Watson <dwatson@mimvista.com>
  3. * Copyright (C) 2006, Shawn O. Pearce <spearce@spearce.org>
  4. * and other copyright owners as documented in the project's IP log.
  5. *
  6. * This program and the accompanying materials are made available
  7. * under the terms of the Eclipse Distribution License v1.0 which
  8. * accompanies this distribution, is reproduced below, and is
  9. * available at http://www.eclipse.org/org/documents/edl-v10.php
  10. *
  11. * All rights reserved.
  12. *
  13. * Redistribution and use in source and binary forms, with or
  14. * without modification, are permitted provided that the following
  15. * conditions are met:
  16. *
  17. * - Redistributions of source code must retain the above copyright
  18. * notice, this list of conditions and the following disclaimer.
  19. *
  20. * - Redistributions in binary form must reproduce the above
  21. * copyright notice, this list of conditions and the following
  22. * disclaimer in the documentation and/or other materials provided
  23. * with the distribution.
  24. *
  25. * - Neither the name of the Eclipse Foundation, Inc. nor the
  26. * names of its contributors may be used to endorse or promote
  27. * products derived from this software without specific prior
  28. * written permission.
  29. *
  30. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  31. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  32. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  33. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  34. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  35. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  36. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  37. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  38. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  39. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  40. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  41. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  42. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  43. */
  44. package org.eclipse.jgit.lib;
  45. import java.io.File;
  46. import java.io.IOException;
  47. import java.util.ArrayList;
  48. import org.eclipse.jgit.errors.CheckoutConflictException;
  49. public class WorkDirCheckoutTest extends RepositoryTestCase {
  50. public void testFindingConflicts() throws IOException {
  51. GitIndex index = new GitIndex(db);
  52. index.add(trash, writeTrashFile("bar", "bar"));
  53. index.add(trash, writeTrashFile("foo/bar/baz/qux", "foo/bar"));
  54. recursiveDelete(new File(trash, "bar"));
  55. recursiveDelete(new File(trash, "foo"));
  56. writeTrashFile("bar/baz/qux/foo", "another nasty one");
  57. writeTrashFile("foo", "troublesome little bugger");
  58. WorkDirCheckout workDirCheckout = new WorkDirCheckout(db, trash, index,
  59. index);
  60. workDirCheckout.prescanOneTree();
  61. ArrayList<String> conflictingEntries = workDirCheckout
  62. .getConflicts();
  63. ArrayList<String> removedEntries = workDirCheckout.getRemoved();
  64. assertEquals("bar/baz/qux/foo", conflictingEntries.get(0));
  65. assertEquals("foo", conflictingEntries.get(1));
  66. GitIndex index2 = new GitIndex(db);
  67. recursiveDelete(new File(trash, "bar"));
  68. recursiveDelete(new File(trash, "foo"));
  69. index2.add(trash, writeTrashFile("bar/baz/qux/foo", "bar"));
  70. index2.add(trash, writeTrashFile("foo", "lalala"));
  71. workDirCheckout = new WorkDirCheckout(db, trash, index2, index);
  72. workDirCheckout.prescanOneTree();
  73. conflictingEntries = workDirCheckout.getConflicts();
  74. removedEntries = workDirCheckout.getRemoved();
  75. assertTrue(conflictingEntries.isEmpty());
  76. assertTrue(removedEntries.contains("bar/baz/qux/foo"));
  77. assertTrue(removedEntries.contains("foo"));
  78. }
  79. public void testCheckingOutWithConflicts() throws IOException {
  80. GitIndex index = new GitIndex(db);
  81. index.add(trash, writeTrashFile("bar", "bar"));
  82. index.add(trash, writeTrashFile("foo/bar/baz/qux", "foo/bar"));
  83. recursiveDelete(new File(trash, "bar"));
  84. recursiveDelete(new File(trash, "foo"));
  85. writeTrashFile("bar/baz/qux/foo", "another nasty one");
  86. writeTrashFile("foo", "troublesome little bugger");
  87. try {
  88. WorkDirCheckout workDirCheckout = new WorkDirCheckout(db, trash,
  89. index, index);
  90. workDirCheckout.checkout();
  91. fail("Should have thrown exception");
  92. } catch (CheckoutConflictException e) {
  93. // all is well
  94. }
  95. WorkDirCheckout workDirCheckout = new WorkDirCheckout(db, trash, index,
  96. index);
  97. workDirCheckout.setFailOnConflict(false);
  98. workDirCheckout.checkout();
  99. assertTrue(new File(trash, "bar").isFile());
  100. assertTrue(new File(trash, "foo/bar/baz/qux").isFile());
  101. GitIndex index2 = new GitIndex(db);
  102. recursiveDelete(new File(trash, "bar"));
  103. recursiveDelete(new File(trash, "foo"));
  104. index2.add(trash, writeTrashFile("bar/baz/qux/foo", "bar"));
  105. writeTrashFile("bar/baz/qux/bar", "evil? I thought it said WEEVIL!");
  106. index2.add(trash, writeTrashFile("foo", "lalala"));
  107. workDirCheckout = new WorkDirCheckout(db, trash, index2, index);
  108. workDirCheckout.setFailOnConflict(false);
  109. workDirCheckout.checkout();
  110. assertTrue(new File(trash, "bar").isFile());
  111. assertTrue(new File(trash, "foo/bar/baz/qux").isFile());
  112. assertNotNull(index2.getEntry("bar"));
  113. assertNotNull(index2.getEntry("foo/bar/baz/qux"));
  114. assertNull(index2.getEntry("bar/baz/qux/foo"));
  115. assertNull(index2.getEntry("foo"));
  116. }
  117. }