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
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'))
74
if sub_tree.supports_setting_file_ids():
75
self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
76
self.assertTrue(sub_tree.has_id(b'file1-id'))
77
self.assertEqual(subtree_root_id, sub_tree.path2id(''))
78
self.assertEqual('', sub_tree.id2path(subtree_root_id))
79
self.assertIs(None, base_tree.path2id('subtree/file1'))
79
81
base_tree.lock_read()
80
82
self.addCleanup(base_tree.unlock)
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))
83
self.assertEqual(['subtree'], list(base_tree.iter_references()))
84
if base_tree.supports_setting_file_ids():
85
self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
86
self.assertFalse(base_tree.has_id(b'file1-id'))
87
self.assertEqual(subtree_root_id, base_tree.path2id('subtree'))
88
self.assertEqual('subtree', base_tree.id2path(subtree_root_id))
85
90
def test_references_check_repository_support(self):
86
91
"""Users are stopped from adding a reference that can't be committed."""
added
removed
breezy/tests/blackbox/test_join.py
