bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
1 |
# Copyright (C) 2006, 2007 Canonical Ltd
|
2 |
#
|
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Tests for interface conformance of 'WorkingTree.remove'"""
|
|
18 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
19 |
import re |
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
20 |
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
21 |
from bzrlib import errors, osutils |
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
22 |
|
23 |
class TestRemove(TestCaseWithWorkingTree): |
|
24 |
"""Tests WorkingTree.remove""" |
|
25 |
||
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
26 |
files=['a', 'b/', 'b/c', 'd/'] |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
27 |
a = ['a'] |
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
28 |
b = ['b'] |
|
2292.1.24
by Marius Kruger
minor text cleanups |
29 |
b_c = ['b', 'b/c'] |
30 |
||
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
31 |
def getTree(self): |
32 |
tree = self.make_branch_and_tree('.') |
|
33 |
self.build_tree(TestRemove.files) |
|
34 |
return tree |
|
35 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
36 |
def test_remove_keep(self): |
37 |
"""Check that files are unversioned but not deleted.""" |
|
38 |
tree = self.getTree() |
|
39 |
tree.add(TestRemove.files) |
|
40 |
self.assertInWorkingTree(TestRemove.files) |
|
41 |
||
42 |
tree.remove(TestRemove.files) |
|
43 |
self.assertNotInWorkingTree(TestRemove.files) |
|
44 |
self.failUnlessExists(TestRemove.files) |
|
45 |
||
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
46 |
def test_remove_unchanged_files(self): |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
47 |
"""Check that unchanged files are removed and deleted.""" |
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
48 |
tree = self.getTree() |
49 |
tree.add(TestRemove.files) |
|
50 |
tree.commit("files must not have changes") |
|
51 |
self.assertInWorkingTree(TestRemove.files) |
|
52 |
||
53 |
tree.remove(TestRemove.files, keep_files=False) |
|
54 |
||
55 |
self.assertNotInWorkingTree(TestRemove.files) |
|
56 |
self.failIfExists(TestRemove.files) |
|
57 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
58 |
def test_remove_added_files(self): |
59 |
"""Removal of newly added files must fail.""" |
|
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
60 |
tree = self.getTree() |
61 |
tree.add(TestRemove.files) |
|
62 |
self.assertInWorkingTree(TestRemove.files) |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
63 |
try: |
64 |
tree.remove(TestRemove.files, keep_files=False) |
|
65 |
self.fail('Should throw BzrRemoveChangedFilesError') |
|
66 |
except errors.BzrRemoveChangedFilesError, e: |
|
67 |
self.assertTrue(re.match('Can\'t remove changed or unknown files:' |
|
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
68 |
'.*added:.*a.*b.*b/c.*d.*', |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
69 |
str(e), re.DOTALL)) |
70 |
self.assertInWorkingTree(TestRemove.files) |
|
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
71 |
self.failUnlessExists(TestRemove.files) |
72 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
73 |
def test_remove_changed_file(self): |
74 |
"""Removal of a changed files must fail.""" |
|
75 |
tree = self.getTree() |
|
76 |
tree.add(TestRemove.a) |
|
77 |
tree.commit("make sure a is versioned") |
|
78 |
f = file('a', 'wb') |
|
79 |
f.write("some other new content!") |
|
80 |
f.close() |
|
81 |
self.assertInWorkingTree(TestRemove.a) |
|
82 |
try: |
|
83 |
tree.remove(TestRemove.a, keep_files=False) |
|
84 |
self.fail('Should throw BzrRemoveChangedFilesError') |
|
85 |
except errors.BzrRemoveChangedFilesError, e: |
|
86 |
self.assertTrue(re.match('Can\'t remove changed or unknown files:' |
|
87 |
'.*modified:.*a.*', |
|
88 |
str(e), re.DOTALL)) |
|
89 |
self.assertInWorkingTree(TestRemove.a) |
|
90 |
self.failUnlessExists(TestRemove.a) |
|
91 |
||
92 |
def test_remove_deleted_files(self): |
|
93 |
"""Check that files are removed if they don't exist any more.""" |
|
94 |
tree = self.getTree() |
|
95 |
tree.add(TestRemove.files) |
|
96 |
tree.commit("make sure files are versioned") |
|
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
97 |
for f in ['b/c', 'b', 'a', 'd']: |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
98 |
osutils.delete_any(f) |
99 |
self.assertInWorkingTree(TestRemove.files) |
|
100 |
self.failIfExists(TestRemove.files) |
|
101 |
||
102 |
tree.remove(TestRemove.files, keep_files=False) |
|
103 |
||
104 |
self.assertNotInWorkingTree(TestRemove.files) |
|
105 |
self.failIfExists(TestRemove.files) |
|
106 |
||
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
107 |
def test_force_remove_changed_files(self): |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
108 |
"""Check that changed files are removed and deleted when forced.""" |
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
109 |
tree = self.getTree() |
110 |
tree.add(TestRemove.files) |
|
111 |
self.assertInWorkingTree(TestRemove.files) |
|
112 |
||
113 |
tree.remove(TestRemove.files, keep_files=False, force=True) |
|
114 |
||
115 |
self.assertNotInWorkingTree(TestRemove.files) |
|
116 |
self.failIfExists(TestRemove.files) |
|
117 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
118 |
def test_remove_unknown_files(self): |
119 |
"""Try to delete unknown files.""" |
|
120 |
tree = self.getTree() |
|
121 |
try: |
|
122 |
tree.remove(TestRemove.files, keep_files=False) |
|
123 |
self.fail('Should throw BzrRemoveChangedFilesError') |
|
124 |
except errors.BzrRemoveChangedFilesError, e: |
|
125 |
self.assertTrue(re.match('Can\'t remove changed or unknown files:' |
|
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
126 |
'.*unknown:.*b/c.*b.*a.*d.*', |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
127 |
str(e), re.DOTALL)) |
128 |
||
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
129 |
def test_remove_nonexisting_files(self): |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
130 |
"""Try to delete non-existing files.""" |
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
131 |
tree = self.getTree() |
132 |
tree.remove([''], keep_files=False) |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
133 |
try: |
134 |
tree.remove(['xyz', 'abc/def'], keep_files=False) |
|
135 |
self.fail('Should throw BzrRemoveChangedFilesError') |
|
136 |
except errors.BzrRemoveChangedFilesError, e: |
|
137 |
self.assertTrue(re.match('Can\'t remove changed or unknown files:' |
|
138 |
'.*unknown:.*xyz.*abc/def.*', |
|
139 |
str(e), re.DOTALL)) |
|
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
140 |
|
141 |
def test_remove_nonempty_directory(self): |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
142 |
"""Unchanged non-empty directories should be deleted.""" |
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
143 |
tree = self.getTree() |
144 |
tree.add(TestRemove.files) |
|
145 |
tree.commit("make sure b is versioned") |
|
146 |
self.assertInWorkingTree(TestRemove.files) |
|
147 |
self.failUnlessExists(TestRemove.files) |
|
148 |
tree.remove(TestRemove.b, keep_files=False) |
|
149 |
self.assertNotInWorkingTree(TestRemove.b) |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
150 |
self.failIfExists(TestRemove.b) |
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
151 |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
152 |
def test_remove_nonempty_directory_with_unknowns(self): |
153 |
"""Unchanged non-empty directories should be deleted.""" |
|
154 |
tree = self.getTree() |
|
155 |
tree.add(TestRemove.files) |
|
156 |
tree.commit("make sure b is versioned") |
|
157 |
self.assertInWorkingTree(TestRemove.files) |
|
158 |
self.failUnlessExists(TestRemove.files) |
|
159 |
f = file('b/my_unknown_file', 'wb') |
|
160 |
f.write("some content!") |
|
161 |
f.close() |
|
162 |
try: |
|
163 |
tree.remove(TestRemove.b, keep_files=False) |
|
164 |
self.fail('Should throw BzrRemoveChangedFilesError') |
|
165 |
except errors.BzrRemoveChangedFilesError, e: |
|
166 |
self.assertTrue(re.match('Can\'t remove changed or unknown files:' |
|
167 |
'.*unknown:.*b/my_unknown_file.*', |
|
168 |
str(e), re.DOTALL)) |
|
169 |
self.assertInWorkingTree(TestRemove.b) |
|
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
170 |
self.failUnlessExists(TestRemove.b) |
171 |
||
172 |
def test_force_remove_nonempty_directory(self): |
|
173 |
tree = self.getTree() |
|
174 |
tree.add(TestRemove.files) |
|
175 |
tree.commit("make sure b is versioned") |
|
176 |
self.assertInWorkingTree(TestRemove.files) |
|
177 |
self.failUnlessExists(TestRemove.files) |
|
178 |
tree.remove(TestRemove.b, keep_files=False, force=True) |
|
179 |
self.assertNotInWorkingTree(TestRemove.b_c) |
|
180 |
self.failIfExists(TestRemove.b_c) |
|
181 |
||
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
182 |
def test_remove_directory_with_changed_file(self): |
183 |
"""Refuse to delete directories with changed files.""" |
|
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
184 |
tree = self.getTree() |
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
185 |
tree.add(TestRemove.b_c) |
186 |
tree.commit("make sure b and c are versioned") |
|
187 |
f = file('b/c', 'wb') |
|
188 |
f.write("some other new content!") |
|
189 |
f.close() |
|
190 |
self.assertInWorkingTree(TestRemove.b_c) |
|
191 |
try: |
|
192 |
tree.remove(TestRemove.b, keep_files=False) |
|
193 |
self.fail('Should throw BzrRemoveChangedFilesError') |
|
194 |
except errors.BzrRemoveChangedFilesError, e: |
|
195 |
self.assertTrue(re.match('Can\'t remove changed or unknown files:' |
|
196 |
'.*modified:.*b/c.*', |
|
197 |
str(e), re.DOTALL)) |
|
198 |
self.assertInWorkingTree(TestRemove.b_c) |
|
199 |
self.failUnlessExists(TestRemove.b_c) |
|
|
2292.1.20
by Marius Kruger
move test_workingtree.TestRemove to workingtree_implementations/test_remove |
200 |
|
|
2292.1.25
by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show() |
201 |
#see if we can force it now..
|
202 |
tree.remove(TestRemove.b, keep_files=False, force=True) |
|
203 |
self.assertNotInWorkingTree(TestRemove.b_c) |
|
204 |
self.failIfExists(TestRemove.b_c) |
|
|
1551.15.11
by Aaron Bentley
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees |
205 |
|
206 |
def test_remove_subtree(self): |
|
207 |
tree = self.make_branch_and_tree('.') |
|
208 |
subtree = self.make_branch_and_tree('subtree') |
|
209 |
tree.add('subtree', 'subtree-id') |
|
210 |
tree.remove('subtree') |
|
211 |
self.assertIs(None, tree.path2id('subtree')) |
|
212 |
||
213 |
def test_non_cwd(self): |
|
214 |
tree = self.make_branch_and_tree('tree') |
|
215 |
self.build_tree(['tree/dir/', 'tree/dir/file']) |
|
216 |
tree.add(['dir', 'dir/file']) |
|
217 |
tree.commit('add file') |
|
218 |
tree.remove('dir/', keep_files=False) |
|
219 |
self.failIfExists('tree/dir/file') |