/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: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_join.py
67
67
    def test_join_reference(self):
68
68
        """Join can add a reference if --reference is supplied"""
69
69
        base_tree, sub_tree = self.make_trees()
70
 
        subtree_root_id = sub_tree.path2id('')
 
70
        subtree_root_id = sub_tree.get_root_id()
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(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))
 
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(b'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."""