← Back to branch summary

~jelmer/brz/bundle-webdav

« back to all changes in this revision

Viewing changes to breezy/tests/test_transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-13 00:34:53 UTC
  • mfrom: (7027.3.8 python3-n)
  • Revision ID: breezy.the.bot@gmail.com-20180713003453-3wofrh7brng5jz3l
Add some more bees; support writing both bytes and unicode strings in build_tree_contents.

Merged from https://code.launchpad.net/~jelmer/brz/python3-n/+merge/349091

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
384
384
        self.assertRaises(ReusingTransform, transform.find_conflicts)
385
385
        with open(self.wt.abspath('name'), 'r') as f:
386
386
            self.assertEqual('contents', f.read())
387
 
        self.assertEqual(self.wt.path2id('name'), 'my_pretties')
 
387
        self.assertEqual(self.wt.path2id('name'), b'my_pretties')
388
388
        self.assertIs(self.wt.is_executable('name'), True)
389
389
        self.assertEqual(self.wt.path2id('oz'), b'oz-id')
390
390
        self.assertEqual(self.wt.path2id('oz/dorothy'), b'dorothy-id')
398
398
        transform, root = self.get_transform()
399
399
        tree = transform._tree
400
400
        trans_id = transform.new_directory('reference', root, b'subtree-id')
401
 
        transform.set_tree_reference('subtree-revision', trans_id)
 
401
        transform.set_tree_reference(b'subtree-revision', trans_id)
402
402
        transform.apply()
403
403
        tree.lock_read()
404
404
        self.addCleanup(tree.unlock)
602
602
 
603
603
    def test_add_del(self):
604
604
        start, root = self.get_transform()
605
 
        start.new_directory('a', root, 'a')
 
605
        start.new_directory('a', root, b'a')
606
606
        start.apply()
607
607
        transform, root = self.get_transform()
608
608
        transform.delete_versioned(transform.trans_id_tree_path('a'))
609
 
        transform.new_directory('a', root, 'a')
 
609
        transform.new_directory('a', root, b'a')
610
610
        transform.apply()
611
611
 
612
612
    def test_unversioning(self):
654
654
        mangle_tree.adjust_path('mfile', root, mfile)
655
655
 
656
656
        #tests for adding parent directories
657
 
        newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
 
657
        newdir = mangle_tree.new_directory('new_directory', root, b'newdir')
658
658
        mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
659
659
        mangle_tree.adjust_path('mfile2', newdir, mfile2)
660
660
        mangle_tree.new_file('newfile', newdir, [b'hello3'], b'dfile')
735
735
        delete_contents.apply()
736
736
        move_id, root = self.get_transform()
737
737
        name1 = move_id.trans_id_tree_path('name1')
738
 
        newdir = move_id.new_directory('dir', root, 'newdir')
 
738
        newdir = move_id.new_directory('dir', root, b'newdir')
739
739
        move_id.adjust_path('name2', newdir, name1)
740
740
        move_id.apply()
741
741
 
2312
2312
 
2313
2313
    def test_merge_parents(self):
2314
2314
        branch, tt = self.get_branch_and_transform()
2315
 
        rev = tt.commit(branch, 'my message', ['rev1b', 'rev1c'])
2316
 
        self.assertEqual(['rev1b', 'rev1c'],
 
2315
        rev = tt.commit(branch, 'my message', [b'rev1b', b'rev1c'])
 
2316
        self.assertEqual([b'rev1b', b'rev1c'],
2317
2317
                         branch.basis_tree().get_parent_ids()[1:])
2318
2318
 
2319
2319
    def test_first_commit(self):
2335
2335
        tt = TransformPreview(branch.basis_tree())
2336
2336
        self.addCleanup(tt.finalize)
2337
2337
        e = self.assertRaises(ValueError, tt.commit, branch,
2338
 
                          'my message', ['rev1b-id'])
 
2338
                          'my message', [b'rev1b-id'])
2339
2339
        self.assertEqual('Cannot supply merge parents for first commit.',
2340
2340
                         str(e))
2341
2341
        self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
3055
3055
    def test_tree_content_summary(self):
3056
3056
        preview = self.get_empty_preview()
3057
3057
        path = preview.new_directory('path', preview.root, b'path-id')
3058
 
        preview.set_tree_reference('rev-1', path)
 
3058
        preview.set_tree_reference(b'rev-1', path)
3059
3059
        summary = preview.get_preview_tree().path_content_summary('path')
3060
3060
        self.assertEqual(4, len(summary))
3061
3061
        self.assertEqual('tree-reference', summary[0])
3103
3103
        preview.adjust_path('newname', preview.root, file_trans_id)
3104
3104
        preview_tree = preview.get_preview_tree()
3105
3105
        expected = [
3106
 
            ('one', 'a\n'),
 
3106
            (b'one', b'a\n'),
3107
3107
        ]
3108
3108
        annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
3109
3109
        self.assertEqual(expected, annotation)