/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-02 20:37:44 UTC
  • mfrom: (7025 work)
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180702203744-3i0bimk0r5pfzjzl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
374
374
        self.addCleanup(self.wt.unlock)
375
375
        trans_id = transform.new_file('name', root, [b'contents'],
376
376
                                      b'my_pretties', True)
377
 
        oz = transform.new_directory('oz', root, 'oz-id')
 
377
        oz = transform.new_directory('oz', root, b'oz-id')
378
378
        dorothy = transform.new_directory('dorothy', oz, b'dorothy-id')
379
379
        toto = transform.new_file('toto', dorothy, [b'toto-contents'],
380
380
                                  b'toto-id', False)
397
397
    def test_tree_reference(self):
398
398
        transform, root = self.get_transform()
399
399
        tree = transform._tree
400
 
        trans_id = transform.new_directory('reference', root, 'subtree-id')
 
400
        trans_id = transform.new_directory('reference', root, b'subtree-id')
401
401
        transform.set_tree_reference('subtree-revision', trans_id)
402
402
        transform.apply()
403
403
        tree.lock_read()
404
404
        self.addCleanup(tree.unlock)
405
 
        self.assertEqual('subtree-revision',
406
 
                         tree.root_inventory.get_entry('subtree-id').reference_revision)
 
405
        self.assertEqual(b'subtree-revision',
 
406
                         tree.root_inventory.get_entry(b'subtree-id').reference_revision)
407
407
 
408
408
    def test_conflicts(self):
409
409
        transform, root = self.get_transform()
694
694
 
695
695
    def test_both_rename2(self):
696
696
        create_tree, root = self.get_transform()
697
 
        breezy = create_tree.new_directory('breezy', root, 'breezy-id')
698
 
        tests = create_tree.new_directory('tests', breezy, 'tests-id')
699
 
        blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
 
697
        breezy = create_tree.new_directory('breezy', root, b'breezy-id')
 
698
        tests = create_tree.new_directory('tests', breezy, b'tests-id')
 
699
        blackbox = create_tree.new_directory('blackbox', tests, b'blackbox-id')
700
700
        create_tree.new_file('test_too_much.py', blackbox, [b'hello1'],
701
701
                             b'test_too_much-id')
702
702
        create_tree.apply()
847
847
        self.assertEqual(conflicts.final_name(old_dorothy), 'dorothy.moved')
848
848
        self.assertIs(conflicts.final_file_id(old_dorothy), None)
849
849
        self.assertEqual(conflicts.final_name(new_dorothy), 'dorothy')
850
 
        self.assertEqual(conflicts.final_file_id(new_dorothy), 'dorothy-id')
 
850
        self.assertEqual(conflicts.final_file_id(new_dorothy), b'dorothy-id')
851
851
        self.assertEqual(conflicts.final_parent(emerald), oz)
852
852
        conflicts.apply()
853
853
 
929
929
        b'parent-id')], cooked_conflicts)
930
930
        tt.apply()
931
931
        self.assertFalse(self.wt.is_versioned('parent'))
932
 
        self.assertEqual('parent-id', self.wt.path2id('parent.new'))
 
932
        self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
933
933
 
934
934
    def test_resolve_conflicts_wrong_new_parent_kind(self):
935
935
        tt, root = self.get_transform()
978
978
 
979
979
    def test_moving_versioned_directories(self):
980
980
        create, root = self.get_transform()
981
 
        kansas = create.new_directory('kansas', root, 'kansas-id')
982
 
        create.new_directory('house', kansas, 'house-id')
983
 
        create.new_directory('oz', root, 'oz-id')
 
981
        kansas = create.new_directory('kansas', root, b'kansas-id')
 
982
        create.new_directory('house', kansas, b'house-id')
 
983
        create.new_directory('oz', root, b'oz-id')
984
984
        create.apply()
985
985
        cyclone, root = self.get_transform()
986
986
        oz = cyclone.trans_id_tree_path('oz')
1163
1163
    def test_iter_changes_modifications(self):
1164
1164
        self.wt.set_root_id(b'eert_toor')
1165
1165
        transform, root = self.get_transform()
1166
 
        transform.new_file('old', root, [b'blah'], 'id-1')
 
1166
        transform.new_file('old', root, [b'blah'], b'id-1')
1167
1167
        transform.new_file('new', root, [b'blah'])
1168
 
        transform.new_directory('subdir', root, 'subdir-id')
 
1168
        transform.new_directory('subdir', root, b'subdir-id')
1169
1169
        transform.apply()
1170
1170
        transform, root = self.get_transform()
1171
1171
        try:
2322
2322
        self.addCleanup(branch.unlock)
2323
2323
        tt = TransformPreview(branch.basis_tree())
2324
2324
        self.addCleanup(tt.finalize)
2325
 
        tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
 
2325
        tt.new_directory('', ROOT_PARENT, b'TREE_ROOT')
2326
2326
        rev = tt.commit(branch, 'my message')
2327
2327
        self.assertEqual([], branch.basis_tree().get_parent_ids())
2328
2328
        self.assertNotEqual(_mod_revision.NULL_REVISION,
2820
2820
        preview = TransformPreview(revision_tree)
2821
2821
        self.addCleanup(preview.finalize)
2822
2822
        preview.new_file('file', preview.root, [b'contents'], b'file-id')
2823
 
        preview.new_directory('directory', preview.root, 'dir-id')
 
2823
        preview.new_directory('directory', preview.root, b'dir-id')
2824
2824
        preview_tree = preview.get_preview_tree()
2825
2825
        self.assertEqual('file', preview_tree.kind('file'))
2826
2826
        self.assertEqual('directory', preview_tree.kind('directory'))
2868
2868
    def test_get_symlink_target(self):
2869
2869
        self.requireFeature(SymlinkFeature)
2870
2870
        preview = self.get_empty_preview()
2871
 
        preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
 
2871
        preview.new_symlink('symlink', preview.root, 'target', b'symlink-id')
2872
2872
        preview_tree = preview.get_preview_tree()
2873
2873
        self.assertEqual('target',
2874
2874
                         preview_tree.get_symlink_target('symlink'))