← 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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-22 17:11:20 UTC
  • mfrom: (4398.8.10 1.16-commit-fulltext)
  • Revision ID: pqm@pqm.ubuntu.com-20090622171120-fuxez9ylfqpxynqn
(jam) Add VF._add_text and reduce memory overhead during commit (see
        bug #109114)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 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
18
18
 
19
19
import os
20
20
 
21
 
import bzrlib.branch
22
21
from bzrlib import (
23
22
    osutils,
24
23
    workingtree,
25
24
    )
26
25
 
27
26
from bzrlib.tests import (
28
 
    TestCaseWithTransport,
29
 
    )
30
 
from bzrlib.tests.features import (
31
27
    CaseInsensitiveFilesystemFeature,
32
28
    SymlinkFeature,
33
 
    UnicodeFilenameFeature,
 
29
    TestCaseWithTransport,
34
30
    )
35
31
 
36
32
 
38
34
 
39
35
    def assertMoved(self,from_path,to_path):
40
36
        """Assert that to_path is existing and versioned but from_path not. """
41
 
        self.assertPathDoesNotExist(from_path)
 
37
        self.failIfExists(from_path)
42
38
        self.assertNotInWorkingTree(from_path)
43
39
 
44
 
        self.assertPathExists(to_path)
 
40
        self.failUnlessExists(to_path)
45
41
        self.assertInWorkingTree(to_path)
46
42
 
47
43
    def test_mv_modes(self):
122
118
 
123
119
        os.chdir('sub1/sub2')
124
120
        self.run_bzr('mv ../hello.txt .')
125
 
        self.assertPathExists('./hello.txt')
 
121
        self.failUnlessExists('./hello.txt')
126
122
 
127
123
        os.chdir('..')
128
124
        self.run_bzr('mv sub2/hello.txt .')
232
228
            ["^bzr: ERROR: Could not move a => b. b is already versioned\.$"],
233
229
            'mv a b')
234
230
        #check that nothing changed
235
 
        self.assertPathDoesNotExist('a')
236
 
        self.assertPathExists('b')
 
231
        self.failIfExists('a')
 
232
        self.failUnlessExists('b')
237
233
 
238
234
    def test_mv_already_moved_file_into_subdir(self):
239
235
        """Test bzr mv original_file to versioned_directory/file.
267
263
        self.run_bzr_error(
268
264
            ["^bzr: ERROR: Could not move a => a: sub is not versioned\.$"],
269
265
            'mv a sub/a')
270
 
        self.assertPathDoesNotExist('a')
271
 
        self.assertPathExists('sub/a')
 
266
        self.failIfExists('a')
 
267
        self.failUnlessExists('sub/a')
272
268
 
273
269
    def test_mv_already_moved_files_into_subdir(self):
274
270
        """Test bzr mv original_files to versioned_directory.
303
299
        self.run_bzr_error(
304
300
            ["^bzr: ERROR: Could not move to sub. sub is not versioned\.$"],
305
301
            'mv a1 a2 sub')
306
 
        self.assertPathDoesNotExist('a1')
307
 
        self.assertPathExists('sub/a1')
308
 
        self.assertPathExists('a2')
309
 
        self.assertPathDoesNotExist('sub/a2')
 
302
        self.failIfExists('a1')
 
303
        self.failUnlessExists('sub/a1')
 
304
        self.failUnlessExists('a2')
 
305
        self.failIfExists('sub/a2')
310
306
 
311
307
    def test_mv_already_moved_file_forcing_after(self):
312
308
        """Test bzr mv versioned_file to unversioned_file.
328
324
             " \(Use --after to tell bzr about a rename that has already"
329
325
             " happened\)$"],
330
326
            'mv a b')
331
 
        self.assertPathExists('a')
332
 
        self.assertPathExists('b')
 
327
        self.failUnlessExists('a')
 
328
        self.failUnlessExists('b')
333
329
 
334
330
    def test_mv_already_moved_file_using_after(self):
335
331
        """Test bzr mv --after versioned_file to unversioned_file.
349
345
        self.build_tree(['a']) #touch a
350
346
 
351
347
        self.run_bzr('mv a b --after')
352
 
        self.assertPathExists('a')
 
348
        self.failUnlessExists('a')
353
349
        self.assertNotInWorkingTree('a')#a should be unknown now.
354
 
        self.assertPathExists('b')
 
350
        self.failUnlessExists('b')
355
351
        self.assertInWorkingTree('b')
356
352
 
357
353
    def test_mv_already_moved_files_forcing_after(self):
378
374
             " exist. \(Use --after to tell bzr about a rename that has already"
379
375
             " happened\)$"],
380
376
            'mv a1 a2 sub')
381
 
        self.assertPathExists('a1')
382
 
        self.assertPathExists('a2')
383
 
        self.assertPathExists('sub/a1')
384
 
        self.assertPathExists('sub/a2')
 
377
        self.failUnlessExists('a1')
 
378
        self.failUnlessExists('a2')
 
379
        self.failUnlessExists('sub/a1')
 
380
        self.failUnlessExists('sub/a2')
385
381
 
386
382
    def test_mv_already_moved_files_using_after(self):
387
383
        """Test bzr mv --after versioned_file to directory/unversioned_file.
405
401
        self.build_tree(['a2']) #touch a2
406
402
 
407
403
        self.run_bzr('mv a1 a2 sub --after')
408
 
        self.assertPathExists('a1')
409
 
        self.assertPathExists('a2')
410
 
        self.assertPathExists('sub/a1')
411
 
        self.assertPathExists('sub/a2')
 
404
        self.failUnlessExists('a1')
 
405
        self.failUnlessExists('a2')
 
406
        self.failUnlessExists('sub/a1')
 
407
        self.failUnlessExists('sub/a2')
412
408
        self.assertInWorkingTree('sub/a1')
413
409
        self.assertInWorkingTree('sub/a2')
414
410
 
424
420
        osutils.rename('c', 'd')
425
421
        # mv a b should work just like it does for already renamed files
426
422
        self.run_bzr('mv a b')
427
 
        self.assertPathDoesNotExist('a')
 
423
        self.failIfExists('a')
428
424
        self.assertNotInWorkingTree('a')
429
 
        self.assertPathExists('b')
 
425
        self.failUnlessExists('b')
430
426
        self.assertInWorkingTree('b')
431
427
        # and --after should work, too (technically it's ignored)
432
428
        self.run_bzr('mv --after c d')
433
 
        self.assertPathDoesNotExist('c')
 
429
        self.failIfExists('c')
434
430
        self.assertNotInWorkingTree('c')
435
 
        self.assertPathExists('d')
 
431
        self.failUnlessExists('d')
436
432
        self.assertInWorkingTree('d')
437
433
 
438
434
    def make_abcd_tree(self):
489
485
                                retcode=3)
490
486
        self.assertEqual('bzr: ERROR: --after cannot be specified with'
491
487
                         ' --auto.\n', err)
492
 
 
493
 
    def test_mv_quiet(self):
494
 
        tree = self.make_branch_and_tree('.')
495
 
        self.build_tree(['aaa'])
496
 
        tree.add(['aaa'])
497
 
        out, err = self.run_bzr('mv --quiet aaa bbb')
498
 
        self.assertEqual(out, '')
499
 
        self.assertEqual(err, '')
500
 
 
501
 
    def test_mv_readonly_lightweight_checkout(self):
502
 
        branch = self.make_branch('foo')
503
 
        branch = bzrlib.branch.Branch.open(self.get_readonly_url('foo'))
504
 
        tree = branch.create_checkout('tree', lightweight=True)
505
 
        self.build_tree(['tree/path'])
506
 
        tree.add('path')
507
 
        # If this fails, the tree is trying to acquire a branch lock, which it
508
 
        # shouldn't.
509
 
        self.run_bzr(['mv', 'tree/path', 'tree/path2'])
510
 
 
511
 
    def test_mv_unversioned_non_ascii(self):
512
 
        """Clear error on mv of an unversioned non-ascii file, see lp:707954"""
513
 
        self.requireFeature(UnicodeFilenameFeature)
514
 
        tree = self.make_branch_and_tree(".")
515
 
        self.build_tree([u"\xA7"])
516
 
        out, err = self.run_bzr_error(["Could not rename", "not versioned"],
517
 
            ["mv", u"\xA7", "b"])