← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

(jelmer) Remove config argument from VersionedFileRepository.add_revision()
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
1
 
# Copyright (C) 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
"""Test for 'bzr mv'"""
18
18
 
19
19
import os
20
20
 
 
21
import bzrlib.branch
21
22
from bzrlib import (
22
23
    osutils,
23
24
    workingtree,
25
26
 
26
27
from bzrlib.tests import (
27
28
    TestCaseWithTransport,
28
 
    TestSkipped,
 
29
    )
 
30
from bzrlib.tests.features import (
 
31
    CaseInsensitiveFilesystemFeature,
 
32
    SymlinkFeature,
 
33
    UnicodeFilenameFeature,
29
34
    )
30
35
 
31
36
 
33
38
 
34
39
    def assertMoved(self,from_path,to_path):
35
40
        """Assert that to_path is existing and versioned but from_path not. """
36
 
        self.failIfExists(from_path)
 
41
        self.assertPathDoesNotExist(from_path)
37
42
        self.assertNotInWorkingTree(from_path)
38
43
 
39
 
        self.failUnlessExists(to_path)
 
44
        self.assertPathExists(to_path)
40
45
        self.assertInWorkingTree(to_path)
41
46
 
42
47
    def test_mv_modes(self):
76
81
 
77
82
    def test_mv_unqualified(self):
78
83
        self.run_bzr_error(['^bzr: ERROR: missing file argument$'], 'mv')
79
 
        
 
84
 
80
85
    def test_mv_invalid(self):
81
86
        tree = self.make_branch_and_tree('.')
82
87
        self.build_tree(['test.txt', 'sub1/'])
90
95
            ["^bzr: ERROR: Could not move test.txt => .*hello.txt: "
91
96
             "sub1 is not versioned\.$"],
92
97
            'mv test.txt sub1/hello.txt')
93
 
        
 
98
 
94
99
    def test_mv_dirs(self):
95
100
        tree = self.make_branch_and_tree('.')
96
101
        self.build_tree(['hello.txt', 'sub1/'])
117
122
 
118
123
        os.chdir('sub1/sub2')
119
124
        self.run_bzr('mv ../hello.txt .')
120
 
        self.failUnlessExists('./hello.txt')
 
125
        self.assertPathExists('./hello.txt')
121
126
 
122
127
        os.chdir('..')
123
128
        self.run_bzr('mv sub2/hello.txt .')
124
129
        os.chdir('..')
125
130
        self.assertMoved('sub1/sub2/hello.txt','sub1/hello.txt')
126
131
 
 
132
    def test_mv_change_case_file(self):
 
133
        # test for bug #77740 (mv unable change filename case on Windows)
 
134
        tree = self.make_branch_and_tree('.')
 
135
        self.build_tree(['test.txt'])
 
136
        tree.add(['test.txt'])
 
137
        self.run_bzr('mv test.txt Test.txt')
 
138
        # we can't use failUnlessExists on case-insensitive filesystem
 
139
        # so try to check shape of the tree
 
140
        shape = sorted(os.listdir(u'.'))
 
141
        self.assertEqual(['.bzr', 'Test.txt'], shape)
 
142
        self.assertInWorkingTree('Test.txt')
 
143
        self.assertNotInWorkingTree('test.txt')
 
144
 
 
145
    def test_mv_change_case_dir(self):
 
146
        tree = self.make_branch_and_tree('.')
 
147
        self.build_tree(['foo/'])
 
148
        tree.add(['foo'])
 
149
        self.run_bzr('mv foo Foo')
 
150
        # we can't use failUnlessExists on case-insensitive filesystem
 
151
        # so try to check shape of the tree
 
152
        shape = sorted(os.listdir(u'.'))
 
153
        self.assertEqual(['.bzr', 'Foo'], shape)
 
154
        self.assertInWorkingTree('Foo')
 
155
        self.assertNotInWorkingTree('foo')
 
156
 
 
157
    def test_mv_change_case_dir_w_files(self):
 
158
        tree = self.make_branch_and_tree('.')
 
159
        self.build_tree(['foo/', 'foo/bar'])
 
160
        tree.add(['foo'])
 
161
        self.run_bzr('mv foo Foo')
 
162
        # we can't use failUnlessExists on case-insensitive filesystem
 
163
        # so try to check shape of the tree
 
164
        shape = sorted(os.listdir(u'.'))
 
165
        self.assertEqual(['.bzr', 'Foo'], shape)
 
166
        self.assertInWorkingTree('Foo')
 
167
        self.assertNotInWorkingTree('foo')
 
168
 
 
169
    def test_mv_file_to_wrong_case_dir(self):
 
170
        self.requireFeature(CaseInsensitiveFilesystemFeature)
 
171
        tree = self.make_branch_and_tree('.')
 
172
        self.build_tree(['foo/', 'bar'])
 
173
        tree.add(['foo', 'bar'])
 
174
        out, err = self.run_bzr('mv bar Foo', retcode=3)
 
175
        self.assertEquals('', out)
 
176
        self.assertEquals(
 
177
            'bzr: ERROR: Could not move to Foo: Foo is not versioned.\n',
 
178
            err)
 
179
 
127
180
    def test_mv_smoke_aliases(self):
128
181
        # just test that aliases for mv exist, if their behaviour is changed in
129
182
        # the future, then extend the tests.
134
187
        self.run_bzr('move a b')
135
188
        self.run_bzr('rename b a')
136
189
 
 
190
    def test_mv_no_root(self):
 
191
        tree = self.make_branch_and_tree('.')
 
192
        self.run_bzr_error(
 
193
            ["bzr: ERROR: can not move root of branch"],
 
194
            'mv . a')
 
195
 
137
196
    def test_mv_through_symlinks(self):
138
 
        if not osutils.has_symlinks():
139
 
            raise TestSkipped('Symlinks are not supported on this platform')
 
197
        self.requireFeature(SymlinkFeature)
140
198
        tree = self.make_branch_and_tree('.')
141
199
        self.build_tree(['a/', 'a/b'])
142
200
        os.symlink('a', 'c')
180
238
            ["^bzr: ERROR: Could not move a => b. b is already versioned\.$"],
181
239
            'mv a b')
182
240
        #check that nothing changed
183
 
        self.failIfExists('a')
184
 
        self.failUnlessExists('b')
 
241
        self.assertPathDoesNotExist('a')
 
242
        self.assertPathExists('b')
185
243
 
186
244
    def test_mv_already_moved_file_into_subdir(self):
187
245
        """Test bzr mv original_file to versioned_directory/file.
215
273
        self.run_bzr_error(
216
274
            ["^bzr: ERROR: Could not move a => a: sub is not versioned\.$"],
217
275
            'mv a sub/a')
218
 
        self.failIfExists('a')
219
 
        self.failUnlessExists('sub/a')
 
276
        self.assertPathDoesNotExist('a')
 
277
        self.assertPathExists('sub/a')
220
278
 
221
279
    def test_mv_already_moved_files_into_subdir(self):
222
280
        """Test bzr mv original_files to versioned_directory.
251
309
        self.run_bzr_error(
252
310
            ["^bzr: ERROR: Could not move to sub. sub is not versioned\.$"],
253
311
            'mv a1 a2 sub')
254
 
        self.failIfExists('a1')
255
 
        self.failUnlessExists('sub/a1')
256
 
        self.failUnlessExists('a2')
257
 
        self.failIfExists('sub/a2')
 
312
        self.assertPathDoesNotExist('a1')
 
313
        self.assertPathExists('sub/a1')
 
314
        self.assertPathExists('a2')
 
315
        self.assertPathDoesNotExist('sub/a2')
258
316
 
259
317
    def test_mv_already_moved_file_forcing_after(self):
260
318
        """Test bzr mv versioned_file to unversioned_file.
273
331
        self.build_tree(['a']) #touch a
274
332
        self.run_bzr_error(
275
333
            ["^bzr: ERROR: Could not rename a => b because both files exist."
276
 
             " \(Use --after to update the Bazaar id\)$"],
 
334
             " \(Use --after to tell bzr about a rename that has already"
 
335
             " happened\)$"],
277
336
            'mv a b')
278
 
        self.failUnlessExists('a')
279
 
        self.failUnlessExists('b')
 
337
        self.assertPathExists('a')
 
338
        self.assertPathExists('b')
280
339
 
281
340
    def test_mv_already_moved_file_using_after(self):
282
341
        """Test bzr mv --after versioned_file to unversioned_file.
296
355
        self.build_tree(['a']) #touch a
297
356
 
298
357
        self.run_bzr('mv a b --after')
299
 
        self.failUnlessExists('a')
 
358
        self.assertPathExists('a')
300
359
        self.assertNotInWorkingTree('a')#a should be unknown now.
301
 
        self.failUnlessExists('b')
 
360
        self.assertPathExists('b')
302
361
        self.assertInWorkingTree('b')
303
362
 
304
363
    def test_mv_already_moved_files_forcing_after(self):
321
380
        self.build_tree(['a2']) #touch a2
322
381
 
323
382
        self.run_bzr_error(
324
 
            ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files exist."
325
 
             " \(Use --after to update the Bazaar id\)$"],
 
383
            ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files"
 
384
             " exist. \(Use --after to tell bzr about a rename that has already"
 
385
             " happened\)$"],
326
386
            'mv a1 a2 sub')
327
 
        self.failUnlessExists('a1')
328
 
        self.failUnlessExists('a2')
329
 
        self.failUnlessExists('sub/a1')
330
 
        self.failUnlessExists('sub/a2')
 
387
        self.assertPathExists('a1')
 
388
        self.assertPathExists('a2')
 
389
        self.assertPathExists('sub/a1')
 
390
        self.assertPathExists('sub/a2')
331
391
 
332
392
    def test_mv_already_moved_files_using_after(self):
333
393
        """Test bzr mv --after versioned_file to directory/unversioned_file.
351
411
        self.build_tree(['a2']) #touch a2
352
412
 
353
413
        self.run_bzr('mv a1 a2 sub --after')
354
 
        self.failUnlessExists('a1')
355
 
        self.failUnlessExists('a2')
356
 
        self.failUnlessExists('sub/a1')
357
 
        self.failUnlessExists('sub/a2')
 
414
        self.assertPathExists('a1')
 
415
        self.assertPathExists('a2')
 
416
        self.assertPathExists('sub/a1')
 
417
        self.assertPathExists('sub/a2')
358
418
        self.assertInWorkingTree('sub/a1')
359
419
        self.assertInWorkingTree('sub/a2')
 
420
 
 
421
    def test_mv_already_moved_directory(self):
 
422
        """Use `bzr mv a b` to mark a directory as renamed.
 
423
 
 
424
        https://bugs.launchpad.net/bzr/+bug/107967/
 
425
        """
 
426
        self.build_tree(['a/', 'c/'])
 
427
        tree = self.make_branch_and_tree('.')
 
428
        tree.add(['a', 'c'])
 
429
        osutils.rename('a', 'b')
 
430
        osutils.rename('c', 'd')
 
431
        # mv a b should work just like it does for already renamed files
 
432
        self.run_bzr('mv a b')
 
433
        self.assertPathDoesNotExist('a')
 
434
        self.assertNotInWorkingTree('a')
 
435
        self.assertPathExists('b')
 
436
        self.assertInWorkingTree('b')
 
437
        # and --after should work, too (technically it's ignored)
 
438
        self.run_bzr('mv --after c d')
 
439
        self.assertPathDoesNotExist('c')
 
440
        self.assertNotInWorkingTree('c')
 
441
        self.assertPathExists('d')
 
442
        self.assertInWorkingTree('d')
 
443
 
 
444
    def make_abcd_tree(self):
 
445
        tree = self.make_branch_and_tree('tree')
 
446
        self.build_tree(['tree/a', 'tree/c'])
 
447
        tree.add(['a', 'c'])
 
448
        tree.commit('record old names')
 
449
        osutils.rename('tree/a', 'tree/b')
 
450
        osutils.rename('tree/c', 'tree/d')
 
451
        return tree
 
452
 
 
453
    def test_mv_auto(self):
 
454
        self.make_abcd_tree()
 
455
        out, err = self.run_bzr('mv --auto', working_dir='tree')
 
456
        self.assertEqual(out, '')
 
457
        self.assertEqual(err, 'a => b\nc => d\n')
 
458
        tree = workingtree.WorkingTree.open('tree')
 
459
        self.assertIsNot(None, tree.path2id('b'))
 
460
        self.assertIsNot(None, tree.path2id('d'))
 
461
 
 
462
    def test_mv_auto_one_path(self):
 
463
        self.make_abcd_tree()
 
464
        out, err = self.run_bzr('mv --auto tree')
 
465
        self.assertEqual(out, '')
 
466
        self.assertEqual(err, 'a => b\nc => d\n')
 
467
        tree = workingtree.WorkingTree.open('tree')
 
468
        self.assertIsNot(None, tree.path2id('b'))
 
469
        self.assertIsNot(None, tree.path2id('d'))
 
470
 
 
471
    def test_mv_auto_two_paths(self):
 
472
        self.make_abcd_tree()
 
473
        out, err = self.run_bzr('mv --auto tree tree2', retcode=3)
 
474
        self.assertEqual('bzr: ERROR: Only one path may be specified to'
 
475
                         ' --auto.\n', err)
 
476
 
 
477
    def test_mv_auto_dry_run(self):
 
478
        self.make_abcd_tree()
 
479
        out, err = self.run_bzr('mv --auto --dry-run', working_dir='tree')
 
480
        self.assertEqual(out, '')
 
481
        self.assertEqual(err, 'a => b\nc => d\n')
 
482
        tree = workingtree.WorkingTree.open('tree')
 
483
        self.assertIsNot(None, tree.path2id('a'))
 
484
        self.assertIsNot(None, tree.path2id('c'))
 
485
 
 
486
    def test_mv_no_auto_dry_run(self):
 
487
        self.make_abcd_tree()
 
488
        out, err = self.run_bzr('mv c d --dry-run',
 
489
                                working_dir='tree', retcode=3)
 
490
        self.assertEqual('bzr: ERROR: --dry-run requires --auto.\n', err)
 
491
 
 
492
    def test_mv_auto_after(self):
 
493
        self.make_abcd_tree()
 
494
        out, err = self.run_bzr('mv --auto --after', working_dir='tree',
 
495
                                retcode=3)
 
496
        self.assertEqual('bzr: ERROR: --after cannot be specified with'
 
497
                         ' --auto.\n', err)
 
498
 
 
499
    def test_mv_quiet(self):
 
500
        tree = self.make_branch_and_tree('.')
 
501
        self.build_tree(['aaa'])
 
502
        tree.add(['aaa'])
 
503
        out, err = self.run_bzr('mv --quiet aaa bbb')
 
504
        self.assertEqual(out, '')
 
505
        self.assertEqual(err, '')
 
506
 
 
507
    def test_mv_readonly_lightweight_checkout(self):
 
508
        branch = self.make_branch('foo')
 
509
        branch = bzrlib.branch.Branch.open(self.get_readonly_url('foo'))
 
510
        tree = branch.create_checkout('tree', lightweight=True)
 
511
        self.build_tree(['tree/path'])
 
512
        tree.add('path')
 
513
        # If this fails, the tree is trying to acquire a branch lock, which it
 
514
        # shouldn't.
 
515
        self.run_bzr(['mv', 'tree/path', 'tree/path2'])
 
516
 
 
517
    def test_mv_unversioned_non_ascii(self):
 
518
        """Clear error on mv of an unversioned non-ascii file, see lp:707954"""
 
519
        self.requireFeature(UnicodeFilenameFeature)
 
520
        tree = self.make_branch_and_tree(".")
 
521
        self.build_tree([u"\xA7"])
 
522
        out, err = self.run_bzr_error(["Could not rename", "not versioned"],
 
523
            ["mv", u"\xA7", "b"])
 
524
 
 
525
    def test_mv_removed_non_ascii(self):
 
526
        """Clear error on mv of a removed non-ascii file, see lp:898541"""
 
527
        self.requireFeature(UnicodeFilenameFeature)
 
528
        tree = self.make_branch_and_tree(".")
 
529
        self.build_tree([u"\xA7"])
 
530
        tree.add([u"\xA7"])
 
531
        tree.commit(u"Adding \xA7")
 
532
        os.remove(u"\xA7")
 
533
        out, err = self.run_bzr_error(["Could not rename", "not exist"],
 
534
            ["mv", u"\xA7", "b"])