/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: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_join.py
28
28
 
29
29
    def make_trees(self):
30
30
        base_tree = self.make_branch_and_tree('tree',
31
 
                                              format='development-subtree')
 
31
            format='development-subtree')
32
32
        base_tree.commit('empty commit')
33
33
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
34
34
        sub_tree = self.make_branch_and_tree('tree/subtree')
35
 
        sub_tree.add('file1', b'file1-id')
 
35
        sub_tree.set_root_id('subtree-root-id')
 
36
        sub_tree.add('file1', 'file1-id')
36
37
        sub_tree.commit('added file1')
37
38
        return base_tree, sub_tree
38
39
 
39
40
    def check_success(self, path):
40
41
        base_tree = workingtree.WorkingTree.open(path)
41
 
        self.assertEqual(b'file1-id', base_tree.path2id('subtree/file1'))
 
42
        self.assertEqual('file1-id', base_tree.path2id('subtree/file1'))
42
43
 
43
44
    def test_join(self):
44
45
        base_tree, sub_tree = self.make_trees()
56
57
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
57
58
        self.run_bzr_error(
58
59
            ('Cannot join .*subtree.  Parent directory is not versioned',),
59
 
            'join tree/subtree2/subtree')
 
60
             'join tree/subtree2/subtree')
60
61
        # disabled because this gives an ugly error at present -- mbp 20070306
61
 
        # self.run_bzr_error(
 
62
        ## self.run_bzr_error(
62
63
        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),
63
 
        # 'join', '--reference', 'tree/subtree2/subtree')
 
64
        ##      'join', '--reference', 'tree/subtree2/subtree')
64
65
        self.run_bzr_error(('Not a branch:.*subtree2',),
65
66
                           'join tree/subtree2')
66
67
 
67
68
    def test_join_reference(self):
68
69
        """Join can add a reference if --reference is supplied"""
69
70
        base_tree, sub_tree = self.make_trees()
70
 
        subtree_root_id = sub_tree.path2id('')
71
71
        self.run_bzr('join . --reference', working_dir='tree/subtree')
72
72
        sub_tree.lock_read()
73
73
        self.addCleanup(sub_tree.unlock)
74
 
        if sub_tree.supports_setting_file_ids():
75
 
            self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
76
 
            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
77
 
            self.assertEqual(subtree_root_id, sub_tree.path2id(''))
78
 
            self.assertEqual('', sub_tree.id2path(subtree_root_id))
79
 
            self.assertEqual(
80
 
                sub_tree.path2id('file1'), base_tree.path2id('subtree/file1'))
81
 
 
 
74
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
 
75
        self.assertTrue(sub_tree.has_id('file1-id'))
 
76
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
 
77
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
 
78
        self.assertIs(None, base_tree.path2id('subtree/file1'))
82
79
        base_tree.lock_read()
83
80
        self.addCleanup(base_tree.unlock)
84
 
        self.assertEqual(['subtree'], list(base_tree.iter_references()))
85
 
        if base_tree.supports_setting_file_ids():
86
 
            self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
87
 
            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
88
 
            self.assertEqual(subtree_root_id, base_tree.path2id('subtree'))
89
 
            self.assertEqual('subtree', base_tree.id2path(subtree_root_id))
 
81
        self.assertFalse(base_tree.has_id('file1-id'))
 
82
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
 
83
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
90
84
 
91
85
    def test_references_check_repository_support(self):
92
86
        """Users are stopped from adding a reference that can't be committed."""