← 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-04-21 05:06:57 UTC
  • mfrom: (6603.4.1 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20160421050657-ygnzfybewvudf1j9
(richard-wilbur) Use initial_comment as commit_message for lp_propose.(Shawn
 Wang) (Shawn Wang)

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