/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 breezy/tests/blackbox/test_remove.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remove.py
 
1
# Copyright (C) 2006-2010 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
import os
 
19
import sys
 
20
 
 
21
from breezy.tests import (
 
22
    script,
 
23
    features,
 
24
    TestCaseWithTransport,
 
25
    TestSkipped,
 
26
    TestNotApplicable,
 
27
    )
 
28
from breezy.workingtree import WorkingTree
 
29
from breezy import osutils
 
30
 
 
31
_id = b'-id'
 
32
a = 'a'
 
33
b = 'b/'
 
34
c = 'b/c'
 
35
d = 'd/'
 
36
files = (a, b, c, d)
 
37
 
 
38
 
 
39
class TestRemove(TestCaseWithTransport):
 
40
 
 
41
    def _make_tree_and_add(self, paths):
 
42
        tree = self.make_branch_and_tree('.')
 
43
        tree.lock_write()
 
44
        try:
 
45
            self.build_tree(paths)
 
46
            for path in paths:
 
47
                file_id = path.replace('/', '_').encode('utf-8') + _id
 
48
                tree.add(path, file_id)
 
49
        finally:
 
50
            tree.unlock()
 
51
        return tree
 
52
 
 
53
    def assertFilesDeleted(self, files):
 
54
        for f in files:
 
55
            id = f.encode('utf-8') + _id
 
56
            self.assertNotInWorkingTree(f)
 
57
            self.assertPathDoesNotExist(f)
 
58
 
 
59
    def assertFilesUnversioned(self, files):
 
60
        for f in files:
 
61
            self.assertNotInWorkingTree(f)
 
62
            self.assertPathExists(f)
 
63
 
 
64
    def changeFile(self, file_name):
 
65
        with open(file_name, 'ab') as f:
 
66
            f.write(b"\nsome other new content!")
 
67
 
 
68
    def run_bzr_remove_changed_files(self, files_to_remove, working_dir=None):
 
69
        self.run_bzr(['remove'] + list(files_to_remove),
 
70
                     working_dir=working_dir)
 
71
 
 
72
    def test_remove_new_no_files_specified(self):
 
73
        tree = self.make_branch_and_tree('.')
 
74
        self.run_bzr_error(["brz: ERROR: No matching files."], 'remove --new')
 
75
        self.run_bzr_error(
 
76
            ["brz: ERROR: No matching files."], 'remove --new .')
 
77
 
 
78
    def test_remove_no_files_specified(self):
 
79
        tree = self._make_tree_and_add(['foo'])
 
80
        out, err = self.run_bzr(['rm'])
 
81
        self.assertEqual('', err)
 
82
        self.assertEqual('', out)
 
83
        self.assertInWorkingTree('foo', tree=tree)
 
84
        self.assertPathExists('foo')
 
85
 
 
86
    def test_remove_no_files_specified_missing_dir_and_contents(self):
 
87
        tree = self._make_tree_and_add(
 
88
            ['foo', 'dir/', 'dir/missing/', 'dir/missing/child'])
 
89
        self.get_transport('.').delete_tree('dir/missing')
 
90
        out, err = self.run_bzr(['rm'])
 
91
        self.assertEqual('', out)
 
92
        self.assertEqual(
 
93
            'removed dir/missing/child\n'
 
94
            'removed dir/missing\n',
 
95
            err)
 
96
        # non-missing paths not touched:
 
97
        self.assertInWorkingTree('foo', tree=tree)
 
98
        self.assertPathExists('foo')
 
99
        self.assertInWorkingTree('dir', tree=tree)
 
100
        self.assertPathExists('dir')
 
101
        # missing files unversioned
 
102
        self.assertNotInWorkingTree('dir/missing', tree=tree)
 
103
        self.assertNotInWorkingTree('dir/missing/child', tree=tree)
 
104
 
 
105
    def test_remove_no_files_specified_already_deleted(self):
 
106
        tree = self._make_tree_and_add(['foo', 'bar'])
 
107
        tree.commit('save foo and bar')
 
108
        os.unlink('bar')
 
109
        self.run_bzr(['rm'])
 
110
        self.assertFalse(tree.is_versioned('bar'))
 
111
        # Running rm with a deleted file does not error.
 
112
        out, err = self.run_bzr(['rm'])
 
113
        self.assertEqual('', out)
 
114
        self.assertEqual('', err)
 
115
 
 
116
    def test_remove_no_files_specified_missing_file(self):
 
117
        tree = self._make_tree_and_add(['foo', 'bar'])
 
118
        os.unlink('bar')
 
119
        out, err = self.run_bzr(['rm'])
 
120
        self.assertEqual('', out)
 
121
        self.assertEqual('removed bar\n', err)
 
122
        # non-missing files not touched:
 
123
        self.assertInWorkingTree('foo', tree=tree)
 
124
        self.assertPathExists('foo')
 
125
        # missing files unversioned
 
126
        self.assertNotInWorkingTree('bar', tree=tree)
 
127
 
 
128
    def test_remove_no_files_specified_missing_link(self):
 
129
        self.requireFeature(features.SymlinkFeature)
 
130
        tree = self._make_tree_and_add(['foo'])
 
131
        os.symlink('foo', 'linkname')
 
132
        tree.add(['linkname'])
 
133
        os.unlink('linkname')
 
134
        out, err = self.run_bzr(['rm'])
 
135
        self.assertEqual('', out)
 
136
        self.assertEqual('removed linkname\n', err)
 
137
        # non-missing files not touched:
 
138
        self.assertInWorkingTree('foo', tree=tree)
 
139
        self.assertPathExists('foo')
 
140
        # missing files unversioned
 
141
        self.assertNotInWorkingTree('linkname', tree=tree)
 
142
 
 
143
    def test_rm_one_file(self):
 
144
        tree = self._make_tree_and_add([a])
 
145
        self.run_bzr("commit -m 'added a'")
 
146
        self.run_bzr('rm a', error_regexes=["deleted a"])
 
147
        self.assertFilesDeleted([a])
 
148
 
 
149
    def test_remove_one_file(self):
 
150
        tree = self._make_tree_and_add([a])
 
151
        self.run_bzr("commit -m 'added a'")
 
152
        self.run_bzr('remove a', error_regexes=["deleted a"])
 
153
        self.assertFilesDeleted([a])
 
154
 
 
155
    def test_remove_keep_one_file(self):
 
156
        tree = self._make_tree_and_add([a])
 
157
        self.run_bzr('remove --keep a', error_regexes=["removed a"])
 
158
        self.assertFilesUnversioned([a])
 
159
 
 
160
    def test_remove_one_deleted_file(self):
 
161
        tree = self._make_tree_and_add([a])
 
162
        self.run_bzr("commit -m 'added a'")
 
163
        os.unlink(a)
 
164
        self.assertInWorkingTree(a)
 
165
        self.run_bzr('remove a')
 
166
        self.assertNotInWorkingTree(a)
 
167
 
 
168
    def test_remove_invalid_files(self):
 
169
        self.build_tree(files)
 
170
        tree = self.make_branch_and_tree('.')
 
171
        self.run_bzr(['remove', '.', 'xyz', 'abc/def'])
 
172
 
 
173
    def test_remove_unversioned_files(self):
 
174
        self.build_tree(files)
 
175
        tree = self.make_branch_and_tree('.')
 
176
        self.run_bzr_remove_changed_files(files)
 
177
 
 
178
    def test_remove_changed_files(self):
 
179
        tree = self._make_tree_and_add(files)
 
180
        self.run_bzr("commit -m 'added files'")
 
181
        self.changeFile(a)
 
182
        self.changeFile(c)
 
183
        self.run_bzr_remove_changed_files(files)
 
184
 
 
185
    def test_remove_changed_ignored_files(self):
 
186
        tree = self._make_tree_and_add(['a'])
 
187
        self.run_bzr(['ignore', 'a'])
 
188
        self.run_bzr_remove_changed_files(['a'])
 
189
 
 
190
    def test_remove_changed_files_from_child_dir(self):
 
191
        if sys.platform == 'win32':
 
192
            raise TestSkipped("Windows unable to remove '.' directory")
 
193
        tree = self._make_tree_and_add(files)
 
194
        self.run_bzr("commit -m 'added files'")
 
195
        self.changeFile(a)
 
196
        self.changeFile(c)
 
197
        self.run_bzr_remove_changed_files(
 
198
            ['../a', 'c', '.', '../d'], working_dir='b')
 
199
        self.assertNotInWorkingTree(files)
 
200
        self.assertPathDoesNotExist(files)
 
201
 
 
202
    def test_remove_keep_unversioned_files(self):
 
203
        self.build_tree(files)
 
204
        tree = self.make_branch_and_tree('.')
 
205
        self.run_bzr('remove --keep a', error_regexes=["a is not versioned."])
 
206
        self.assertFilesUnversioned(files)
 
207
 
 
208
    def test_remove_no_backup_unversioned_files(self):
 
209
        self.build_tree(files)
 
210
        tree = self.make_branch_and_tree('.')
 
211
        script.ScriptRunner().run_script(self, '''
 
212
        $ brz remove --no-backup a b/ b/c d/
 
213
        2>deleted d
 
214
        2>removed b/c (but kept a copy: b/c.~1~)
 
215
        2>deleted b
 
216
        2>deleted a
 
217
        ''')
 
218
        self.assertFilesDeleted(files)
 
219
 
 
220
    def test_remove_deleted_files(self):
 
221
        tree = self._make_tree_and_add(files)
 
222
        self.run_bzr("commit -m 'added files'")
 
223
        my_files = [f for f in files]
 
224
        my_files.sort(reverse=True)
 
225
        for f in my_files:
 
226
            osutils.delete_any(f)
 
227
        self.assertInWorkingTree(files)
 
228
        self.assertPathDoesNotExist(files)
 
229
        self.run_bzr('remove ' + ' '.join(files))
 
230
        self.assertNotInWorkingTree(a)
 
231
        self.assertPathDoesNotExist(files)
 
232
 
 
233
    def test_remove_non_existing_files(self):
 
234
        tree = self._make_tree_and_add([])
 
235
        self.run_bzr(['remove', 'b'])
 
236
 
 
237
    def test_remove_keep_non_existing_files(self):
 
238
        tree = self._make_tree_and_add([])
 
239
        self.run_bzr('remove --keep b', error_regexes=["b is not versioned."])
 
240
 
 
241
    def test_remove_files(self):
 
242
        tree = self._make_tree_and_add(files)
 
243
        self.run_bzr("commit -m 'added files'")
 
244
        self.run_bzr('remove a b b/c d',
 
245
                     error_regexes=["deleted a", "deleted b", "deleted b/c",
 
246
                                    "deleted d"])
 
247
        self.assertFilesDeleted(files)
 
248
 
 
249
    def test_remove_keep_files(self):
 
250
        tree = self._make_tree_and_add(files)
 
251
        self.run_bzr("commit -m 'added files'")
 
252
        self.run_bzr('remove --keep a b b/c d',
 
253
                     error_regexes=["removed a", "removed b", "removed b/c",
 
254
                                    "removed d"])
 
255
        self.assertFilesUnversioned(files)
 
256
 
 
257
    def test_remove_with_new(self):
 
258
        tree = self._make_tree_and_add(files)
 
259
        self.run_bzr('remove --new --keep',
 
260
                     error_regexes=["removed a", "removed b", "removed b/c"])
 
261
        self.assertFilesUnversioned(files)
 
262
 
 
263
    def test_remove_with_new_in_dir1(self):
 
264
        tree = self._make_tree_and_add(files)
 
265
        self.run_bzr('remove --new --keep b b/c',
 
266
                     error_regexes=["removed b", "removed b/c"])
 
267
        tree = WorkingTree.open('.')
 
268
        self.assertInWorkingTree(a)
 
269
        self.assertEqual(tree.path2id(a), a.encode('utf-8') + _id)
 
270
        self.assertFilesUnversioned([b, c])
 
271
 
 
272
    def test_remove_with_new_in_dir2(self):
 
273
        tree = self._make_tree_and_add(files)
 
274
        self.run_bzr('remove --new --keep .',
 
275
                     error_regexes=["removed a", "removed b", "removed b/c"])
 
276
        tree = WorkingTree.open('.')
 
277
        self.assertFilesUnversioned(files)
 
278
 
 
279
    def test_remove_backslash(self):
 
280
        # pad.lv/176263
 
281
        if os.path.sep == '\\':
 
282
            raise TestNotApplicable(
 
283
                'unable to add filenames with backslashes where '
 
284
                ' it is the path separator')
 
285
        tree = self.make_branch_and_tree('.')
 
286
        self.build_tree(['\\'])
 
287
        self.assertEqual('adding \\\n', self.run_bzr('add \\\\')[0])
 
288
        self.assertEqual('\\\n', self.run_bzr('ls --versioned')[0])
 
289
        self.assertEqual('', self.run_bzr('rm \\\\')[0])
 
290
        self.assertEqual('', self.run_bzr('ls --versioned')[0])