/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_remove.py

  • Committer: Marius Kruger
  • Date: 2007-08-12 08:15:15 UTC
  • mfrom: (2695 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2979.
  • Revision ID: amanic@gmail.com-20070812081515-vgekipfhohcuj6rn
merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_remove.py
16
16
 
17
17
"""Tests for interface conformance of 'WorkingTree.remove'"""
18
18
 
19
 
import re
20
19
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
21
20
from bzrlib import errors, osutils
22
21
 
23
22
class TestRemove(TestCaseWithWorkingTree):
24
23
    """Tests WorkingTree.remove"""
25
24
 
26
 
    files=['a', 'b/', 'b/c', 'd/']
 
25
    files = ['a', 'b/', 'b/c', 'd/']
 
26
    rfiles = ['b/c', 'b', 'a', 'd']
27
27
    a = ['a']
28
28
    b = ['b']
29
29
    b_c = ['b', 'b/c']
30
30
 
31
31
    def getTree(self):
32
 
        self.makeAndChdirToTestDir()
33
32
        tree = self.make_branch_and_tree('.')
34
33
        self.build_tree(TestRemove.files)
35
34
        return tree
61
60
        tree = self.getTree()
62
61
        tree.add(TestRemove.files)
63
62
        self.assertInWorkingTree(TestRemove.files)
64
 
        try:
65
 
            tree.remove(TestRemove.files, keep_files=False)
66
 
            self.fail('Should throw BzrRemoveChangedFilesError')
67
 
        except errors.BzrRemoveChangedFilesError, e:
68
 
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
69
 
                '.*added:.*a.*b.*b/c.*d.*',
70
 
                str(e), re.DOTALL))
 
63
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
 
64
            TestRemove.files, keep_files=False)
 
65
        self.assertContainsRe(err.changes_as_text,
 
66
            '(?s)added:.*a.*b/.*b/c.*d/')
71
67
        self.assertInWorkingTree(TestRemove.files)
72
68
        self.failUnlessExists(TestRemove.files)
73
69
 
76
72
        tree = self.getTree()
77
73
        tree.add(TestRemove.a)
78
74
        tree.commit("make sure a is versioned")
79
 
        f = file('a', 'wb')
80
 
        f.write("some other new content!")
81
 
        f.close()
 
75
        self.build_tree_contents([('a', "some other new content!")])
82
76
        self.assertInWorkingTree(TestRemove.a)
83
 
        try:
84
 
            tree.remove(TestRemove.a, keep_files=False)
85
 
            self.fail('Should throw BzrRemoveChangedFilesError')
86
 
        except errors.BzrRemoveChangedFilesError, e:
87
 
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
88
 
                '.*modified:.*a.*',
89
 
                str(e), re.DOTALL))
 
77
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
 
78
            TestRemove.a, keep_files=False)
 
79
        self.assertContainsRe(err.changes_as_text, '(?s)modified:.*a')
90
80
        self.assertInWorkingTree(TestRemove.a)
91
81
        self.failUnlessExists(TestRemove.a)
92
82
 
95
85
        tree = self.getTree()
96
86
        tree.add(TestRemove.files)
97
87
        tree.commit("make sure files are versioned")
98
 
        for f in ['b/c', 'b', 'a', 'd']:
 
88
        for f in TestRemove.rfiles:
99
89
            osutils.delete_any(f)
100
90
        self.assertInWorkingTree(TestRemove.files)
101
91
        self.failIfExists(TestRemove.files)
105
95
        self.assertNotInWorkingTree(TestRemove.files)
106
96
        self.failIfExists(TestRemove.files)
107
97
 
 
98
    def test_remove_renamed_files(self):
 
99
        """Check that files are removed even if they are renamed."""
 
100
        tree = self.getTree()
 
101
        tree.add(TestRemove.files)
 
102
        tree.commit("make sure files are versioned")
 
103
 
 
104
        for f in TestRemove.rfiles:
 
105
            tree.rename_one(f,f+'x')
 
106
        rfilesx = ['bx/cx', 'bx', 'ax', 'dx']
 
107
        self.assertInWorkingTree(rfilesx)
 
108
        self.failUnlessExists(rfilesx)
 
109
 
 
110
        tree.remove(rfilesx, keep_files=False)
 
111
 
 
112
        self.assertNotInWorkingTree(rfilesx)
 
113
        self.failIfExists(rfilesx)
 
114
 
 
115
    def test_remove_renamed_changed_files(self):
 
116
        """Check that files are not removed if they are renamed and changed."""
 
117
        tree = self.getTree()
 
118
        tree.add(TestRemove.files)
 
119
        tree.commit("make sure files are versioned")
 
120
 
 
121
        for f in TestRemove.rfiles:
 
122
            tree.rename_one(f,f+'x')
 
123
        rfilesx = ['bx/cx', 'bx', 'ax', 'dx']
 
124
        self.build_tree_contents([('ax','changed and renamed!'),
 
125
                                  ('bx/cx','changed and renamed!')])
 
126
        self.assertInWorkingTree(rfilesx)
 
127
        self.failUnlessExists(rfilesx)
 
128
 
 
129
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
 
130
            rfilesx, keep_files=False)
 
131
        self.assertContainsRe(err.changes_as_text,
 
132
            '(?s)modified:.*ax.*bx/cx')
 
133
        self.assertInWorkingTree(rfilesx)
 
134
        self.failUnlessExists(rfilesx)
 
135
 
108
136
    def test_force_remove_changed_files(self):
109
137
        """Check that changed files are removed and deleted when forced."""
110
138
        tree = self.getTree()
119
147
    def test_remove_unknown_files(self):
120
148
        """Try to delete unknown files."""
121
149
        tree = self.getTree()
122
 
        try:
123
 
            tree.remove(TestRemove.files, keep_files=False)
124
 
            self.fail('Should throw BzrRemoveChangedFilesError')
125
 
        except errors.BzrRemoveChangedFilesError, e:
126
 
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
127
 
                '.*unknown:.*b/c.*b.*a.*d.*',
128
 
                str(e), re.DOTALL))
 
150
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
 
151
            TestRemove.files, keep_files=False)
 
152
        self.assertContainsRe(err.changes_as_text,
 
153
            '(?s)unknown:.*d/.*b/c.*b/.*a.*')
129
154
 
130
155
    def test_remove_nonexisting_files(self):
131
156
        """Try to delete non-existing files."""
132
157
        tree = self.getTree()
133
158
        tree.remove([''], keep_files=False)
134
 
        try:
135
 
            tree.remove(['xyz', 'abc/def'], keep_files=False)
136
 
            self.fail('Should throw BzrRemoveChangedFilesError')
137
 
        except errors.BzrRemoveChangedFilesError, e:
138
 
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
139
 
                '.*unknown:.*xyz.*abc/def.*',
140
 
                str(e), re.DOTALL))
 
159
        tree.remove(['xyz', 'abc/def'], keep_files=False)
141
160
 
142
161
    def test_remove_nonempty_directory(self):
143
162
        """Unchanged non-empty directories should be deleted."""
157
176
        tree.commit("make sure b is versioned")
158
177
        self.assertInWorkingTree(TestRemove.files)
159
178
        self.failUnlessExists(TestRemove.files)
160
 
        f = file('b/my_unknown_file', 'wb')
161
 
        f.write("some content!")
162
 
        f.close()
163
 
        try:
164
 
            tree.remove(TestRemove.b, keep_files=False)
165
 
            self.fail('Should throw BzrRemoveChangedFilesError')
166
 
        except errors.BzrRemoveChangedFilesError, e:
167
 
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
168
 
                '.*unknown:.*b/my_unknown_file.*',
169
 
                str(e), re.DOTALL))
 
179
        self.build_tree(['b/my_unknown_file'])
 
180
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
 
181
            TestRemove.b, keep_files=False)
 
182
        self.assertContainsRe(err.changes_as_text,
 
183
            '(?s)unknown:.*b/my_unknown_file')
170
184
        self.assertInWorkingTree(TestRemove.b)
171
185
        self.failUnlessExists(TestRemove.b)
172
186
 
185
199
        tree = self.getTree()
186
200
        tree.add(TestRemove.b_c)
187
201
        tree.commit("make sure b and c are versioned")
188
 
        f = file('b/c', 'wb')
189
 
        f.write("some other new content!")
190
 
        f.close()
 
202
        self.build_tree_contents([('b/c', "some other new content!")])
191
203
        self.assertInWorkingTree(TestRemove.b_c)
192
 
        try:
193
 
            tree.remove(TestRemove.b, keep_files=False)
194
 
            self.fail('Should throw BzrRemoveChangedFilesError')
195
 
        except errors.BzrRemoveChangedFilesError, e:
196
 
            self.assertTrue(re.match('Can\'t remove changed or unknown files:'
197
 
                '.*modified:.*b/c.*',
198
 
                str(e), re.DOTALL))
 
204
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
 
205
            TestRemove.b, keep_files=False)
 
206
        self.assertContainsRe(err.changes_as_text, '(?s)modified:.*b/c')
199
207
        self.assertInWorkingTree(TestRemove.b_c)
200
208
        self.failUnlessExists(TestRemove.b_c)
201
209
 
203
211
        tree.remove(TestRemove.b, keep_files=False, force=True)
204
212
        self.assertNotInWorkingTree(TestRemove.b_c)
205
213
        self.failIfExists(TestRemove.b_c)
 
214
 
 
215
    def test_remove_subtree(self):
 
216
        tree = self.make_branch_and_tree('.')
 
217
        subtree = self.make_branch_and_tree('subtree')
 
218
        tree.add('subtree', 'subtree-id')
 
219
        tree.remove('subtree')
 
220
        self.assertIs(None, tree.path2id('subtree'))
 
221
 
 
222
    def test_non_cwd(self):
 
223
        tree = self.make_branch_and_tree('tree')
 
224
        self.build_tree(['tree/dir/', 'tree/dir/file'])
 
225
        tree.add(['dir', 'dir/file'])
 
226
        tree.commit('add file')
 
227
        tree.remove('dir/', keep_files=False)
 
228
        self.failIfExists('tree/dir/file')