← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

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