← 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: Vincent Ladeuil
  • Date: 2007-09-24 15:01:26 UTC
  • mfrom: (2853 +trunk)
  • mto: (2885.1.1 140432)
  • mto: This revision was merged to the branch mainline in revision 2886.
  • Revision ID: v.ladeuil+lp@free.fr-20070924150126-nll7i0385kisklyj
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

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