1
# Copyright (C) 2006 Canonical Ltd
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.
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.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Test for 'bzr mv'"""
26
from bzrlib.tests import (
28
TestCaseWithTransport,
32
class TestMove(TestCaseWithTransport):
34
def assertMoved(self,from_path,to_path):
35
"""Assert that to_path is existing and versioned but from_path not. """
36
self.failIfExists(from_path)
37
self.assertNotInWorkingTree(from_path)
39
self.failUnlessExists(to_path)
40
self.assertInWorkingTree(to_path)
42
def test_mv_modes(self):
43
"""Test two modes of operation for mv"""
44
tree = self.make_branch_and_tree('.')
45
files = self.build_tree(['a', 'c', 'subdir/'])
46
tree.add(['a', 'c', 'subdir'])
48
self.run_bzr('mv a b')
49
self.assertMoved('a','b')
51
self.run_bzr('mv b subdir')
52
self.assertMoved('b','subdir/b')
54
self.run_bzr('mv subdir/b a')
55
self.assertMoved('subdir/b','a')
57
self.run_bzr('mv a c subdir')
58
self.assertMoved('a','subdir/a')
59
self.assertMoved('c','subdir/c')
61
self.run_bzr('mv subdir/a subdir/newa')
62
self.assertMoved('subdir/a','subdir/newa')
64
def test_mv_unversioned(self):
65
self.build_tree(['unversioned.txt'])
67
["^bzr: ERROR: Could not rename unversioned.txt => elsewhere."
68
" .*unversioned.txt is not versioned\.$"],
69
'mv unversioned.txt elsewhere')
71
def test_mv_nonexisting(self):
73
["^bzr: ERROR: Could not rename doesnotexist => somewhereelse."
74
" .*doesnotexist is not versioned\.$"],
75
'mv doesnotexist somewhereelse')
77
def test_mv_unqualified(self):
78
self.run_bzr_error(['^bzr: ERROR: missing file argument$'], 'mv')
80
def test_mv_invalid(self):
81
tree = self.make_branch_and_tree('.')
82
self.build_tree(['test.txt', 'sub1/'])
83
tree.add(['test.txt'])
86
["^bzr: ERROR: Could not move to sub1: sub1 is not versioned\.$"],
90
["^bzr: ERROR: Could not move test.txt => .*hello.txt: "
91
"sub1 is not versioned\.$"],
92
'mv test.txt sub1/hello.txt')
94
def test_mv_dirs(self):
95
tree = self.make_branch_and_tree('.')
96
self.build_tree(['hello.txt', 'sub1/'])
97
tree.add(['hello.txt', 'sub1'])
99
self.run_bzr('mv sub1 sub2')
100
self.assertMoved('sub1','sub2')
102
self.run_bzr('mv hello.txt sub2')
103
self.assertMoved('hello.txt','sub2/hello.txt')
105
self.build_tree(['sub1/'])
107
self.run_bzr('mv sub2/hello.txt sub1')
108
self.assertMoved('sub2/hello.txt','sub1/hello.txt')
110
self.run_bzr('mv sub2 sub1')
111
self.assertMoved('sub2','sub1/sub2')
113
def test_mv_relative(self):
114
self.build_tree(['sub1/', 'sub1/sub2/', 'sub1/hello.txt'])
115
tree = self.make_branch_and_tree('.')
116
tree.add(['sub1', 'sub1/sub2', 'sub1/hello.txt'])
118
os.chdir('sub1/sub2')
119
self.run_bzr('mv ../hello.txt .')
120
self.failUnlessExists('./hello.txt')
123
self.run_bzr('mv sub2/hello.txt .')
125
self.assertMoved('sub1/sub2/hello.txt','sub1/hello.txt')
127
def test_mv_change_case_file(self):
128
# test for bug #77740 (mv unable change filename case on Windows)
129
tree = self.make_branch_and_tree('.')
130
self.build_tree(['test.txt'])
131
tree.add(['test.txt'])
132
self.run_bzr('mv test.txt Test.txt')
133
# we can't use failUnlessExists on case-insensitive filesystem
134
# so try to check shape of the tree
135
shape = sorted(os.listdir(u'.'))
136
self.assertEqual(['.bzr', 'Test.txt'], shape)
137
self.assertInWorkingTree('Test.txt')
138
self.assertNotInWorkingTree('test.txt')
140
def test_mv_change_case_dir(self):
141
tree = self.make_branch_and_tree('.')
142
self.build_tree(['foo/'])
144
self.run_bzr('mv foo Foo')
145
# we can't use failUnlessExists on case-insensitive filesystem
146
# so try to check shape of the tree
147
shape = sorted(os.listdir(u'.'))
148
self.assertEqual(['.bzr', 'Foo'], shape)
149
self.assertInWorkingTree('Foo')
150
self.assertNotInWorkingTree('foo')
152
def test_mv_change_case_dir_w_files(self):
153
tree = self.make_branch_and_tree('.')
154
self.build_tree(['foo/', 'foo/bar'])
156
self.run_bzr('mv foo Foo')
157
# we can't use failUnlessExists on case-insensitive filesystem
158
# so try to check shape of the tree
159
shape = sorted(os.listdir(u'.'))
160
self.assertEqual(['.bzr', 'Foo'], shape)
161
self.assertInWorkingTree('Foo')
162
self.assertNotInWorkingTree('foo')
164
def test_mv_file_to_wrong_case_dir(self):
165
tree = self.make_branch_and_tree('.')
166
self.build_tree(['foo/', 'bar'])
167
tree.add(['foo', 'bar'])
168
out, err = self.run_bzr('mv bar Foo', retcode=3)
169
self.assertEquals('', out)
171
'bzr: ERROR: Could not move to Foo: Foo is not versioned.\n',
174
def test_mv_smoke_aliases(self):
175
# just test that aliases for mv exist, if their behaviour is changed in
176
# the future, then extend the tests.
177
self.build_tree(['a'])
178
tree = self.make_branch_and_tree('.')
181
self.run_bzr('move a b')
182
self.run_bzr('rename b a')
184
def test_mv_through_symlinks(self):
185
self.requireFeature(SymlinkFeature)
186
tree = self.make_branch_and_tree('.')
187
self.build_tree(['a/', 'a/b'])
190
tree.add(['a', 'a/b', 'c'], ['a-id', 'b-id', 'c-id'])
191
self.run_bzr('mv c/b b')
192
tree = workingtree.WorkingTree.open('.')
193
self.assertEqual('b-id', tree.path2id('b'))
195
def test_mv_already_moved_file(self):
196
"""Test bzr mv original_file to moved_file.
198
Tests if a file which has allready been moved by an external tool,
199
is handled correctly by bzr mv.
200
Setup: a is in the working tree, b does not exist.
201
User does: mv a b; bzr mv a b
203
self.build_tree(['a'])
204
tree = self.make_branch_and_tree('.')
207
osutils.rename('a', 'b')
208
self.run_bzr('mv a b')
209
self.assertMoved('a','b')
211
def test_mv_already_moved_file_to_versioned_target(self):
212
"""Test bzr mv existing_file to versioned_file.
214
Tests if an attempt to move an existing versioned file
215
to another versiond file will fail.
216
Setup: a and b are in the working tree.
217
User does: rm b; mv a b; bzr mv a b
219
self.build_tree(['a', 'b'])
220
tree = self.make_branch_and_tree('.')
224
osutils.rename('a', 'b')
226
["^bzr: ERROR: Could not move a => b. b is already versioned\.$"],
228
#check that nothing changed
229
self.failIfExists('a')
230
self.failUnlessExists('b')
232
def test_mv_already_moved_file_into_subdir(self):
233
"""Test bzr mv original_file to versioned_directory/file.
235
Tests if a file which has already been moved into a versioned
236
directory by an external tool, is handled correctly by bzr mv.
237
Setup: a and sub/ are in the working tree.
238
User does: mv a sub/a; bzr mv a sub/a
240
self.build_tree(['a', 'sub/'])
241
tree = self.make_branch_and_tree('.')
242
tree.add(['a', 'sub'])
244
osutils.rename('a', 'sub/a')
245
self.run_bzr('mv a sub/a')
246
self.assertMoved('a','sub/a')
248
def test_mv_already_moved_file_into_unversioned_subdir(self):
249
"""Test bzr mv original_file to unversioned_directory/file.
251
Tests if an attempt to move an existing versioned file
252
into an unversioned directory will fail.
253
Setup: a is in the working tree, sub/ is not.
254
User does: mv a sub/a; bzr mv a sub/a
256
self.build_tree(['a', 'sub/'])
257
tree = self.make_branch_and_tree('.')
260
osutils.rename('a', 'sub/a')
262
["^bzr: ERROR: Could not move a => a: sub is not versioned\.$"],
264
self.failIfExists('a')
265
self.failUnlessExists('sub/a')
267
def test_mv_already_moved_files_into_subdir(self):
268
"""Test bzr mv original_files to versioned_directory.
270
Tests if files which has already been moved into a versioned
271
directory by an external tool, is handled correctly by bzr mv.
272
Setup: a1, a2, sub are in the working tree.
273
User does: mv a1 sub/.; bzr mv a1 a2 sub
275
self.build_tree(['a1', 'a2', 'sub/'])
276
tree = self.make_branch_and_tree('.')
277
tree.add(['a1', 'a2', 'sub'])
279
osutils.rename('a1', 'sub/a1')
280
self.run_bzr('mv a1 a2 sub')
281
self.assertMoved('a1','sub/a1')
282
self.assertMoved('a2','sub/a2')
284
def test_mv_already_moved_files_into_unversioned_subdir(self):
285
"""Test bzr mv original_file to unversioned_directory.
287
Tests if an attempt to move existing versioned file
288
into an unversioned directory will fail.
289
Setup: a1, a2 are in the working tree, sub is not.
290
User does: mv a1 sub/.; bzr mv a1 a2 sub
292
self.build_tree(['a1', 'a2', 'sub/'])
293
tree = self.make_branch_and_tree('.')
294
tree.add(['a1', 'a2'])
296
osutils.rename('a1', 'sub/a1')
298
["^bzr: ERROR: Could not move to sub. sub is not versioned\.$"],
300
self.failIfExists('a1')
301
self.failUnlessExists('sub/a1')
302
self.failUnlessExists('a2')
303
self.failIfExists('sub/a2')
305
def test_mv_already_moved_file_forcing_after(self):
306
"""Test bzr mv versioned_file to unversioned_file.
308
Tests if an attempt to move an existing versioned file to an existing
309
unversioned file will fail, informing the user to use the --after
310
option to force this.
311
Setup: a is in the working tree, b not versioned.
312
User does: mv a b; touch a; bzr mv a b
314
self.build_tree(['a', 'b'])
315
tree = self.make_branch_and_tree('.')
318
osutils.rename('a', 'b')
319
self.build_tree(['a']) #touch a
321
["^bzr: ERROR: Could not rename a => b because both files exist."
322
" \(Use --after to tell bzr about a rename that has already"
325
self.failUnlessExists('a')
326
self.failUnlessExists('b')
328
def test_mv_already_moved_file_using_after(self):
329
"""Test bzr mv --after versioned_file to unversioned_file.
331
Tests if an existing versioned file can be forced to move to an
332
existing unversioned file using the --after option. With the result
333
that bazaar considers the unversioned_file to be moved from
334
versioned_file and versioned_file will become unversioned.
335
Setup: a is in the working tree and b exists.
336
User does: mv a b; touch a; bzr mv a b --after
337
Resulting in a => b and a is unknown.
339
self.build_tree(['a', 'b'])
340
tree = self.make_branch_and_tree('.')
342
osutils.rename('a', 'b')
343
self.build_tree(['a']) #touch a
345
self.run_bzr('mv a b --after')
346
self.failUnlessExists('a')
347
self.assertNotInWorkingTree('a')#a should be unknown now.
348
self.failUnlessExists('b')
349
self.assertInWorkingTree('b')
351
def test_mv_already_moved_files_forcing_after(self):
352
"""Test bzr mv versioned_files to directory/unversioned_file.
354
Tests if an attempt to move an existing versioned file to an existing
355
unversioned file in some other directory will fail, informing the user
356
to use the --after option to force this.
358
Setup: a1, a2, sub are versioned and in the working tree,
359
sub/a1, sub/a2 are in working tree.
360
User does: mv a* sub; touch a1; touch a2; bzr mv a1 a2 sub
362
self.build_tree(['a1', 'a2', 'sub/', 'sub/a1', 'sub/a2'])
363
tree = self.make_branch_and_tree('.')
364
tree.add(['a1', 'a2', 'sub'])
365
osutils.rename('a1', 'sub/a1')
366
osutils.rename('a2', 'sub/a2')
367
self.build_tree(['a1']) #touch a1
368
self.build_tree(['a2']) #touch a2
371
["^bzr: ERROR: Could not rename a1 => sub/a1 because both files"
372
" exist. \(Use --after to tell bzr about a rename that has already"
375
self.failUnlessExists('a1')
376
self.failUnlessExists('a2')
377
self.failUnlessExists('sub/a1')
378
self.failUnlessExists('sub/a2')
380
def test_mv_already_moved_files_using_after(self):
381
"""Test bzr mv --after versioned_file to directory/unversioned_file.
383
Tests if an existing versioned file can be forced to move to an
384
existing unversioned file in some other directory using the --after
385
option. With the result that bazaar considers
386
directory/unversioned_file to be moved from versioned_file and
387
versioned_file will become unversioned.
389
Setup: a1, a2, sub are versioned and in the working tree,
390
sub/a1, sub/a2 are in working tree.
391
User does: mv a* sub; touch a1; touch a2; bzr mv a1 a2 sub --after
393
self.build_tree(['a1', 'a2', 'sub/', 'sub/a1', 'sub/a2'])
394
tree = self.make_branch_and_tree('.')
395
tree.add(['a1', 'a2', 'sub'])
396
osutils.rename('a1', 'sub/a1')
397
osutils.rename('a2', 'sub/a2')
398
self.build_tree(['a1']) #touch a1
399
self.build_tree(['a2']) #touch a2
401
self.run_bzr('mv a1 a2 sub --after')
402
self.failUnlessExists('a1')
403
self.failUnlessExists('a2')
404
self.failUnlessExists('sub/a1')
405
self.failUnlessExists('sub/a2')
406
self.assertInWorkingTree('sub/a1')
407
self.assertInWorkingTree('sub/a2')
added
removed
bzrlib/tests/blackbox/test_mv.py
