/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/blackbox/test_join.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-18 18:23:32 UTC
  • mto: This revision was merged to the branch mainline in revision 7197.
  • Revision ID: jelmer@jelmer.uk-20181118182332-viz1qvqese2mo9i6
Fix some more Bazaar references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_join.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import (
21
 
    bzrdir,
 
20
from breezy import (
22
21
    osutils,
23
 
    repository,
24
22
    tests,
25
23
    workingtree,
26
24
    )
30
28
 
31
29
    def make_trees(self):
32
30
        base_tree = self.make_branch_and_tree('tree',
33
 
            format='dirstate-with-subtree')
 
31
                                              format='development-subtree')
34
32
        base_tree.commit('empty commit')
35
33
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
36
34
        sub_tree = self.make_branch_and_tree('tree/subtree')
37
 
        sub_tree.set_root_id('subtree-root-id')
38
 
        sub_tree.add('file1', 'file1-id')
 
35
        sub_tree.add('file1', b'file1-id')
39
36
        sub_tree.commit('added file1')
40
37
        return base_tree, sub_tree
41
38
 
42
39
    def check_success(self, path):
43
40
        base_tree = workingtree.WorkingTree.open(path)
44
 
        self.assertEqual('file1-id', base_tree.path2id('subtree/file1'))
 
41
        self.assertEqual(b'file1-id', base_tree.path2id('subtree/file1'))
45
42
 
46
43
    def test_join(self):
47
44
        base_tree, sub_tree = self.make_trees()
59
56
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
60
57
        self.run_bzr_error(
61
58
            ('Cannot join .*subtree.  Parent directory is not versioned',),
62
 
             'join tree/subtree2/subtree')
 
59
            'join tree/subtree2/subtree')
63
60
        # disabled because this gives an ugly error at present -- mbp 20070306
64
 
        ## self.run_bzr_error(
 
61
        # self.run_bzr_error(
65
62
        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),
66
 
        ##      'join', '--reference', 'tree/subtree2/subtree')
 
63
        # 'join', '--reference', 'tree/subtree2/subtree')
67
64
        self.run_bzr_error(('Not a branch:.*subtree2',),
68
65
                           'join tree/subtree2')
69
66
 
70
67
    def test_join_reference(self):
71
68
        """Join can add a reference if --reference is supplied"""
72
69
        base_tree, sub_tree = self.make_trees()
 
70
        subtree_root_id = sub_tree.get_root_id()
73
71
        self.run_bzr('join . --reference', working_dir='tree/subtree')
74
72
        sub_tree.lock_read()
75
73
        self.addCleanup(sub_tree.unlock)
76
 
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
77
 
        self.assertTrue('file1-id' in sub_tree)
78
 
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
79
 
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
 
74
        self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
 
75
        self.assertTrue(sub_tree.has_id(b'file1-id'))
 
76
        self.assertEqual(subtree_root_id, sub_tree.path2id(''))
 
77
        self.assertEqual('', sub_tree.id2path(subtree_root_id))
80
78
        self.assertIs(None, base_tree.path2id('subtree/file1'))
81
79
        base_tree.lock_read()
82
80
        self.addCleanup(base_tree.unlock)
83
 
        self.assertTrue('file1-id' not in base_tree)
84
 
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
85
 
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
 
81
        self.assertFalse(base_tree.has_id(b'file1-id'))
 
82
        self.assertEqual(subtree_root_id, base_tree.path2id('subtree'))
 
83
        self.assertEqual('subtree', base_tree.id2path(subtree_root_id))
86
84
 
87
85
    def test_references_check_repository_support(self):
88
86
        """Users are stopped from adding a reference that can't be committed."""
94
92
        out, err = self.run_bzr('join --reference tree/subtree',
95
93
                                retcode=3)
96
94
        self.assertContainsRe(err, r"Can't join trees")
97
 
        self.assertContainsRe(err, r"use bzr upgrade")
98
 
 
99
 
 
 
95
        self.assertContainsRe(err, r"use brz upgrade")