← 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: 2010-03-02 10:21:39 UTC
  • mfrom: (4797.2.24 2.1)
  • mto: This revision was merged to the branch mainline in revision 5069.
  • Revision ID: v.ladeuil+lp@free.fr-20100302102139-b5cba7h6xu13mekg
Merge 2.1 into trunk including fixes for #331095, #507557, #185103, #524184 and #369501

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove.py
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
 
21
from bzrlib.tests import SymlinkFeature, TestSkipped
22
22
from bzrlib.tests.blackbox import ExternalBase
23
23
from bzrlib.workingtree import WorkingTree
24
24
from bzrlib import osutils
33
33
 
34
34
class TestRemove(ExternalBase):
35
35
 
36
 
    def _make_add_and_assert_tree(self, files):
 
36
    def _make_tree_and_add(self, paths):
37
37
        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)
 
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()
45
46
        return tree
46
47
 
47
48
    def assertFilesDeleted(self, files):
60
61
        f.write("\nsome other new content!")
61
62
        f.close()
62
63
 
63
 
    def run_bzr_remove_changed_files(self, error_regexes, files_to_remove):
 
64
    def run_bzr_remove_changed_files(self, error_regexes, files_to_remove,
 
65
                                     working_dir=None):
64
66
        error_regexes.extend(["Can't safely remove modified or unknown files:",
65
67
            'Use --keep to not delete them,'
66
68
            ' or --force to delete them regardless.'
67
69
            ])
68
70
        self.run_bzr_error(error_regexes,
69
 
            ['remove'] + list(files_to_remove))
 
71
                           ['remove'] + list(files_to_remove),
 
72
                           working_dir=working_dir)
70
73
        #see if we can force it now
71
 
        self.run_bzr(['remove', '--force'] + list(files_to_remove))
 
74
        self.run_bzr(['remove', '--force'] + list(files_to_remove),
 
75
                     working_dir=working_dir)
 
76
 
 
77
    def test_remove_new_no_files_specified(self):
 
78
        tree = self.make_branch_and_tree('.')
 
79
        self.run_bzr_error(["bzr: ERROR: No matching files."], 'remove --new')
 
80
        self.run_bzr_error(["bzr: ERROR: No matching files."], 'remove --new .')
72
81
 
73
82
    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 .')
 
83
        tree = self._make_tree_and_add(['foo'])
 
84
        out, err = self.run_bzr(['rm'])
 
85
        self.assertEqual('', err)
 
86
        self.assertEqual('', out)
 
87
        self.assertInWorkingTree('foo', tree=tree)
 
88
        self.failUnlessExists('foo')
 
89
 
 
90
    def test_remove_no_files_specified_missing_dir_and_contents(self):
 
91
        tree = self._make_tree_and_add(
 
92
            ['foo', 'dir/', 'dir/missing/', 'dir/missing/child'])
 
93
        self.get_transport('.').delete_tree('dir/missing')
 
94
        out, err = self.run_bzr(['rm'])
 
95
        self.assertEqual('', out)
 
96
        self.assertEqual(
 
97
            'removed dir/missing/child\n'
 
98
            'removed dir/missing\n',
 
99
            err)
 
100
        # non-missing paths not touched:
 
101
        self.assertInWorkingTree('foo', tree=tree)
 
102
        self.failUnlessExists('foo')
 
103
        self.assertInWorkingTree('dir', tree=tree)
 
104
        self.failUnlessExists('dir')
 
105
        # missing files unversioned
 
106
        self.assertNotInWorkingTree('dir/missing', tree=tree)
 
107
        self.assertNotInWorkingTree('dir/missing/child', tree=tree)
 
108
 
 
109
    def test_remove_no_files_specified_already_deleted(self):
 
110
        tree = self._make_tree_and_add(['foo', 'bar'])
 
111
        tree.commit('save foo and bar')
 
112
        os.unlink('bar')
 
113
        self.run_bzr(['rm'])
 
114
        self.assertEqual(None, tree.path2id('bar'))
 
115
        # Running rm with a deleted file does not error.
 
116
        out, err = self.run_bzr(['rm'])
 
117
        self.assertEqual('', out)
 
118
        self.assertEqual('', err)
 
119
 
 
120
    def test_remove_no_files_specified_missing_file(self):
 
121
        tree = self._make_tree_and_add(['foo', 'bar'])
 
122
        os.unlink('bar')
 
123
        out, err = self.run_bzr(['rm'])
 
124
        self.assertEqual('', out)
 
125
        self.assertEqual('removed bar\n', err)
 
126
        # non-missing files not touched:
 
127
        self.assertInWorkingTree('foo', tree=tree)
 
128
        self.failUnlessExists('foo')
 
129
        # missing files unversioned
 
130
        self.assertNotInWorkingTree('bar', tree=tree)
 
131
 
 
132
    def test_remove_no_files_specified_missing_link(self):
 
133
        self.requireFeature(SymlinkFeature)
 
134
        tree = self._make_tree_and_add(['foo'])
 
135
        os.symlink('foo', 'linkname')
 
136
        tree.add(['linkname'])
 
137
        os.unlink('linkname')
 
138
        out, err = self.run_bzr(['rm'])
 
139
        self.assertEqual('', out)
 
140
        self.assertEqual('removed linkname\n', err)
 
141
        # non-missing files not touched:
 
142
        self.assertInWorkingTree('foo', tree=tree)
 
143
        self.failUnlessExists('foo')
 
144
        # missing files unversioned
 
145
        self.assertNotInWorkingTree('linkname', tree=tree)
82
146
 
83
147
    def test_rm_one_file(self):
84
 
        tree = self._make_add_and_assert_tree([a])
 
148
        tree = self._make_tree_and_add([a])
85
149
        self.run_bzr("commit -m 'added a'")
86
150
        self.run_bzr('rm a', error_regexes=["deleted a"])
87
151
        self.assertFilesDeleted([a])
88
152
 
89
153
    def test_remove_one_file(self):
90
 
        tree = self._make_add_and_assert_tree([a])
 
154
        tree = self._make_tree_and_add([a])
91
155
        self.run_bzr("commit -m 'added a'")
92
156
        self.run_bzr('remove a', error_regexes=["deleted a"])
93
157
        self.assertFilesDeleted([a])
94
158
 
95
159
    def test_remove_keep_one_file(self):
96
 
        tree = self._make_add_and_assert_tree([a])
 
160
        tree = self._make_tree_and_add([a])
97
161
        self.run_bzr('remove --keep a', error_regexes=["removed a"])
98
162
        self.assertFilesUnversioned([a])
99
163
 
100
164
    def test_remove_one_deleted_file(self):
101
 
        tree = self._make_add_and_assert_tree([a])
 
165
        tree = self._make_tree_and_add([a])
102
166
        self.run_bzr("commit -m 'added a'")
103
167
        os.unlink(a)
104
168
        self.assertInWorkingTree(a)
117
181
            ['unknown:[.\s]*d/[.\s]*b/c[.\s]*b/[.\s]*a'], files)
118
182
 
119
183
    def test_remove_changed_files(self):
120
 
        tree = self._make_add_and_assert_tree(files)
 
184
        tree = self._make_tree_and_add(files)
121
185
        self.run_bzr("commit -m 'added files'")
122
186
        self.changeFile(a)
123
187
        self.changeFile(c)
124
188
        self.run_bzr_remove_changed_files(['modified:[.\s]*a[.\s]*b/c'], files)
125
189
 
 
190
    def test_remove_changed_ignored_files(self):
 
191
        tree = self._make_tree_and_add(['a'])
 
192
        self.run_bzr(['ignore', 'a'])
 
193
        self.run_bzr_remove_changed_files(['added:[.\s]*a'], ['a'])
 
194
 
126
195
    def test_remove_changed_files_from_child_dir(self):
127
196
        if sys.platform == 'win32':
128
197
            raise TestSkipped("Windows unable to remove '.' directory")
129
 
        tree = self._make_add_and_assert_tree(files)
 
198
        tree = self._make_tree_and_add(files)
130
199
        self.run_bzr("commit -m 'added files'")
131
200
        self.changeFile(a)
132
201
        self.changeFile(c)
133
 
        os.chdir('b')
134
 
        self.run_bzr_remove_changed_files(['modified:[.\s]*a[.\s]*b/c'],
135
 
            ['../a', 'c', '.', '../d'])
136
 
        os.chdir('..')
 
202
        self.run_bzr_remove_changed_files(
 
203
            ['modified:[.\s]*a[.\s]*b/c'],
 
204
            ['../a', 'c', '.', '../d'], working_dir='b')
137
205
        self.assertNotInWorkingTree(files)
138
206
        self.failIfExists(files)
139
207
 
152
220
        self.assertFilesDeleted(files)
153
221
 
154
222
    def test_remove_deleted_files(self):
155
 
        tree = self._make_add_and_assert_tree(files)
 
223
        tree = self._make_tree_and_add(files)
156
224
        self.run_bzr("commit -m 'added files'")
157
225
        my_files=[f for f in files]
158
226
        my_files.sort(reverse=True)
165
233
        self.failIfExists(files)
166
234
 
167
235
    def test_remove_non_existing_files(self):
168
 
        tree = self._make_add_and_assert_tree([])
 
236
        tree = self._make_tree_and_add([])
169
237
        self.run_bzr(['remove', 'b'])
170
238
 
171
239
    def test_remove_keep_non_existing_files(self):
172
 
        tree = self._make_add_and_assert_tree([])
 
240
        tree = self._make_tree_and_add([])
173
241
        self.run_bzr('remove --keep b', error_regexes=["b is not versioned."])
174
242
 
175
243
    def test_remove_files(self):
176
 
        tree = self._make_add_and_assert_tree(files)
 
244
        tree = self._make_tree_and_add(files)
177
245
        self.run_bzr("commit -m 'added files'")
178
246
        self.run_bzr('remove a b b/c d',
179
247
                     error_regexes=["deleted a", "deleted b", "deleted b/c",
181
249
        self.assertFilesDeleted(files)
182
250
 
183
251
    def test_remove_keep_files(self):
184
 
        tree = self._make_add_and_assert_tree(files)
 
252
        tree = self._make_tree_and_add(files)
185
253
        self.run_bzr("commit -m 'added files'")
186
254
        self.run_bzr('remove --keep a b b/c d',
187
255
                     error_regexes=["removed a", "removed b", "removed b/c",
189
257
        self.assertFilesUnversioned(files)
190
258
 
191
259
    def test_remove_with_new(self):
192
 
        tree = self._make_add_and_assert_tree(files)
 
260
        tree = self._make_tree_and_add(files)
193
261
        self.run_bzr('remove --new --keep',
194
262
                     error_regexes=["removed a", "removed b", "removed b/c"])
195
263
        self.assertFilesUnversioned(files)
196
264
 
197
265
    def test_remove_with_new_in_dir1(self):
198
 
        tree = self._make_add_and_assert_tree(files)
 
266
        tree = self._make_tree_and_add(files)
199
267
        self.run_bzr('remove --new --keep b b/c',
200
268
                     error_regexes=["removed b", "removed b/c"])
201
269
        tree = WorkingTree.open('.')
204
272
        self.assertFilesUnversioned([b,c])
205
273
 
206
274
    def test_remove_with_new_in_dir2(self):
207
 
        tree = self._make_add_and_assert_tree(files)
 
275
        tree = self._make_tree_and_add(files)
208
276
        self.run_bzr('remove --new --keep .',
209
277
                     error_regexes=["removed a", "removed b", "removed b/c"])
210
278
        tree = WorkingTree.open('.')