Merge lp:~jelmer/brz/get-root-id into lp:brz

[Jelmer Vernooij]

Remove Tree.get_root_id() in favour of Tree.path2id('').

Remove Tree.get_root_id() in favour of Tree.path2id('').

This is a mechanical change, just s/get_root_id()/path2id('')/.

[Martin Packman (gz)]

Fast eyeball of the diff, everything looks sane.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/461/

=== modified file 'breezy/bzr/bundle/bundle_data.py'
--- breezy/bzr/bundle/bundle_data.py	2019-06-30 10:50:40 +0000
+++ breezy/bzr/bundle/bundle_data.py	2019-07-25 23:25:31 +0000
@@ -579,9 +579,6 @@
             return None
         return new_path
 
-    def get_root_id(self):
-        return self.path2id('')
-
     def path2id(self, path):
         """Return the id of the file present at path in the target tree."""
         file_id = self._new_id.get(path)
@@ -629,7 +626,7 @@
         file_id = self.path2id(path)
         base_id = self.old_contents_id(file_id)
         if (base_id is not None and
-                base_id != self.base_tree.get_root_id()):
+                base_id != self.base_tree.path2id('')):
             old_path = self.base_tree.id2path(base_id)
             patch_original = self.base_tree.get_file(old_path)
         else:
 
=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2019-06-21 16:36:04 +0000
+++ breezy/bzr/bzrdir.py	2019-07-25 23:25:31 +0000
@@ -459,7 +459,7 @@
             with wt.lock_write():
                 if not wt.is_versioned(''):
                     try:
-                        wt.set_root_id(self.open_workingtree.get_root_id())
+                        wt.set_root_id(self.open_workingtree.path2id(''))
                     except errors.NoWorkingTree:
                         pass
         else:
 
=== modified file 'breezy/bzr/fetch.py'
--- breezy/bzr/fetch.py	2018-11-16 18:33:17 +0000
+++ breezy/bzr/fetch.py	2019-07-25 23:25:31 +0000
@@ -211,7 +211,7 @@
     def _find_root_ids(self, revs, parent_map, graph):
         revision_root = {}
         for tree in self.iter_rev_trees(revs):
-            root_id = tree.get_root_id()
+            root_id = tree.path2id('')
             revision_id = tree.get_file_revision(u'')
             revision_root[revision_id] = root_id
         # Find out which parents we don't already know root ids for
@@ -221,7 +221,7 @@
         # Limit to revisions present in the versionedfile
         parents = graph.get_parent_map(parents)
         for tree in self.iter_rev_trees(parents):
-            root_id = tree.get_root_id()
+            root_id = tree.path2id('')
             revision_root[tree.get_revision_id()] = root_id
         return revision_root
 
@@ -296,7 +296,7 @@
                 # But set parent_root_id to None since we don't really know
                 parent_root_id = None
             else:
-                parent_root_id = tree.get_root_id()
+                parent_root_id = tree.path2id('')
             rev_id_to_root_id_map[parent_id] = None
             # XXX: why not:
             #   rev_id_to_root_id_map[parent_id] = parent_root_id
 
=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2019-06-29 12:29:45 +0000
+++ breezy/bzr/inventorytree.py	2019-07-25 23:25:31 +0000
@@ -778,10 +778,6 @@
         nested_revid = self.get_reference_revision(path)
         raise MissingNestedTree(path)
 
-    def get_root_id(self):
-        if self.root_inventory.root:
-            return self.root_inventory.root.file_id
-
     def kind(self, path):
         return self._path2ie(path).kind
 
 
=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2019-06-30 10:50:40 +0000
+++ breezy/bzr/vf_repository.py	2019-07-25 23:25:31 +0000
@@ -2642,7 +2642,7 @@
                                    current_revision_id, revision.parent_ids))
             if self._converting_to_rich_root:
                 self._revision_id_to_root_id[current_revision_id] = \
-                    tree.get_root_id()
+                    tree.path2id('')
             # Determine which texts are in present in this revision but not in
             # any of the available parents.
             texts_possibly_new_in_tree = set()
 
=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2019-06-22 10:30:21 +0000
+++ breezy/bzr/workingtree.py	2019-07-25 23:25:31 +0000
@@ -284,7 +284,7 @@
             InventoryFile,
             InventoryLink)
         with self.lock_tree_write():
-            inv = Inventory(self.get_root_id())
+            inv = Inventory(self.path2id(''))
             for path, file_id, parent, kind in new_inventory_list:
                 name = os.path.basename(path)
                 if name == "":
@@ -658,11 +658,6 @@
             self._set_inventory(result, dirty=False)
             return result
 
-    def get_root_id(self):
-        """Return the id of this trees root"""
-        with self.lock_read():
-            return self._inventory.root.file_id
-
     def has_id(self, file_id):
         # files that have been deleted are excluded
         inv, inv_file_id = self._unpack_file_id(file_id)
@@ -672,7 +667,7 @@
         return osutils.lexists(self.abspath(path))
 
     def has_or_had_id(self, file_id):
-        if file_id == self.get_root_id():
+        if file_id == self.path2id(''):
             return True
         inv, inv_file_id = self._unpack_file_id(file_id)
         return inv.has_id(inv_file_id)
@@ -951,7 +946,7 @@
                 if child_entry.kind == 'directory':
                     add_children(inventory, child_entry)
         with self.lock_write():
-            if other_tree.get_root_id() == self.get_root_id():
+            if other_tree.path2id('') == self.path2id(''):
                 raise errors.BadSubsumeSource(self, other_tree,
                                               'Trees have the same root')
             try:
 
=== modified file 'breezy/bzr/workingtree_3.py'
--- breezy/bzr/workingtree_3.py	2018-12-04 19:22:35 +0000
+++ breezy/bzr/workingtree_3.py	2019-07-25 23:25:31 +0000
@@ -224,8 +224,8 @@
         try:
             basis_tree = branch.repository.revision_tree(revision_id)
             # only set an explicit root id if there is one to set.
-            if basis_tree.get_root_id() is not None:
-                wt.set_root_id(basis_tree.get_root_id())
+            if basis_tree.path2id('') is not None:
+                wt.set_root_id(basis_tree.path2id(''))
             if revision_id == _mod_revision.NULL_REVISION:
                 wt.set_parent_trees([])
             else:
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2019-06-29 12:29:45 +0000
+++ breezy/bzr/workingtree_4.py	2019-07-25 23:25:31 +0000
@@ -171,8 +171,8 @@
             except errors.PathNotChild:
                 raise BadReferenceTarget(self, sub_tree,
                                          'Target not inside tree.')
-            sub_tree_id = sub_tree.get_root_id()
-            if sub_tree_id == self.get_root_id():
+            sub_tree_id = sub_tree.path2id('')
+            if sub_tree_id == self.path2id(''):
                 raise BadReferenceTarget(self, sub_tree,
                                          'Trees have the same root id.')
             if self.has_id(sub_tree_id):
@@ -467,11 +467,6 @@
     def get_nested_tree(self, path):
         return WorkingTree.open(self.abspath(path))
 
-    def get_root_id(self):
-        """Return the id of this trees root"""
-        with self.lock_read():
-            return self._get_entry(path='')[0][2]
-
     def has_id(self, file_id):
         state = self.current_dirstate()
         row, parents = self._get_entry(file_id=file_id)
@@ -1549,7 +1544,7 @@
                 wt.flush()
                 # if the basis has a root id we have to use that; otherwise we
                 # use a new random one
-                basis_root_id = basis.get_root_id()
+                basis_root_id = basis.path2id('')
                 if basis_root_id is not None:
                     wt._set_root_id(basis_root_id)
                     wt.flush()
@@ -1748,9 +1743,6 @@
         pred = self.has_filename
         return set((p for p in paths if not pred(p)))
 
-    def get_root_id(self):
-        return self.path2id('')
-
     def id2path(self, file_id):
         "Convert a file-id to a path."
         entry = self._get_entry(file_id=file_id)
 
=== modified file 'breezy/git/object_store.py'
--- breezy/git/object_store.py	2019-07-25 22:52:58 +0000
+++ breezy/git/object_store.py	2019-07-25 23:25:31 +0000
@@ -518,7 +518,7 @@
             else:
                 base_sha1 = self._lookup_revision_sha1(rev.parent_ids[0])
                 root_tree = self[self[base_sha1].tree]
-            root_key_data = (tree.get_root_id(), tree.get_revision_id())
+            root_key_data = (tree.path2id(''), tree.get_revision_id())
         if add_cache_entry is not None:
             add_cache_entry(root_tree, root_key_data, "")
         yield "", root_tree
@@ -614,7 +614,7 @@
             path,
             bzr_tree.iter_child_entries(path),
             get_ie_sha1, unusual_modes, self.mapping.BZR_DUMMY_FILE,
-            bzr_tree.get_root_id() == fileid)
+            bzr_tree.path2id('') == fileid)
         if tree is not None:
             _check_expected_sha(expected_sha, tree)
         return tree
 
=== modified file 'breezy/git/tests/test_repository.py'
--- breezy/git/tests/test_repository.py	2018-11-21 21:34:30 +0000
+++ breezy/git/tests/test_repository.py	2019-07-25 23:25:31 +0000
@@ -190,7 +190,7 @@
         repo = self.git_repo
         tree = repo.revision_tree(revision.NULL_REVISION)
         self.assertEqual(tree.get_revision_id(), revision.NULL_REVISION)
-        self.assertIs(None, tree.get_root_id())
+        self.assertIs(None, tree.path2id(''))
 
     def test_get_parent_map_null(self):
         self.assertEqual({revision.NULL_REVISION: ()},
 
=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2019-07-25 22:52:58 +0000
+++ breezy/git/tree.py	2019-07-25 23:25:31 +0000
@@ -360,11 +360,6 @@
                     todo.append((store, subpath, hexsha))
         return ret
 
-    def get_root_id(self):
-        if self.tree is None:
-            return None
-        return self.path2id("")
-
     def has_or_had_id(self, file_id):
         try:
             self.id2path(file_id)
@@ -512,7 +507,7 @@
             else:
                 specific_files = set([p.encode('utf-8')
                                       for p in specific_files])
-        todo = deque([(self.store, b"", self.tree, self.get_root_id())])
+        todo = deque([(self.store, b"", self.tree, self.path2id(''))])
         if specific_files is None or u"" in specific_files:
             yield u"", self._get_dir_ie(b"", None)
         while todo:
@@ -1016,9 +1011,6 @@
     def _set_root_id(self, file_id):
         raise errors.UnsupportedOperation(self._set_root_id, self)
 
-    def get_root_id(self):
-        return self.path2id(u"")
-
     def _add(self, files, ids, kinds):
         for (path, file_id, kind) in zip(files, ids, kinds):
             if file_id is not None:
 
=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2019-06-29 15:50:22 +0000
+++ breezy/git/workingtree.py	2019-07-25 23:25:31 +0000
@@ -1039,7 +1039,7 @@
         prefix = prefix.encode('utf-8')
         per_dir = defaultdict(set)
         if prefix == b"":
-            per_dir[(u'', self.get_root_id())] = set()
+            per_dir[(u'', self.path2id(''))] = set()
 
         def add_entry(path, kind):
             if path == b'' or not path.startswith(prefix):
 
=== modified file 'breezy/memorytree.py'
--- breezy/memorytree.py	2019-03-04 00:19:25 +0000
+++ breezy/memorytree.py	2019-07-25 23:25:31 +0000
@@ -106,9 +106,6 @@
         stream = self._file_transport.get(path)
         return sha_file(stream)
 
-    def get_root_id(self):
-        return self.path2id('')
-
     def _comparison_data(self, entry, path):
         """See Tree._comparison_data."""
         if entry is None:
 
=== modified file 'breezy/merge.py'
--- breezy/merge.py	2019-06-22 13:51:23 +0000
+++ breezy/merge.py	2019-07-25 23:25:31 +0000
@@ -1563,7 +1563,7 @@
                 if other_parent is None or other_name is None:
                     other_path = '<deleted>'
                 else:
-                    if other_parent == self.other_tree.get_root_id():
+                    if other_parent == self.other_tree.path2id(''):
                         # The tree transform doesn't know about the other root,
                         # so we special case here to avoid a NoFinalPath
                         # exception
 
=== modified file 'breezy/plugins/weave_fmt/workingtree.py'
--- breezy/plugins/weave_fmt/workingtree.py	2018-11-21 03:20:30 +0000
+++ breezy/plugins/weave_fmt/workingtree.py	2019-07-25 23:25:31 +0000
@@ -111,8 +111,8 @@
                           _controldir=a_controldir,
                           _control_files=branch.control_files)
         basis_tree = branch.repository.revision_tree(revision_id)
-        if basis_tree.get_root_id() is not None:
-            wt.set_root_id(basis_tree.get_root_id())
+        if basis_tree.path2id('') is not None:
+            wt.set_root_id(basis_tree.path2id(''))
         # set the parent list and cache the basis tree.
         if _mod_revision.is_null(revision_id):
             parent_trees = []
 
=== modified file 'breezy/tests/blackbox/test_join.py'
--- breezy/tests/blackbox/test_join.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_join.py	2019-07-25 23:25:31 +0000
@@ -67,7 +67,7 @@
     def test_join_reference(self):
         """Join can add a reference if --reference is supplied"""
         base_tree, sub_tree = self.make_trees()
-        subtree_root_id = sub_tree.get_root_id()
+        subtree_root_id = sub_tree.path2id('')
         self.run_bzr('join . --reference', working_dir='tree/subtree')
         sub_tree.lock_read()
         self.addCleanup(sub_tree.unlock)
 
=== modified file 'breezy/tests/per_intertree/test_compare.py'
--- breezy/tests/per_intertree/test_compare.py	2019-06-17 23:01:58 +0000
+++ breezy/tests/per_intertree/test_compare.py	2019-07-25 23:25:31 +0000
@@ -73,7 +73,7 @@
     def test_compare_empty_trees(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_no_content(tree1)
         tree2 = self.get_tree_no_parents_no_content(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -87,7 +87,7 @@
     def test_empty_to_abc_content(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_no_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -109,7 +109,7 @@
         # the test.
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['2/a'])
         tree2.add('a')
         os.unlink('2/a')
@@ -131,7 +131,7 @@
     def test_abc_content_to_empty(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_abc_content(tree1)
         tree2 = self.get_tree_no_parents_no_content(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -148,7 +148,7 @@
     def test_content_modification(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_abc_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content_2(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -163,7 +163,7 @@
     def test_meta_modification(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_abc_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content_3(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -178,7 +178,7 @@
     def test_file_rename(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_abc_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content_4(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -193,7 +193,7 @@
     def test_file_rename_and_modification(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_abc_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content_5(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -208,7 +208,7 @@
     def test_file_rename_and_meta_modification(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_abc_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content_6(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -223,7 +223,7 @@
     def test_empty_to_abc_content_a_only(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree1 = self.get_tree_no_parents_no_content(tree1)
         tree2 = self.get_tree_no_parents_abc_content(tree2)
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
@@ -349,7 +349,7 @@
     def test_default_ignores_unversioned_files(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/a', 'tree1/c',
                          'tree2/a', 'tree2/b', 'tree2/c'])
         tree1.add(['a', 'c'], [b'a-id', b'c-id'])
@@ -368,7 +368,7 @@
     def test_unversioned_paths_in_tree(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/file', 'tree2/dir/'])
         if has_symlinks():
             os.symlink('target', 'tree2/link')
@@ -495,7 +495,7 @@
         """Create a tree with filenames chosen to exercise the walk order."""
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         paths, path_ids = self._create_special_names(tree2, 'tree2')
         tree2.commit('initial', rev_id=b'rev-1')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
@@ -508,7 +508,7 @@
         """
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         paths, path_ids = self._create_special_names(tree1, 'tree1')
         paths, path_ids = self._create_special_names(tree2, 'tree2')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
@@ -808,7 +808,7 @@
         tree1.put_file_bytes_non_atomic(
             'changing/unchanging/file', b'a file')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('changed', b'parent-id')
         tree2.mkdir('changed/unchanging', b'mid-id')
         tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
@@ -887,7 +887,7 @@
         tree1.add(['a'], [b'a-id'], ['file'])
         tree1.put_file_bytes_non_atomic('a', b'a file')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('a', b'b-id')
         tree2.add(['a/c'], [b'c-id'], ['file'])
         tree2.put_file_bytes_non_atomic('a/c', b'another file')
@@ -907,7 +907,7 @@
         tree1.mkdir('a/reparented', b'reparented-id')
         tree1.mkdir('a/deleted', b'deleted-id')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('a', b'a-new-id')
         tree2.mkdir('a/reparented', b'reparented-id')
         tree2.add(['b'], [b'a-old-id'], ['file'])
@@ -931,7 +931,7 @@
         tree1.mkdir('a/reparented', b'reparented-id')
         tree1.mkdir('a/deleted', b'deleted-id')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('a', b'a-new-id')
         tree2.mkdir('a/reparented', b'reparented-id')
         tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
@@ -955,7 +955,7 @@
         tree1.mkdir('a/reparented', b'reparented-id')
         tree1.mkdir('collides', b'collides-id')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('a', b'a-new-id')
         tree2.mkdir('a/selected', b'selected-id')
         tree2.mkdir('collides', b'reparented-id')
@@ -984,7 +984,7 @@
         tree1.mkdir('a/deleted/reparented', b'reparented-id-2')
         tree1.mkdir('a/deleted/deleted', b'deleted-id-2')
         tree2 = self.make_to_branch_and_tree('2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         tree2.mkdir('a', b'a-new-id')
         tree2.mkdir('a/reparented', b'reparented-id-1')
         tree2.mkdir('reparented', b'reparented-id-2')
@@ -1068,7 +1068,7 @@
     def test_missing_and_renamed(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/file'])
         tree1.add(['file'], [b'file-id'])
         self.build_tree(['tree2/directory/'])
@@ -1086,7 +1086,7 @@
     def test_only_in_source_and_missing(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/file'])
         tree1.add(['file'], [b'file-id'])
         os.unlink('tree1/file')
@@ -1101,7 +1101,7 @@
     def test_only_in_target_and_missing(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/file'])
         tree2.add(['file'], [b'file-id'])
         os.unlink('tree2/file')
@@ -1116,7 +1116,7 @@
     def test_only_in_target_missing_subtree_specific_bug_367632(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/a-dir/', 'tree2/a-dir/a-file'])
         tree2.add(['a-dir', 'a-dir/a-file'], [b'dir-id', b'file-id'])
         os.unlink('tree2/a-dir/a-file')
@@ -1226,7 +1226,7 @@
     def test_default_ignores_unversioned_files(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/a', 'tree1/c',
                          'tree2/a', 'tree2/b', 'tree2/c'])
         tree1.add(['a', 'c'], [b'a-id', b'c-id'])
@@ -1246,7 +1246,7 @@
     def test_unversioned_paths_in_tree(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/file', 'tree2/dir/'])
         if has_symlinks():
             os.symlink('target', 'tree2/link')
@@ -1299,7 +1299,7 @@
         # both foo and bar.
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/file', 'tree2/dir/',
                          'tree1/file', 'tree2/movedfile',
                          'tree1/dir/', 'tree2/moveddir/'])
@@ -1343,7 +1343,7 @@
         """Test when we have a few files with similar names."""
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
 
         # The trees are actually identical, but they happen to contain
         # similarly named files.
@@ -1371,7 +1371,7 @@
         self.assertEqual([], self.do_iter_changes(tree1, tree2,
                                                   want_unversioned=True))
         expected = self.sorted([
-            self.unchanged(tree2, tree2.get_root_id()),
+            self.unchanged(tree2, tree2.path2id('')),
             self.unchanged(tree2, b'a-id'),
             self.unchanged(tree2, b'b-id'),
             self.unchanged(tree2, b'c-id'),
@@ -1387,7 +1387,7 @@
     def test_unversioned_subtree_only_emits_root(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree2/dir/', 'tree2/dir/file'])
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
         self.not_applicable_if_cannot_represent_unversioned(tree2)
@@ -1400,7 +1400,7 @@
     def make_trees_with_symlinks(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/fromfile', 'tree1/fromdir/'])
         self.build_tree(['tree2/tofile', 'tree2/todir/', 'tree2/unknown'])
         os.symlink('original', 'tree1/changed')
@@ -1500,7 +1500,7 @@
     def test_trees_with_deleted_dir(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        tree2.set_root_id(tree1.get_root_id())
+        tree2.set_root_id(tree1.path2id(''))
         self.build_tree(['tree1/a', 'tree1/b/', 'tree1/b/c',
                          'tree1/b/d/', 'tree1/b/d/e', 'tree1/f/', 'tree1/f/g',
                          'tree2/a', 'tree2/f/', 'tree2/f/g'])
@@ -1525,7 +1525,7 @@
     def test_added_unicode(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # u'\u03b1' == GREEK SMALL LETTER ALPHA
@@ -1554,7 +1554,7 @@
     def test_deleted_unicode(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # u'\u03b1' == GREEK SMALL LETTER ALPHA
@@ -1583,7 +1583,7 @@
     def test_modified_unicode(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # u'\u03b1' == GREEK SMALL LETTER ALPHA
@@ -1613,7 +1613,7 @@
     def test_renamed_unicode(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # u'\u03b1' == GREEK SMALL LETTER ALPHA
@@ -1644,7 +1644,7 @@
     def test_unchanged_unicode(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
         # u'\u03b1' == GREEK SMALL LETTER ALPHA
         # u'\u03c9' == GREEK SMALL LETTER OMEGA
@@ -1692,7 +1692,7 @@
     def test_unknown_unicode(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
         # u'\u03b1' == GREEK SMALL LETTER ALPHA
         # u'\u03c9' == GREEK SMALL LETTER OMEGA
@@ -1746,7 +1746,7 @@
     def test_unknown_empty_dir(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # Start with 2 identical trees
@@ -1788,7 +1788,7 @@
     def test_rename_over_deleted(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # The final changes should be:
@@ -1825,7 +1825,7 @@
         """Test a file marked removed, but still present on disk."""
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # The final changes should be:
@@ -1863,7 +1863,7 @@
         """Test when we have renamed a file, and put another in its place."""
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # The final changes are:
@@ -1900,7 +1900,7 @@
         """A file was moved on the filesystem, but not in bzr."""
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
-        root_id = tree1.get_root_id()
+        root_id = tree1.path2id('')
         tree2.set_root_id(root_id)
 
         # The final changes are:
@@ -1921,7 +1921,7 @@
         self.not_applicable_if_missing_in('a', tree2)
 
         expected = self.sorted([
-            self.missing(b'a-id', 'a', 'a', tree2.get_root_id(), 'file'),
+            self.missing(b'a-id', 'a', 'a', tree2.path2id(''), 'file'),
             self.unversioned(tree2, 'a2'),
             ])
         self.assertEqual(expected,
 
=== modified file 'breezy/tests/per_repository/test_commit_builder.py'
--- breezy/tests/per_repository/test_commit_builder.py	2019-06-16 17:36:59 +0000
+++ breezy/tests/per_repository/test_commit_builder.py	2019-07-25 23:25:31 +0000
@@ -176,7 +176,7 @@
             builder.finish_inventory()
             builder.commit('rev')
             builder_tree = builder.revision_tree()
-            new_root_id = builder_tree.get_root_id()
+            new_root_id = builder_tree.path2id('')
             new_root_revision = builder_tree.get_file_revision(u'')
             if tree.branch.repository.supports_rich_root():
                 # We should not have seen a new root revision
@@ -332,7 +332,7 @@
         try:
             tree.add_reference(subtree)
             self._commit_check_unchanged(tree, 'reference',
-                                         subtree.get_root_id())
+                                         subtree.path2id(''))
         except errors.UnsupportedOperation:
             return
 
 
=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2019-06-26 23:12:10 +0000
+++ breezy/tests/per_repository/test_repository.py	2019-07-25 23:25:31 +0000
@@ -485,7 +485,6 @@
         rev_tree = tree.branch.repository.revision_tree(tree.last_revision())
         rev_tree.lock_read()
         self.addCleanup(rev_tree.unlock)
-        root_id = rev_tree.get_root_id()
         self.assertEqual(revid, rev_tree.get_file_revision(u''))
 
     def test_pointless_commit(self):
 
=== modified file 'breezy/tests/per_repository_vf/test_fileid_involved.py'
--- breezy/tests/per_repository_vf/test_fileid_involved.py	2019-06-17 23:01:58 +0000
+++ breezy/tests/per_repository_vf/test_fileid_involved.py	2019-07-25 23:25:31 +0000
@@ -277,7 +277,7 @@
     def fileids_altered_by_revision_ids(self, revision_ids):
         """This is a wrapper to strip TREE_ROOT if it occurs"""
         repo = self.branch.repository
-        root_id = self.branch.basis_tree().get_root_id()
+        root_id = self.branch.basis_tree().path2id('')
         result = repo.fileids_altered_by_revision_ids(revision_ids)
         if root_id in result:
             del result[root_id]
@@ -352,7 +352,7 @@
         repo.lock_read()
         self.addCleanup(repo.unlock)
         file_ids = repo.fileids_altered_by_revision_ids([revision_id])
-        root_id = main_wt.basis_tree().get_root_id()
+        root_id = main_wt.basis_tree().path2id('')
         if root_id in file_ids:
             self.assertEqual({file_id: {revision_id},
                               root_id: {revision_id}
 
=== modified file 'breezy/tests/per_repository_vf/test_repository.py'
--- breezy/tests/per_repository_vf/test_repository.py	2019-05-29 03:22:34 +0000
+++ breezy/tests/per_repository_vf/test_repository.py	2019-07-25 23:25:31 +0000
@@ -280,7 +280,7 @@
                     'file_id %r cannot be stored on this'
                     ' platform for this repo format' % (file_id,))
             if repo._format.rich_root_data:
-                root_commit = (tree.get_root_id(),) + rev_key
+                root_commit = (tree.path2id(''),) + rev_key
                 keys = {root_commit}
                 parents = {root_commit: ()}
             else:
 
=== modified file 'breezy/tests/per_tree/test_get_root_id.py'
--- breezy/tests/per_tree/test_get_root_id.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_tree/test_get_root_id.py	2019-07-25 23:25:31 +0000
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-"""Tests for Tree.get_root_id()"""
+"""Tests for Tree.path2id('')"""
 
 from breezy.tests.per_tree import TestCaseWithTree
 
@@ -40,9 +40,9 @@
     def test_get_root_id_default(self):
         tree = self.make_tree_with_default_root_id()
         with tree.lock_read():
-            self.assertIsNot(None, tree.get_root_id())
+            self.assertIsNot(None, tree.path2id(''))
 
     def test_get_root_id_fixed(self):
         tree = self.make_tree_with_fixed_root_id()
         with tree.lock_read():
-            self.assertEqual(b'custom-tree-root-id', tree.get_root_id())
+            self.assertEqual(b'custom-tree-root-id', tree.path2id(''))
 
=== modified file 'breezy/tests/per_tree/test_ids.py'
--- breezy/tests/per_tree/test_ids.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_tree/test_ids.py	2019-07-25 23:25:31 +0000
@@ -43,7 +43,7 @@
         self.assertEqual(b'bla-id', self.tree_a.path2id(['bla']))
         self.assertEqual(b'dir-id', self.tree_a.path2id(['dir']))
         self.assertEqual(b'file-id', self.tree_a.path2id(['dir', 'file']))
-        self.assertEqual(self.tree_a.get_root_id(),
+        self.assertEqual(self.tree_a.path2id(''),
                          self.tree_a.path2id([]))
         self.assertIs(None, self.tree_a.path2id(['idontexist']))
         self.assertIs(None, self.tree_a.path2id(['dir', 'idontexist']))
 
=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2018-11-19 23:04:59 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2019-07-25 23:25:31 +0000
@@ -273,7 +273,7 @@
                     b'ba\xe2\x82\xacz-id',
                     ]
         self.build_tree(paths[1:])
-        if tree.get_root_id() is None:
+        if tree.path2id('') is None:
             # Some trees do not have a root yet.
             tree.add(paths, file_ids)
         else:
 
=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2019-06-29 12:29:45 +0000
+++ breezy/tests/per_tree/test_tree.py	2019-07-25 23:25:31 +0000
@@ -120,7 +120,7 @@
     def test_get_root_id(self):
         # trees should return some kind of root id; it can be none
         tree = self.make_branch_and_tree('tree')
-        root_id = tree.get_root_id()
+        root_id = tree.path2id('')
         if root_id is not None:
             self.assertIsInstance(root_id, bytes)
 
 
=== modified file 'breezy/tests/per_workingtree/test_add.py'
--- breezy/tests/per_workingtree/test_add.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_add.py	2019-07-25 23:25:31 +0000
@@ -103,7 +103,7 @@
         tree.add(['dir'], [b'dir-id'])
         tree.add(['dir/subdir'], [b'subdir-id'])
         tree.add(['dir/subdir/foo'], [b'foo-id'])
-        root_id = tree.get_root_id()
+        root_id = tree.path2id('')
 
         self.assertTreeLayout([('', root_id), ('dir/', b'dir-id'),
                                ('dir/subdir/', b'subdir-id'),
@@ -136,7 +136,7 @@
         tree.add(['a', 'b', 'dir', 'dir/subdir', 'dir/subdir/foo'],
                  [b'a-id', b'b-id', b'dir-id', b'subdir-id', b'foo-id'])
 
-        self.assertTreeLayout([('', tree.get_root_id()), ('a', b'a-id'), ('b', b'b-id'),
+        self.assertTreeLayout([('', tree.path2id('')), ('a', b'a-id'), ('b', b'b-id'),
                                ('dir/', b'dir-id'), ('dir/subdir/', b'subdir-id'),
                                ('dir/subdir/foo', b'foo-id')], tree)
 
 
=== modified file 'breezy/tests/per_workingtree/test_add_reference.py'
--- breezy/tests/per_workingtree/test_add_reference.py	2018-11-16 18:33:17 +0000
+++ breezy/tests/per_workingtree/test_add_reference.py	2019-07-25 23:25:31 +0000
@@ -49,7 +49,7 @@
 
     def test_add_reference(self):
         tree, sub_tree = self.make_nested_trees()
-        sub_tree_root_id = sub_tree.get_root_id()
+        sub_tree_root_id = sub_tree.path2id('')
         with tree.lock_write():
             if tree.supports_setting_file_ids():
                 self.assertEqual(tree.path2id('sub-tree'), sub_tree_root_id)
@@ -101,7 +101,7 @@
 
     def test_get_nested_tree(self):
         tree, sub_tree = self.make_nested_trees()
-        sub_tree_root_id = sub_tree.get_root_id()
+        sub_tree_root_id = sub_tree.path2id('')
         with tree.lock_read():
             sub_tree2 = tree.get_nested_tree('sub-tree')
             self.assertEqual(sub_tree.basedir, sub_tree2.basedir)
 
=== modified file 'breezy/tests/per_workingtree/test_commit.py'
--- breezy/tests/per_workingtree/test_commit.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_commit.py	2019-07-25 23:25:31 +0000
@@ -53,13 +53,10 @@
         osutils.rmtree('a/dir')
         tree_a.commit('autoremoved')
 
-        tree_a.lock_read()
-        try:
-            root_id = tree_a.get_root_id()
+        with tree_a.lock_read():
+            root_id = tree_a.path2id('')
             paths = [(path, ie.file_id)
                      for path, ie in tree_a.iter_entries_by_dir()]
-        finally:
-            tree_a.unlock()
         # The only paths left should be the root
         self.assertEqual([('', root_id)], paths)
 
 
=== modified file 'breezy/tests/per_workingtree/test_flush.py'
--- breezy/tests/per_workingtree/test_flush.py	2018-03-25 00:39:16 +0000
+++ breezy/tests/per_workingtree/test_flush.py	2019-07-25 23:25:31 +0000
@@ -26,11 +26,8 @@
 
     def test_flush_fresh_tree(self):
         tree = self.make_branch_and_tree('t1')
-        tree.lock_write()
-        try:
+        with tree.lock_write():
             tree.flush()
-        finally:
-            tree.unlock()
 
     def test_flush_when_inventory_is_modified(self):
         if sys.platform == "win32":
@@ -49,30 +46,24 @@
         tree = self.make_branch_and_tree('tree')
         # prepare for a series of changes that will modify the
         # inventory
-        tree.lock_write()
-        try:
-            old_root = tree.get_root_id()
+        with tree.lock_write():
+            old_root = tree.path2id('')
             tree.add('')
             # to detect that the inventory is written by flush, we
             # first check that it was not written yet.
             reference_tree = tree.controldir.open_workingtree()
-            self.assertEqual(old_root, reference_tree.get_root_id())
+            self.assertEqual(old_root, reference_tree.path2id(''))
             # now flush the tree which should write the inventory.
             tree.flush()
             # and check it was written using another reference tree
             reference_tree = tree.controldir.open_workingtree()
-            self.assertIsNot(None, reference_tree.get_root_id())
-        finally:
-            tree.unlock()
+            self.assertIsNot(None, reference_tree.path2id(''))
 
     def test_flush_with_read_lock_fails(self):
         """Flush cannot be used during a read lock."""
         tree = self.make_branch_and_tree('t1')
-        tree.lock_read()
-        try:
+        with tree.lock_read():
             self.assertRaises(errors.NotWriteLocked, tree.flush)
-        finally:
-            tree.unlock()
 
     def test_flush_with_no_lock_fails(self):
         tree = self.make_branch_and_tree('t1')
 
=== modified file 'breezy/tests/per_workingtree/test_inv.py'
--- breezy/tests/per_workingtree/test_inv.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_inv.py	2019-07-25 23:25:31 +0000
@@ -53,7 +53,7 @@
         wt = self.make_branch_and_tree('.')
         wt.lock_write()
         self.addCleanup(wt.unlock)
-        root_id = wt.get_root_id()
+        root_id = wt.path2id('')
         wt.apply_inventory_delta([(None, 'bar/foo', b'foo-id',
                                    inventory.InventoryFile(b'foo-id', 'foo', parent_id=b'bar-id')),
                                   (None, 'bar', b'bar-id', inventory.InventoryDirectory(b'bar-id',
@@ -74,7 +74,7 @@
     def test_rename_dir_with_children(self):
         wt = self.make_branch_and_tree('.')
         wt.lock_write()
-        root_id = wt.get_root_id()
+        root_id = wt.path2id('')
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar'])
         wt.add(['foo', 'foo/bar'],
@@ -88,7 +88,7 @@
     def test_rename_dir_with_children_with_children(self):
         wt = self.make_branch_and_tree('.')
         wt.lock_write()
-        root_id = wt.get_root_id()
+        root_id = wt.path2id('')
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar/', 'foo/bar/baz'])
         wt.add(['foo', 'foo/bar', 'foo/bar/baz'],
@@ -118,7 +118,7 @@
         """
         wt = self.make_branch_and_tree('.')
         wt.lock_write()
-        root_id = wt.get_root_id()
+        root_id = wt.path2id('')
         self.addCleanup(wt.unlock)
         self.build_tree(['foo/', 'foo/bar', 'baz/', 'baz/qux'])
         wt.add(['foo', 'foo/bar', 'baz', 'baz/qux'],
@@ -137,7 +137,7 @@
          unable to find the child.)
         """
         wt = self.make_branch_and_tree('.')
-        root_id = wt.get_root_id()
+        root_id = wt.path2id('')
         self.build_tree(['dir/', 'dir/child', 'other/'])
         wt.add(['dir', 'dir/child', 'other'],
                [b'dir-id', b'child-id', b'other-id'])
@@ -155,7 +155,7 @@
         wt.lock_write()
         self.addCleanup(wt.unlock)
 
-        root_id = wt.get_root_id()
+        root_id = wt.path2id('')
         wt.apply_inventory_delta([('', None, root_id, None),
                                   (None, '', b'root-id',
                                    inventory.InventoryDirectory(b'root-id', '', None))])
 
=== modified file 'breezy/tests/per_workingtree/test_locking.py'
--- breezy/tests/per_workingtree/test_locking.py	2018-03-25 00:39:16 +0000
+++ breezy/tests/per_workingtree/test_locking.py	2019-07-25 23:25:31 +0000
@@ -148,23 +148,23 @@
         # e.g. mkdir('foo') but all the mutating methods at the
         # moment trigger inventory writes and thus will not
         # let us trigger a read-when-dirty situation.
-        old_root = tree.get_root_id()
+        old_root = tree.path2id('')
         tree.add('')
         # to detect that the inventory is written by unlock, we
         # first check that it was not written yet.
         # TODO: This requires taking a read lock while we are holding the above
         #       write lock, which shouldn't actually be possible
         reference_tree = tree.controldir.open_workingtree()
-        self.assertEqual(old_root, reference_tree.get_root_id())
+        self.assertEqual(old_root, reference_tree.path2id(''))
         # now unlock the second held lock, which should do nothing.
         tree.unlock()
         reference_tree = tree.controldir.open_workingtree()
-        self.assertEqual(old_root, reference_tree.get_root_id())
+        self.assertEqual(old_root, reference_tree.path2id(''))
         # unlocking the first lock we took will now flush.
         tree.unlock()
         # and check it was written using another reference tree
         reference_tree = tree.controldir.open_workingtree()
-        self.assertIsNot(None, reference_tree.get_root_id())
+        self.assertIsNot(None, reference_tree.path2id(''))
 
     def test_unlock_from_tree_write_lock_flushes(self):
         self._test_unlock_with_lock_method("lock_tree_write")
 
=== modified file 'breezy/tests/per_workingtree/test_merge_from_branch.py'
--- breezy/tests/per_workingtree/test_merge_from_branch.py	2019-06-17 19:04:30 +0000
+++ breezy/tests/per_workingtree/test_merge_from_branch.py	2019-07-25 23:25:31 +0000
@@ -166,7 +166,7 @@
             inner, to_revision=revs[0], from_revision=b'null:')
         # retain original root id.
         if outer.supports_setting_file_ids():
-            outer.set_root_id(outer.basis_tree().get_root_id())
+            outer.set_root_id(outer.basis_tree().path2id(''))
         outer.commit('merge inner branch')
         outer.mkdir('dir-outer')
         outer.move(['dir', 'file3'], to_dir='dir-outer')
 
=== modified file 'breezy/tests/per_workingtree/test_pull.py'
--- breezy/tests/per_workingtree/test_pull.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_pull.py	2019-07-25 23:25:31 +0000
@@ -33,9 +33,9 @@
 
     def test_pull_null(self):
         tree_a, tree_b, rev_a = self.get_pullable_trees()
-        root_id = tree_a.get_root_id()
+        root_id = tree_a.path2id('')
         tree_a.pull(tree_b.branch, stop_revision=NULL_REVISION, overwrite=True)
-        self.assertEqual(root_id, tree_a.get_root_id())
+        self.assertEqual(root_id, tree_a.path2id(''))
 
     def test_pull(self):
         tree_a, tree_b, rev_a = self.get_pullable_trees()
@@ -66,11 +66,11 @@
         tree.add(['file'])
         tree.commit('first')
         to_tree = tree.controldir.sprout('to').open_workingtree()
-        self.assertEqual(b'first_root_id', to_tree.get_root_id())
+        self.assertEqual(b'first_root_id', to_tree.path2id(''))
         tree.set_root_id(b'second_root_id')
         tree.commit('second')
         to_tree.pull(tree.branch)
-        self.assertEqual(b'second_root_id', to_tree.get_root_id())
+        self.assertEqual(b'second_root_id', to_tree.path2id(''))
 
 
 class TestPullWithOrphans(per_workingtree.TestCaseWithWorkingTree):
 
=== modified file 'breezy/tests/per_workingtree/test_rename_one.py'
--- breezy/tests/per_workingtree/test_rename_one.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_rename_one.py	2019-07-25 23:25:31 +0000
@@ -342,7 +342,6 @@
         self.build_tree(['a/', 'a/b', 'c/'])
         tree.add(['a', 'a/b', 'c'])
         tree.commit('initial')
-        root_id = tree.get_root_id()
 
         tree.rename_one('a/b', 'c/foo')
         self.assertPathRelations(
 
=== modified file 'breezy/tests/per_workingtree/test_set_root_id.py'
--- breezy/tests/per_workingtree/test_set_root_id.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/per_workingtree/test_set_root_id.py	2019-07-25 23:25:31 +0000
@@ -36,25 +36,22 @@
             self.skipTest('format does not support setting file ids')
         # setting the root id allows it to be read via get_root_id.
         root_id = u'\xe5n-id'.encode('utf8')
-        tree.lock_write()
-        try:
-            old_id = tree.get_root_id()
+        with tree.lock_write():
+            old_id = tree.path2id('')
             tree.set_root_id(root_id)
-            self.assertEqual(root_id, tree.get_root_id())
+            self.assertEqual(root_id, tree.path2id(''))
             # set root id should not have triggered a flush of the tree,
             # so check a new tree sees the old state.
             reference_tree = tree.controldir.open_workingtree()
-            self.assertEqual(old_id, reference_tree.get_root_id())
-        finally:
-            tree.unlock()
+            self.assertEqual(old_id, reference_tree.path2id(''))
         # having unlocked the tree, the value should have been
         # preserved into the next lock, which is an implicit read
         # lock around the get_root_id call.
-        self.assertEqual(root_id, tree.get_root_id())
+        self.assertEqual(root_id, tree.path2id(''))
         # and if we get a new working tree instance, then the value
         # should still be retained
         tree = tree.controldir.open_workingtree()
-        self.assertEqual(root_id, tree.get_root_id())
+        self.assertEqual(root_id, tree.path2id(''))
         tree._validate()
 
     def test_set_root_id(self):
@@ -63,12 +60,12 @@
             self.skipTest('format does not support setting file ids')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        orig_root_id = tree.get_root_id()
+        orig_root_id = tree.path2id('')
         self.assertNotEqual(b'custom-root-id', orig_root_id)
         self.assertEqual('', tree.id2path(orig_root_id))
         self.assertRaises(errors.NoSuchId, tree.id2path, 'custom-root-id')
         tree.set_root_id(b'custom-root-id')
-        self.assertEqual(b'custom-root-id', tree.get_root_id())
+        self.assertEqual(b'custom-root-id', tree.path2id(''))
         self.assertEqual(b'custom-root-id', tree.path2id(''))
         self.assertEqual('', tree.id2path(b'custom-root-id'))
         self.assertRaises(errors.NoSuchId, tree.id2path, orig_root_id)
 
=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2019-06-22 10:30:21 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2019-07-25 23:25:31 +0000
@@ -575,8 +575,8 @@
         # and update checkout
         self.assertEqual(0, checkout.update())
         self.assertPathExists('checkout/file')
-        self.assertEqual(wt.get_root_id(), checkout.get_root_id())
-        self.assertNotEqual(None, wt.get_root_id())
+        self.assertEqual(wt.path2id(''), checkout.path2id(''))
+        self.assertNotEqual(None, wt.path2id(''))
 
     def test_update_sets_updated_root_id(self):
         wt = self.make_branch_and_tree('tree')
@@ -585,16 +585,16 @@
                               'first_root_id')
             return
         wt.set_root_id(b'first_root_id')
-        self.assertEqual(b'first_root_id', wt.get_root_id())
+        self.assertEqual(b'first_root_id', wt.path2id(''))
         self.build_tree(['tree/file'])
         wt.add(['file'])
         wt.commit('first')
         co = wt.branch.create_checkout('checkout')
         wt.set_root_id(b'second_root_id')
         wt.commit('second')
-        self.assertEqual(b'second_root_id', wt.get_root_id())
+        self.assertEqual(b'second_root_id', wt.path2id(''))
         self.assertEqual(0, co.update())
-        self.assertEqual(b'second_root_id', co.get_root_id())
+        self.assertEqual(b'second_root_id', co.path2id(''))
 
     def test_update_returns_conflict_count(self):
         # working tree formats from the meta-dir format and newer support
@@ -920,7 +920,7 @@
         # if we write write an inventory then do a walkdirs we should get back
         # missing entries, and actual, and unknowns as appropriate.
         self.build_tree(['present', 'unknown'])
-        inventory = Inventory(tree.get_root_id())
+        inventory = Inventory(tree.path2id(''))
         inventory.add_path('missing', 'file', b'missing-id')
         inventory.add_path('present', 'file', b'present-id')
         # there is no point in being able to write an inventory to an unlocked
@@ -932,7 +932,7 @@
             present_stat = os.lstat('present')
             unknown_stat = os.lstat('unknown')
             expected_results = [
-                (('', tree.get_root_id()),
+                (('', tree.path2id('')),
                  [('missing', 'missing', 'unknown', None, b'missing-id', 'file'),
                   ('present', 'present', 'file',
                    present_stat, b'present-id', 'file'),
 
=== modified file 'breezy/tests/test__dirstate_helpers.py'
--- breezy/tests/test__dirstate_helpers.py	2019-06-15 12:04:34 +0000
+++ breezy/tests/test__dirstate_helpers.py	2019-07-25 23:25:31 +0000
@@ -1326,7 +1326,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/file'])
         tree.add(['file'], [b'file-id'])
-        self.assertChangedFileIds([tree.get_root_id(), b'file-id'], tree)
+        self.assertChangedFileIds([tree.path2id(''), b'file-id'], tree)
         tree.commit('one')
         self.assertChangedFileIds([], tree)
 
 
=== modified file 'breezy/tests/test_commit_merge.py'
--- breezy/tests/test_commit_merge.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_commit_merge.py	2019-07-25 23:25:31 +0000
@@ -76,7 +76,7 @@
         bx = wtx.branch
         wtx.commit('establish root id')
         wty = wtx.controldir.sprout('y').open_workingtree()
-        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
+        self.assertEqual(wtx.path2id(''), wty.path2id(''))
         by = wty.branch
 
         self.build_tree(['x/ecks', 'y/why'])
 
=== modified file 'breezy/tests/test_dirstate.py'
--- breezy/tests/test_dirstate.py	2019-06-03 22:25:41 +0000
+++ breezy/tests/test_dirstate.py	2019-07-25 23:25:31 +0000
@@ -394,7 +394,7 @@
         # There are no files on disk and no parents
         tree = self.make_branch_and_tree('tree')
         expected_result = ([], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),  # current tree
               ])])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
@@ -407,7 +407,7 @@
         rev_id = tree.commit('first post')
         root_stat_pack = dirstate.pack_stat(os.stat(tree.basedir))
         expected_result = ([rev_id], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),  # current tree
               (b'd', b'', 0, False, rev_id),  # first parent details
               ])])
@@ -427,7 +427,7 @@
         rev_id2 = tree2.commit('second post', allow_pointless=True)
         tree.merge_from_branch(tree2.branch)
         expected_result = ([rev_id, rev_id2], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),  # current tree
               (b'd', b'', 0, False, rev_id),  # first parent details
               (b'd', b'', 0, False, rev_id),  # second parent details
@@ -446,7 +446,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/unknown'])
         expected_result = ([], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),  # current tree
               ])])
         state = dirstate.DirState.from_tree(tree, 'dirstate')
@@ -463,7 +463,7 @@
         # There are files on disk and no parents
         tree = self.get_tree_with_a_file()
         expected_result = ([], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),  # current tree
               ]),
             ((b'', b'a file', b'a-file-id'),  # common
@@ -481,7 +481,7 @@
         # and length:
         self.build_tree_contents([('tree/a file', b'new content\n')])
         expected_result = ([rev_id], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),  # current tree
               (b'd', b'', 0, False, rev_id),  # first parent details
               ]),
@@ -508,7 +508,7 @@
         # and length again, giving us three distinct values:
         self.build_tree_contents([('tree/a file', b'new content\n')])
         expected_result = ([rev_id, rev_id2], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              [(b'd', b'', 0, False, dirstate.DirState.NULLSTAT),  # current tree
               (b'd', b'', 0, False, rev_id),  # first parent details
               (b'd', b'', 0, False, rev_id),  # second parent details
@@ -573,7 +573,7 @@
         # get a state object
         # no parents, default tree content
         expected_result = ([], [
-            ((b'', b'', tree.get_root_id()),  # common details
+            ((b'', b'', tree.path2id('')),  # common details
              # current tree details, but new from_tree skips statting, it
              # uses set_state_from_inventory, and thus depends on the
              # inventory state.
@@ -899,7 +899,7 @@
             tree1.add(['a', 'a/b', 'a-b', 'a/b/foo', 'a-b/bar'],
                       [b'a-id', b'b-id', b'a-b-id', b'foo-id', b'bar-id'])
             tree1.commit('rev1', rev_id=b'rev1')
-            root_id = tree1.get_root_id()
+            root_id = tree1.path2id('')
             inv = tree1.root_inventory
         finally:
             tree1.unlock()
@@ -1045,7 +1045,7 @@
         tree2.lock_write()
         try:
             revid2 = tree2.commit('foo')
-            root_id = tree2.get_root_id()
+            root_id = tree2.path2id('')
         finally:
             tree2.unlock()
         state = dirstate.DirState.initialize('dirstate')
@@ -1116,7 +1116,7 @@
         try:
             tree2.put_file_bytes_non_atomic('a file', b'new file-content')
             revid2 = tree2.commit('foo')
-            root_id = tree2.get_root_id()
+            root_id = tree2.path2id('')
         finally:
             tree2.unlock()
         # check the layout in memory
@@ -1337,10 +1337,9 @@
         # incorrect absent in tree 1, and future changes go to pot.
         tree1 = self.make_branch_and_tree('tree1')
         self.build_tree(['tree1/b'])
-        tree1.lock_write()
-        try:
+        with tree1.lock_write():
             tree1.add(['b'], [b'b-id'])
-            root_id = tree1.get_root_id()
+            root_id = tree1.path2id('')
             inv = tree1.root_inventory
             state = dirstate.DirState.initialize('dirstate')
             try:
@@ -1358,8 +1357,6 @@
                 self.assertEqual(expected_result1, values)
             finally:
                 state.unlock()
-        finally:
-            tree1.unlock()
 
 
 class TestDirStateHashUpdates(TestCaseWithDirState):
 
=== modified file 'breezy/tests/test_extract.py'
--- breezy/tests/test_extract.py	2018-11-16 18:33:17 +0000
+++ breezy/tests/test_extract.py	2019-07-25 23:25:31 +0000
@@ -29,7 +29,7 @@
         wt.add(['b', 'b/c', 'd'], [b'b-id', b'c-id', b'd-id'])
         wt.commit('added files')
         b_wt = wt.extract('b')
-        self.assertEqual(b'b-id', b_wt.get_root_id())
+        self.assertEqual(b'b-id', b_wt.path2id(''))
         self.assertEqual(b'c-id', b_wt.path2id('c'))
         self.assertEqual('c', b_wt.id2path(b'c-id'))
         self.assertRaises(errors.BzrError, wt.id2path, b'b-id')
 
=== modified file 'breezy/tests/test_fetch.py'
--- breezy/tests/test_fetch.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_fetch.py	2019-07-25 23:25:31 +0000
@@ -498,7 +498,7 @@
         self.tree.add_parent_tree_id(b'not-ghost-parent')
         self.tree.commit('second commit', rev_id=b'second-id')
         self.repo.fetch(self.tree.branch.repository, b'second-id')
-        root_id = self.tree.get_root_id()
+        root_id = self.tree.path2id('')
         self.assertEqual(
             ((root_id, b'left-parent'), (root_id, b'not-ghost-parent')),
             self.get_parents(root_id, b'second-id'))
 
=== modified file 'breezy/tests/test_matchers.py'
--- breezy/tests/test_matchers.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_matchers.py	2019-07-25 23:25:31 +0000
@@ -122,7 +122,7 @@
         t.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
         self.assertThat(t, HasLayout(['', 'a', 'b/', 'b/c']))
         self.assertThat(t, HasLayout(
-            [('', t.get_root_id()),
+            [('', t.path2id('')),
              ('a', b'a-id'),
              ('b/', b'b-id'),
              ('b/c', b'c-id')]))
 
=== modified file 'breezy/tests/test_memorytree.py'
--- breezy/tests/test_memorytree.py	2019-02-16 21:12:42 +0000
+++ breezy/tests/test_memorytree.py	2019-07-25 23:25:31 +0000
@@ -56,7 +56,7 @@
         tree = MemoryTree.create_on_branch(branch)
         with tree.lock_write():
             tree.add([''])
-            self.assertIsNot(None, tree.get_root_id())
+            self.assertIsNot(None, tree.path2id(''))
 
     def test_lock_tree_write(self):
         """Check we can lock_tree_write and unlock MemoryTrees."""
 
=== modified file 'breezy/tests/test_merge.py'
--- breezy/tests/test_merge.py	2019-06-18 00:20:56 +0000
+++ breezy/tests/test_merge.py	2019-07-25 23:25:31 +0000
@@ -137,7 +137,7 @@
         with merger.make_preview_transform() as tt:
             self.assertEqual([], tt.find_conflicts())
             preview = tt.get_preview_tree()
-            self.assertEqual(wt.get_root_id(), preview.get_root_id())
+            self.assertEqual(wt.path2id(''), preview.path2id(''))
 
     def test_merge_unrelated_retains_root(self):
         wt = self.make_branch_and_tree('tree')
@@ -149,7 +149,7 @@
         with transform.TransformPreview(wt) as merger.tt:
             merger._compute_transform()
             new_root_id = merger.tt.final_file_id(merger.tt.root)
-            self.assertEqual(wt.get_root_id(), new_root_id)
+            self.assertEqual(wt.path2id(''), new_root_id)
 
     def test_create_rename(self):
         """Rename an inventory entry while creating the file"""
@@ -511,7 +511,7 @@
         self.build_tree(['a'])
         tree.add('a')
         first_rev = tree.commit("added a")
-        old_root_id = tree.get_root_id()
+        old_root_id = tree.path2id('')
         merger = _mod_merge.Merger.from_revision_ids(tree,
                                                      _mod_revision.NULL_REVISION,
                                                      first_rev)
 
=== modified file 'breezy/tests/test_revert.py'
--- breezy/tests/test_revert.py	2019-06-22 10:30:21 +0000
+++ breezy/tests/test_revert.py	2019-07-25 23:25:31 +0000
@@ -159,6 +159,6 @@
         tree.add(['file1'])
         tree.commit('first')
         tree.set_root_id(b'temp-root-id')
-        self.assertEqual(b'temp-root-id', tree.get_root_id())
+        self.assertEqual(b'temp-root-id', tree.path2id(''))
         tree.revert()
-        self.assertEqual(b'initial-root-id', tree.get_root_id())
+        self.assertEqual(b'initial-root-id', tree.path2id(''))
 
=== modified file 'breezy/tests/test_revisiontree.py'
--- breezy/tests/test_revisiontree.py	2018-11-16 18:33:17 +0000
+++ breezy/tests/test_revisiontree.py	2019-07-25 23:25:31 +0000
@@ -58,7 +58,7 @@
     def test_empty_no_root(self):
         null_tree = self.t.branch.repository.revision_tree(
             revision.NULL_REVISION)
-        self.assertIs(None, null_tree.get_root_id())
+        self.assertIs(None, null_tree.path2id(''))
 
     def test_get_file_revision_root(self):
         self.assertEqual(self.rev_id, self.rev_tree.get_file_revision(u''))
 
=== modified file 'breezy/tests/test_shelf_ui.py'
--- breezy/tests/test_shelf_ui.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_shelf_ui.py	2019-07-25 23:25:31 +0000
@@ -302,14 +302,14 @@
     def test_shelve_old_root_preserved(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree1.commit('add root')
-        tree1_root_id = tree1.get_root_id()
+        tree1_root_id = tree1.path2id('')
         tree2 = self.make_branch_and_tree('tree2')
         rev2 = tree2.commit('add root')
-        self.assertNotEqual(tree1_root_id, tree2.get_root_id())
+        self.assertNotEqual(tree1_root_id, tree2.path2id(''))
         tree1.merge_from_branch(tree2.branch,
                                 from_revision=revision.NULL_REVISION)
         tree1.commit('merging in tree2')
-        self.assertEqual(tree1_root_id, tree1.get_root_id())
+        self.assertEqual(tree1_root_id, tree1.path2id(''))
         # This is essentially assertNotRaises(InconsistentDelta)
         # With testtools 0.9.9, it can be rewritten as:
         # with ExpectedException(AssertionError,
 
=== modified file 'breezy/tests/test_smart_add.py'
--- breezy/tests/test_smart_add.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_smart_add.py	2019-07-25 23:25:31 +0000
@@ -92,7 +92,7 @@
 
         self.build_tree(['new/a', 'new/b', 'new/c',
                          'new/subdir/', 'new/subdir/b', 'new/subdir/d'])
-        new_tree.set_root_id(self.base_tree.get_root_id())
+        new_tree.set_root_id(self.base_tree.path2id(''))
         self.add_helper(self.base_tree, 'dir', new_tree, ['new'])
 
         # We know 'a' and 'b' exist in the root, and they are being added
 
=== modified file 'breezy/tests/test_subsume.py'
--- breezy/tests/test_subsume.py	2018-11-16 18:33:17 +0000
+++ breezy/tests/test_subsume.py	2019-07-25 23:25:31 +0000
@@ -36,7 +36,7 @@
         sub_tree = self.make_branch_and_tree('tree/subtree',
                                              format='development-subtree')
         if same_root is True:
-            sub_tree.set_root_id(base_tree.get_root_id())
+            sub_tree.set_root_id(base_tree.path2id(''))
         sub_tree.add('file2', b'file2-id')
         sub_tree.commit('first commit', rev_id=b'subtree-1')
         return base_tree, sub_tree
@@ -59,8 +59,8 @@
 
     def test_subsume_tree(self):
         base_tree, sub_tree = self.make_trees()
-        self.assertNotEqual(base_tree.get_root_id(), sub_tree.get_root_id())
-        sub_root_id = sub_tree.get_root_id()
+        self.assertNotEqual(base_tree.path2id(''), sub_tree.path2id(''))
+        sub_root_id = sub_tree.path2id('')
         # this test checks the subdir is removed, so it needs to know the
         # control directory; that changes rarely so just hardcode (and check)
         # it is correct.
@@ -94,7 +94,7 @@
 
     def test_subsume_failure(self):
         base_tree, sub_tree = self.make_trees()
-        if base_tree.get_root_id() == sub_tree.get_root_id():
+        if base_tree.path2id('') == sub_tree.path2id(''):
             raise tests.TestSkipped('This test requires unique roots')
         self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
                           base_tree)
 
=== modified file 'breezy/tests/test_switch.py'
--- breezy/tests/test_switch.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_switch.py	2019-07-25 23:25:31 +0000
@@ -179,7 +179,7 @@
         checkout = tree.branch.create_checkout('checkout',
                                                lightweight=self.lightweight)
         switch.switch(checkout.controldir, tree2.branch)
-        self.assertEqual(b'custom-root-id', tree2.get_root_id())
+        self.assertEqual(b'custom-root-id', tree2.path2id(''))
 
     def test_switch_configurable_file_merger(self):
         class DummyMerger(_mod_merge.ConfigurableFileMerger):
 
=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2019-06-22 12:07:42 +0000
+++ breezy/tests/test_transform.py	2019-07-25 23:25:31 +0000
@@ -147,7 +147,7 @@
         self.assertEqual(imaginary_id, imaginary_id2)
         self.assertEqual(root, transform.get_tree_parent(imaginary_id))
         self.assertEqual('directory', transform.final_kind(root))
-        self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
+        self.assertEqual(self.wt.path2id(''), transform.final_file_id(root))
         trans_id = transform.create_path('name', root)
         self.assertIs(transform.final_file_id(trans_id), None)
         self.assertIs(None, transform.final_kind(trans_id))
@@ -270,17 +270,17 @@
 
     def test_change_root_id(self):
         transform, root = self.get_transform()
-        self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
+        self.assertNotEqual(b'new-root-id', self.wt.path2id(''))
         transform.new_directory('', ROOT_PARENT, b'new-root-id')
         transform.delete_contents(root)
         transform.unversion_file(root)
         transform.fixup_new_roots()
         transform.apply()
-        self.assertEqual(b'new-root-id', self.wt.get_root_id())
+        self.assertEqual(b'new-root-id', self.wt.path2id(''))
 
     def test_change_root_id_add_files(self):
         transform, root = self.get_transform()
-        self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
+        self.assertNotEqual(b'new-root-id', self.wt.path2id(''))
         new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
         transform.new_file('file', new_trans_id, [b'new-contents\n'],
                            b'new-file-id')
@@ -288,7 +288,7 @@
         transform.unversion_file(root)
         transform.fixup_new_roots()
         transform.apply()
-        self.assertEqual(b'new-root-id', self.wt.get_root_id())
+        self.assertEqual(b'new-root-id', self.wt.path2id(''))
         self.assertEqual(b'new-file-id', self.wt.path2id('file'))
         self.assertFileEqual(b'new-contents\n', self.wt.abspath('file'))
 
@@ -321,13 +321,13 @@
 
     def test_remove_root_fixup(self):
         transform, root = self.get_transform()
-        old_root_id = self.wt.get_root_id()
+        old_root_id = self.wt.path2id('')
         self.assertNotEqual(b'new-root-id', old_root_id)
         transform.delete_contents(root)
         transform.unversion_file(root)
         transform.fixup_new_roots()
         transform.apply()
-        self.assertEqual(old_root_id, self.wt.get_root_id())
+        self.assertEqual(old_root_id, self.wt.path2id(''))
 
         transform, root = self.get_transform()
         transform.new_directory('', ROOT_PARENT, b'new-root-id')
@@ -358,7 +358,7 @@
         old_root_id = transform.tree_file_id(root)
         transform.unversion_file(root)
         transform.apply()
-        self.assertEqual(old_root_id, self.wt.get_root_id())
+        self.assertEqual(old_root_id, self.wt.path2id(''))
 
     def test_hardlink(self):
         self.requireFeature(HardlinkFeature)
@@ -1741,7 +1741,7 @@
         tree.add('foo', b'foo-id')
         with TransformPreview(tree) as tt:
             tt.unversion_file(tt.root)
-            tt.version_file(tree.get_root_id(), tt.root)
+            tt.version_file(tree.path2id(''), tt.root)
             tt.trans_id_tree_path('foo')
             self.assertEqual([], tt._inventory_altered())
 
@@ -2872,7 +2872,7 @@
 
     def test_iter_changes(self):
         revision_tree, preview_tree = self.get_tree_and_preview_tree()
-        root = revision_tree.get_root_id()
+        root = revision_tree.path2id('')
         self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
                            (root, root), ('a', 'a'), ('file', 'file'),
                            (False, False))],
@@ -2981,7 +2981,7 @@
         preview.unversion_file(c_trans_id)
         preview.version_file(b'c-id', c_trans_id)
         preview_tree = preview.get_preview_tree()
-        self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
+        self.assertEqual({b'a-id', b'c-id', tree.path2id('')},
                          preview_tree.all_file_ids())
 
     def test_path2id_deleted_unchanged(self):
@@ -3817,7 +3817,7 @@
         transform, root = self.get_transform()
         old_root_id = transform.tree_file_id(root)
         transform.apply()
-        self.assertEqual(old_root_id, self.wt.get_root_id())
+        self.assertEqual(old_root_id, self.wt.path2id(''))
         self.assertEqual([(self.wt, transform)], calls)
 
     def test_post_commit_hooks(self):
@@ -3830,7 +3830,7 @@
         transform, root = self.get_transform()
         old_root_id = transform.tree_file_id(root)
         transform.apply()
-        self.assertEqual(old_root_id, self.wt.get_root_id())
+        self.assertEqual(old_root_id, self.wt.path2id(''))
         self.assertEqual([(self.wt, transform)], calls)
 
 
 
=== modified file 'breezy/tests/test_workingtree_4.py'
--- breezy/tests/test_workingtree_4.py	2019-06-16 23:54:50 +0000
+++ breezy/tests/test_workingtree_4.py	2019-07-25 23:25:31 +0000
@@ -538,22 +538,19 @@
                                           format=format_name)
         tree2 = self.make_branch_and_tree('tree2',
                                           format=format_name)
-        self.assertNotEqual(tree1.get_root_id(), tree2.get_root_id())
+        self.assertNotEqual(tree1.path2id(''), tree2.path2id(''))
         # when you branch, it inherits the same root id
         tree1.commit('first post')
         tree3 = tree1.controldir.sprout('tree3').open_workingtree()
-        self.assertEqual(tree3.get_root_id(), tree1.get_root_id())
+        self.assertEqual(tree3.path2id(''), tree1.path2id(''))
 
     def test_set_root_id(self):
         # similar to some code that fails in the dirstate-plus-subtree branch
         # -- setting the root id while adding a parent seems to scramble the
         # dirstate invariants. -- mbp 20070303
         def validate():
-            wt.lock_read()
-            try:
+            with wt.lock_read():
                 wt.current_dirstate()._validate()
-            finally:
-                wt.unlock()
         wt = self.make_workingtree('tree')
         wt.set_root_id(b'TREE-ROOTID')
         validate()
@@ -567,10 +564,10 @@
 
     def test_default_root_id(self):
         tree = self.make_branch_and_tree('tag', format='dirstate-tags')
-        self.assertEqual(inventory.ROOT_ID, tree.get_root_id())
+        self.assertEqual(inventory.ROOT_ID, tree.path2id(''))
         tree = self.make_branch_and_tree('subtree',
                                          format='development-subtree')
-        self.assertNotEqual(inventory.ROOT_ID, tree.get_root_id())
+        self.assertNotEqual(inventory.ROOT_ID, tree.path2id(''))
 
     def test_non_subtree_with_nested_trees(self):
         # prior to dirstate, st/diff/commit ignored nested trees.
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2019-06-22 12:07:42 +0000
+++ breezy/transform.py	2019-07-25 23:25:31 +0000
@@ -455,7 +455,7 @@
             return None
         # the file is old; the old id is still valid
         if self._new_root == trans_id:
-            return self._tree.get_root_id()
+            return self._tree.path2id('')
         return self._tree.path2id(path)
 
     def final_file_id(self, trans_id):
@@ -1823,7 +1823,7 @@
                     child_pb.update(gettext('removing file'),
                                     num, total_entries)
                 if trans_id == self._new_root:
-                    file_id = self._tree.get_root_id()
+                    file_id = self._tree.path2id('')
                 else:
                     file_id = self.tree_file_id(trans_id)
                 # File-id isn't really being deleted, just moved
@@ -2102,9 +2102,6 @@
         """This Tree does not use inventory as its backing data."""
         raise NotImplementedError(_PreviewTree.root_inventory)
 
-    def get_root_id(self):
-        return self._transform.final_file_id(self._transform.root)
-
     def all_file_ids(self):
         tree_ids = set(self._transform._tree.all_file_ids())
         tree_ids.difference_update(self._transform.tree_file_id(t)
@@ -2288,7 +2285,7 @@
         else:
             if from_dir is None and include_root is True:
                 root_entry = inventory.make_entry(
-                    'directory', '', ROOT_PARENT, self.get_root_id())
+                    'directory', '', ROOT_PARENT, self.path2id(''))
                 yield '', 'V', 'directory', root_entry
             entries = self._iter_entries_for_dir(from_dir or '')
             for path, entry in entries:
@@ -2620,7 +2617,7 @@
     file_trans_id = {}
     top_pb = ui.ui_factory.nested_progress_bar()
     pp = ProgressPhase("Build phase", 2, top_pb)
-    if tree.get_root_id() is not None:
+    if tree.path2id('') is not None:
         # This is kind of a hack: we should be altering the root
         # as part of the regular tree shape diff logic.
         # The conditional test here is to avoid doing an
@@ -2628,14 +2625,14 @@
         # is set within the tree, nor setting the root and thus
         # marking the tree as dirty, because we use two different
         # idioms here: tree interfaces and inventory interfaces.
-        if wt.get_root_id() != tree.get_root_id():
-            wt.set_root_id(tree.get_root_id())
+        if wt.path2id('') != tree.path2id(''):
+            wt.set_root_id(tree.path2id(''))
             wt.flush()
     tt = wt.get_transform()
     divert = set()
     try:
         pp.next_phase()
-        file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
+        file_trans_id[wt.path2id('')] = tt.trans_id_tree_path('')
         with ui.ui_factory.nested_progress_bar() as pb:
             deferred_contents = []
             num = 0
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2019-06-29 12:29:45 +0000
+++ breezy/tree.py	2019-07-25 23:25:31 +0000
@@ -529,10 +529,6 @@
         """
         raise NotImplementedError(self.get_symlink_target)
 
-    def get_root_id(self):
-        """Return the file_id for the root of this tree."""
-        raise NotImplementedError(self.get_root_id)
-
     def annotate_iter(self, path,
                       default_revision=_mod_revision.CURRENT_REVISION):
         """Return an iterator of revision_id, line tuples.
 
=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2019-06-18 11:21:15 +0000
+++ breezy/workingtree.py	2019-07-25 23:25:31 +0000
@@ -398,10 +398,6 @@
                 parents.append(revision_id)
         return parents
 
-    def get_root_id(self):
-        """Return the id of this trees root"""
-        raise NotImplementedError(self.get_root_id)
-
     def clone(self, to_controldir, revision_id=None):
         """Duplicate this working tree into to_bzr, including all state.
 
@@ -424,7 +420,7 @@
     def copy_content_into(self, tree, revision_id=None):
         """Copy the current content and user files of this tree into tree."""
         with self.lock_read():
-            tree.set_root_id(self.get_root_id())
+            tree.set_root_id(self.path2id(''))
             if revision_id is None:
                 merge.transform_tree(tree, self)
             else:
@@ -841,8 +837,8 @@
                         this_tree=self,
                         change_reporter=change_reporter,
                         show_base=show_base)
-                    basis_root_id = basis_tree.get_root_id()
-                    new_root_id = new_basis_tree.get_root_id()
+                    basis_root_id = basis_tree.path2id('')
+                    new_root_id = new_basis_tree.path2id('')
                     if new_root_id is not None and basis_root_id != new_root_id:
                         self.set_root_id(new_root_id)
                 # TODO - dedup parents list with things merged by pull ?
@@ -1170,11 +1166,11 @@
                 # the working tree is up to date with the branch
                 # we can merge the specified revision from master
                 to_tree = self.branch.repository.revision_tree(revision)
-                to_root_id = to_tree.get_root_id()
+                to_root_id = to_tree.path2id('')
 
                 basis = self.basis_tree()
                 with basis.lock_read():
-                    if (basis.get_root_id() is None or basis.get_root_id() != to_root_id):
+                    if (basis.path2id('') is None or basis.path2id('') != to_root_id):
                         self.set_root_id(to_root_id)
                         self.flush()
 
 
=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-07-07 19:36:13 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-07-25 23:25:31 +0000
@@ -99,6 +99,9 @@
 * New ``Tree.get_transform`` method for getting a ``TreeTransform``
   object. (Jelmer Vernooij)
 
+* The ``Tree.get_root_id`` method has been removed. Use
+  ``Tree.path2id('')`` instead. (Jelmer Vernooij)
+
 * ``Repository.find_branches`` now returns an iterator rather than a
   list. (Jelmer Vernooij, #413970)