Merge lp:~jelmer/brz/remove-unused into lp:brz

[Jelmer Vernooij]

Remove Tree.has_id.

Remove Tree.has_id.

This call is O(n-subtrees).

Replace with Tree.id2path or (where possible) avoid it altogether.

[Martin Packman (gz)]

Changes here all look sensible. I'm down with making expensive things look expensive.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2019-08-11 13:33:45 +0000
+++ breezy/builtins.py	2019-10-13 15:35:30 +0000
@@ -2386,13 +2386,13 @@
         self.enter_context(tree.lock_read())
         old = tree.basis_tree()
         self.enter_context(old.lock_read())
-        for path, ie in old.iter_entries_by_dir():
-            if not tree.has_id(ie.file_id):
-                self.outf.write(path)
-                if show_ids:
-                    self.outf.write(' ')
-                    self.outf.write(ie.file_id)
-                self.outf.write('\n')
+        delta = tree.changes_from(old)
+        for change in delta.removed:
+            self.outf.write(change.path[0])
+            if show_ids:
+                self.outf.write(' ')
+                self.outf.write(change.file_id)
+            self.outf.write('\n')
 
 
 class cmd_modified(Command):
 
=== modified file 'breezy/bzr/bundle/bundle_data.py'
--- breezy/bzr/bundle/bundle_data.py	2019-09-21 15:10:27 +0000
+++ breezy/bzr/bundle/bundle_data.py	2019-10-13 15:35:30 +0000
@@ -32,6 +32,7 @@
 from ...errors import (
     TestamentMismatch,
     BzrError,
+    NoSuchId,
     )
 from ..inventory import (
     Inventory,
@@ -486,7 +487,6 @@
         self.patches = {}
         self._targets = {}  # new path => new symlink target
         self.deleted = []
-        self.contents_by_id = True
         self.revision_id = revision_id
         self._inventory = None
 
@@ -602,22 +602,13 @@
             return path
         old_path = self.base_tree.id2path(file_id)
         if old_path is None:
-            return None
+            raise NoSuchId(file_id, self)
         if old_path in self.deleted:
-            return None
-        return self.new_path(old_path)
-
-    def old_contents_id(self, file_id):
-        """Return the id in the base_tree for the given file_id.
-        Return None if the file did not exist in base.
-        """
-        if self.contents_by_id:
-            if self.base_tree.has_id(file_id):
-                return file_id
-            else:
-                return None
-        new_path = self.id2path(file_id)
-        return self.base_tree.path2id(new_path)
+            raise NoSuchId(file_id, self)
+        new_path = self.new_path(old_path)
+        if new_path is None:
+            raise NoSuchId(file_id, self)
+        return new_path
 
     def get_file(self, path):
         """Return a file-like object containing the new contents of the
@@ -628,13 +619,14 @@
                 then be cached.
         """
         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.path2id('')):
-            old_path = self.base_tree.id2path(base_id)
+        try:
+            old_path = self.base_tree.id2path(file_id)
+        except NoSuchId:
+            patch_original = None
+        else:
+            if old_path is None:
+                import pdb; pdb.set_trace()
             patch_original = self.base_tree.get_file(old_path)
-        else:
-            patch_original = None
         file_patch = self.patches.get(path)
         if file_patch is None:
             if (patch_original is None and
@@ -780,8 +772,9 @@
         for result in viewitems(self._new_id):
             paths.append(result)
         for id in self.base_tree.all_file_ids():
-            path = self.id2path(id)
-            if path is None:
+            try:
+                path = self.id2path(id)
+            except NoSuchId:
                 continue
             paths.append((path, id))
         paths.sort()
 
=== modified file 'breezy/bzr/bundle/serializer/v08.py'
--- breezy/bzr/bundle/serializer/v08.py	2019-09-21 19:27:04 +0000
+++ breezy/bzr/bundle/serializer/v08.py	2019-10-13 15:35:30 +0000
@@ -269,13 +269,14 @@
 
         def do_diff(file_id, old_path, new_path, action, force_binary):
             def tree_lines(tree, path, require_text=False):
-                if tree.has_id(file_id):
+                try:
                     tree_file = tree.get_file(path)
+                except errors.NoSuchFile:
+                    return []
+                else:
                     if require_text is True:
                         tree_file = text_file(tree_file)
                     return tree_file.readlines()
-                else:
-                    return []
 
             try:
                 if force_binary:
 
=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2019-09-25 19:11:10 +0000
+++ breezy/bzr/inventorytree.py	2019-10-13 15:35:30 +0000
@@ -172,10 +172,6 @@
         inventory, file_id = self._unpack_file_id(file_id)
         return inventory.id2path(file_id)
 
-    def has_id(self, file_id):
-        inventory, file_id = self._unpack_file_id(file_id)
-        return inventory.has_id(file_id)
-
     def all_file_ids(self):
         return {entry.file_id for path, entry in self.iter_entries_by_dir()}
 
 
=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2019-07-25 23:22:30 +0000
+++ breezy/bzr/vf_repository.py	2019-10-13 15:35:30 +0000
@@ -2916,9 +2916,10 @@
         # the parents inserted are not those commit would do - in particular
         # they are not filtered by heads(). RBC, AB
         for revision, tree in viewitems(parent_trees):
-            if not tree.has_id(ie.file_id):
+            try:
+                path = tree.id2path(ie.file_id)
+            except errors.NoSuchId:
                 continue
-            path = tree.id2path(ie.file_id)
             parent_id = tree.get_file_revision(path)
             if parent_id in text_parents:
                 continue
 
=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2019-09-25 19:11:10 +0000
+++ breezy/bzr/workingtree.py	2019-10-13 15:35:30 +0000
@@ -658,14 +658,6 @@
             self._set_inventory(result, dirty=False)
             return result
 
-    def has_id(self, file_id):
-        # files that have been deleted are excluded
-        inv, inv_file_id = self._unpack_file_id(file_id)
-        if not inv.has_id(inv_file_id):
-            return False
-        path = inv.id2path(inv_file_id)
-        return osutils.lexists(self.abspath(path))
-
     def all_file_ids(self):
         """Iterate through file_ids for this tree.
 
@@ -1368,7 +1360,9 @@
                 if after:
                     basis = self.basis_tree()
                     with basis.lock_read():
-                        if not basis.has_id(to_id):
+                        try:
+                            basis.id2path(to_id)
+                        except errors.NoSuchId:
                             rename_entry.change_id = True
                             allowed = True
                 if not allowed:
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2019-09-25 19:11:10 +0000
+++ breezy/bzr/workingtree_4.py	2019-10-13 15:35:30 +0000
@@ -175,9 +175,13 @@
             if sub_tree_id == self.path2id(''):
                 raise BadReferenceTarget(self, sub_tree,
                                          'Trees have the same root id.')
-            if self.has_id(sub_tree_id):
-                raise BadReferenceTarget(self, sub_tree,
-                                         'Root id already present in tree')
+            try:
+                self.id2path(sub_tree_id)
+            except errors.NoSuchId:
+                pass
+            else:
+                raise BadReferenceTarget(
+                    self, sub_tree, 'Root id already present in tree')
             self._add([sub_tree_path], [sub_tree_id], ['tree-reference'])
 
     def break_lock(self):
@@ -467,14 +471,6 @@
     def get_nested_tree(self, path):
         return WorkingTree.open(self.abspath(path))
 
-    def has_id(self, file_id):
-        state = self.current_dirstate()
-        row, parents = self._get_entry(file_id=file_id)
-        if row is None:
-            return False
-        return osutils.lexists(pathjoin(
-            self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
-
     def id2path(self, file_id):
         "Convert a file-id to a path."
         with self.lock_read():
 
=== modified file 'breezy/git/tests/test_memorytree.py'
--- breezy/git/tests/test_memorytree.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_memorytree.py	2019-10-13 15:35:30 +0000
@@ -142,19 +142,18 @@
         """Some test for unversion of a memory tree."""
         branch = self.make_branch('branch')
         tree = branch.create_memorytree()
-        tree.lock_write()
-        tree.add(['', 'foo'], kinds=['directory', 'file'])
-        tree.unversion(['foo'])
-        self.assertFalse(tree.has_id(b'foo-id'))
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], kinds=['directory', 'file'])
+            tree.unversion(['foo'])
+            self.assertFalse(tree.is_versioned('foo'))
+            self.assertFalse(tree.has_filename('foo'))
 
     def test_last_revision(self):
         """There should be a last revision method we can call."""
         tree = self.make_branch_and_memory_tree('branch')
-        tree.lock_write()
-        tree.add('')
-        rev_id = tree.commit('first post')
-        tree.unlock()
+        with tree.lock_write():
+            tree.add('')
+            rev_id = tree.commit('first post')
         self.assertEqual(rev_id, tree.last_revision())
 
     def test_rename_file(self):
 
=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2019-09-25 19:11:10 +0000
+++ breezy/git/tree.py	2019-10-13 15:35:30 +0000
@@ -360,13 +360,6 @@
                     todo.append((store, subpath, hexsha))
         return ret
 
-    def has_id(self, file_id):
-        try:
-            path = self.id2path(file_id)
-        except errors.NoSuchId:
-            return False
-        return self.has_filename(path)
-
     def _lookup_path(self, path):
         if self.tree is None:
             raise errors.NoSuchFile(path)
@@ -1024,14 +1017,6 @@
                     osutils.safe_unicode(path))
             return None
 
-    def has_id(self, file_id):
-        try:
-            self.id2path(file_id)
-        except errors.NoSuchId:
-            return False
-        else:
-            return True
-
     def id2path(self, file_id):
         if file_id is None:
             return ''
 
=== modified file 'breezy/merge.py'
--- breezy/merge.py	2019-09-22 15:13:51 +0000
+++ breezy/merge.py	2019-10-13 15:35:30 +0000
@@ -1854,7 +1854,11 @@
         name_in_target = osutils.basename(self._target_subdir)
         merge_into_root = subdir.copy()
         merge_into_root.name = name_in_target
-        if self.this_tree.has_id(merge_into_root.file_id):
+        try:
+            self.this_tree.id2path(merge_into_root.file_id)
+        except errors.NoSuchId:
+            pass
+        else:
             # Give the root a new file-id.
             # This can happen fairly easily if the directory we are
             # incorporating is the root, and both trees have 'TREE_ROOT' as
 
=== modified file 'breezy/tests/blackbox/test_join.py'
--- breezy/tests/blackbox/test_join.py	2019-09-22 12:47:23 +0000
+++ breezy/tests/blackbox/test_join.py	2019-10-13 15:35:30 +0000
@@ -73,7 +73,7 @@
         self.addCleanup(sub_tree.unlock)
         if sub_tree.supports_setting_file_ids():
             self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
-            self.assertTrue(sub_tree.has_id(b'file1-id'))
+            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
             self.assertEqual(subtree_root_id, sub_tree.path2id(''))
             self.assertEqual('', sub_tree.id2path(subtree_root_id))
             self.assertIs(None, base_tree.path2id('subtree/file1'))
@@ -83,7 +83,7 @@
         self.assertEqual(['subtree'], list(base_tree.iter_references()))
         if base_tree.supports_setting_file_ids():
             self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
-            self.assertFalse(base_tree.has_id(b'file1-id'))
+            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
             self.assertEqual(subtree_root_id, base_tree.path2id('subtree'))
             self.assertEqual('subtree', base_tree.id2path(subtree_root_id))
 
 
=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2019-09-22 12:47:23 +0000
+++ breezy/tests/per_tree/test_tree.py	2019-10-13 15:35:30 +0000
@@ -295,20 +295,6 @@
                           list(tree.iter_child_entries('unknown')))
 
 
-class TestHasId(TestCaseWithTree):
-
-    def test_has_id(self):
-        work_tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/file'])
-        work_tree.add('file')
-        file_id = work_tree.path2id('file')
-        tree = self._convert_tree(work_tree)
-        tree.lock_read()
-        self.addCleanup(tree.unlock)
-        self.assertTrue(tree.has_id(file_id))
-        self.assertFalse(tree.has_id(b'dir-id'))
-
-
 class TestExtras(TestCaseWithTree):
 
     def test_extras(self):
 
=== modified file 'breezy/tests/per_workingtree/test_commit.py'
--- breezy/tests/per_workingtree/test_commit.py	2019-09-25 19:11:10 +0000
+++ breezy/tests/per_workingtree/test_commit.py	2019-10-13 15:35:30 +0000
@@ -312,10 +312,6 @@
         # a present on disk. After commit b-id, c-id and d-id should be
         # missing from the inventory, within the same tree transaction.
         wt.commit('commit stuff')
-        self.assertTrue(wt.has_id(a_id))
-        self.assertFalse(wt.has_id(b_id))
-        self.assertFalse(wt.has_id(c_id))
-        self.assertFalse(wt.has_id(d_id))
         self.assertTrue(wt.has_filename('a'))
         self.assertFalse(wt.has_filename('b'))
         self.assertFalse(wt.has_filename('b/c'))
@@ -324,16 +320,11 @@
         # the changes should have persisted to disk - reopen the workingtree
         # to be sure.
         wt = wt.controldir.open_workingtree()
-        wt.lock_read()
-        self.assertTrue(wt.has_id(a_id))
-        self.assertFalse(wt.has_id(b_id))
-        self.assertFalse(wt.has_id(c_id))
-        self.assertFalse(wt.has_id(d_id))
-        self.assertTrue(wt.has_filename('a'))
-        self.assertFalse(wt.has_filename('b'))
-        self.assertFalse(wt.has_filename('b/c'))
-        self.assertFalse(wt.has_filename('d'))
-        wt.unlock()
+        with wt.lock_read():
+            self.assertTrue(wt.has_filename('a'))
+            self.assertFalse(wt.has_filename('b'))
+            self.assertFalse(wt.has_filename('b/c'))
+            self.assertFalse(wt.has_filename('d'))
 
     def test_commit_deleted_subtree_with_removed(self):
         wt = self.make_branch_and_tree('.')
@@ -346,15 +337,12 @@
         wt.remove('b/c')
         this_dir = wt.controldir.root_transport
         this_dir.delete_tree('b')
-        wt.lock_write()
-        wt.commit('commit deleted rename')
-        self.assertTrue(wt.is_versioned('a'))
-        self.assertFalse(wt.has_id(b_id))
-        self.assertFalse(wt.has_id(c_id))
-        self.assertTrue(wt.has_filename('a'))
-        self.assertFalse(wt.has_filename('b'))
-        self.assertFalse(wt.has_filename('b/c'))
-        wt.unlock()
+        with wt.lock_write():
+            wt.commit('commit deleted rename')
+            self.assertTrue(wt.is_versioned('a'))
+            self.assertTrue(wt.has_filename('a'))
+            self.assertFalse(wt.has_filename('b'))
+            self.assertFalse(wt.has_filename('b/c'))
 
     def test_commit_move_new(self):
         wt = self.make_branch_and_tree('first')
 
=== modified file 'breezy/tests/per_workingtree/test_executable.py'
--- breezy/tests/per_workingtree/test_executable.py	2019-06-17 23:01:58 +0000
+++ breezy/tests/per_workingtree/test_executable.py	2019-10-13 15:35:30 +0000
@@ -52,16 +52,13 @@
                 the inventory still shows them, so don't assert that
                 the inventory is empty, just that the tree doesn't have them
         """
-        tree.lock_read()
-        if not ignore_inv and getattr(tree, 'root_inventory', None):
-            self.assertEqual(
-                [('', tree.root_inventory.root)],
-                list(tree.root_inventory.iter_entries()))
-        self.assertFalse(tree.has_id(self.a_id))
-        self.assertFalse(tree.has_filename('a'))
-        self.assertFalse(tree.has_id(self.b_id))
-        self.assertFalse(tree.has_filename('b'))
-        tree.unlock()
+        with tree.lock_read():
+            if not ignore_inv and getattr(tree, 'root_inventory', None):
+                self.assertEqual(
+                    [('', tree.root_inventory.root)],
+                    list(tree.root_inventory.iter_entries()))
+            self.assertFalse(tree.has_filename('a'))
+            self.assertFalse(tree.has_filename('b'))
 
     def commit_and_branch(self):
         """Commit the current tree, and create a second tree"""
 
=== modified file 'breezy/tests/test_bundle.py'
--- breezy/tests/test_bundle.py	2019-08-11 13:33:45 +0000
+++ breezy/tests/test_bundle.py	2019-10-13 15:35:30 +0000
@@ -148,10 +148,10 @@
         return self.ids.get(path)
 
     def id2path(self, file_id):
-        return self.paths.get(file_id)
-
-    def has_id(self, file_id):
-        return self.id2path(file_id) is not None
+        try:
+            return self.paths[file_id]
+        except KeyError:
+            raise errors.NoSuchId(file_id, self)
 
     def get_file(self, path):
         result = BytesIO()
@@ -270,7 +270,7 @@
         btree = self.make_tree_1()[0]
         btree.note_rename("grandparent/parent/file",
                           "grandparent/alt_parent/file")
-        self.assertTrue(btree.id2path(b"e") is None)
+        self.assertRaises(errors.NoSuchId, btree.id2path, b"e")
         self.assertFalse(btree.is_versioned("grandparent/parent/file"))
         btree.note_id(b"e", "grandparent/parent/file")
         return btree
@@ -292,16 +292,6 @@
         self.assertEqual(
             btree.get_symlink_target('grandparent/parent/symlink'), 'venus')
 
-    def test_adds2(self):
-        """File/inventory adds, with patch-compatibile renames"""
-        btree = self.make_tree_2()
-        btree.contents_by_id = False
-        add_patch = self.unified_diff([b"Hello\n"], [b"Extra cheese\n"])
-        btree.note_patch("grandparent/parent/file", add_patch)
-        btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
-        btree.note_target('grandparent/parent/symlink', 'venus')
-        self.adds_test(btree)
-
     def make_tree_3(self):
         btree, mtree = self.make_tree_1()
         mtree.add_file(b"e", "grandparent/parent/topping", b"Anchovies\n")
@@ -324,23 +314,13 @@
         btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
         self.get_file_test(btree)
 
-    def test_get_file2(self):
-        """Get file contents, with patch-compatible renames"""
-        btree = self.make_tree_3()
-        btree.contents_by_id = False
-        mod_patch = self.unified_diff([], [b"Lemon\n"])
-        btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
-        mod_patch = self.unified_diff([], [b"Hello\n"])
-        btree.note_patch("grandparent/alt_parent/file", mod_patch)
-        self.get_file_test(btree)
-
     def test_delete(self):
         "Deletion by bundle"
         btree = self.make_tree_1()[0]
         with btree.get_file(btree.id2path(b"c")) as f:
             self.assertEqual(f.read(), b"Hello\n")
         btree.note_deletion("grandparent/parent/file")
-        self.assertTrue(btree.id2path(b"c") is None)
+        self.assertRaises(errors.NoSuchId, btree.id2path, b"c")
         self.assertFalse(btree.is_versioned("grandparent/parent/file"))
 
     def sorted_ids(self, tree):
 
=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2019-06-15 15:59:17 +0000
+++ breezy/tests/test_commit.py	2019-10-13 15:35:30 +0000
@@ -173,7 +173,7 @@
             reporter.calls)
 
         tree = b.repository.revision_tree(b'rev2')
-        self.assertFalse(tree.has_id(b'hello-id'))
+        self.assertFalse(tree.has_filename('hello'))
 
     def test_partial_commit_move(self):
         """Test a partial commit where a file was renamed but not committed.
@@ -361,7 +361,7 @@
         wt.commit('removed hello', rev_id=b'rev2')
 
         tree = b.repository.revision_tree(b'rev2')
-        self.assertFalse(tree.has_id(b'hello-id'))
+        self.assertFalse(tree.has_filename('hello'))
 
     def test_committed_ancestry(self):
         """Test commit appends revisions to ancestry."""
 
=== modified file 'breezy/tests/test_memorytree.py'
--- breezy/tests/test_memorytree.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/test_memorytree.py	2019-10-13 15:35:30 +0000
@@ -170,7 +170,7 @@
                      kinds=['directory', 'file'])
             tree.unversion(['foo'])
             self.assertFalse(tree.is_versioned('foo'))
-            self.assertFalse(tree.has_id(b'foo-id'))
+            self.assertRaises(errors.NoSuchId, tree.id2path, b'foo-id')
 
     def test_last_revision(self):
         """There should be a last revision method we can call."""
 
=== modified file 'breezy/tests/test_shelf.py'
--- breezy/tests/test_shelf.py	2018-11-16 18:33:17 +0000
+++ breezy/tests/test_shelf.py	2019-10-13 15:35:30 +0000
@@ -381,8 +381,8 @@
         return creator, tree
 
     def check_shelve_deletion(self, tree):
-        self.assertTrue(tree.has_id(b'foo-id'))
-        self.assertTrue(tree.has_id(b'bar-id'))
+        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
+        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
         self.assertFileEqual(b'baz', 'tree/foo/bar')
 
     def test_shelve_deletion(self):
@@ -611,15 +611,15 @@
             creator.transform()
             creator.finalize()
         # validate the test setup
-        self.assertTrue(tree.has_id(b'foo-id'))
-        self.assertTrue(tree.has_id(b'bar-id'))
+        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
+        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
         self.assertFileEqual(b'baz', 'tree/foo/bar')
         with open('shelf', 'r+b') as shelf_file:
             unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
             self.addCleanup(unshelver.finalize)
             unshelver.make_merger().do_merge()
-        self.assertFalse(tree.has_id(b'foo-id'))
-        self.assertFalse(tree.has_id(b'bar-id'))
+        self.assertRaises(errors.NoSuchId, tree.id2path, b'foo-id')
+        self.assertRaises(errors.NoSuchId, tree.id2path, b'bar-id')
 
     def test_unshelve_base(self):
         tree = self.make_branch_and_tree('tree')
 
=== modified file 'breezy/tests/test_smart_add.py'
--- breezy/tests/test_smart_add.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/test_smart_add.py	2019-10-13 15:35:30 +0000
@@ -17,6 +17,7 @@
 from .. import (
     add,
     cache_utf8,
+    errors,
     tests,
     )
 from ..bzr import (
@@ -116,11 +117,11 @@
         self.assertNotEqual(None, c_id)
         self.base_tree.lock_read()
         self.addCleanup(self.base_tree.unlock)
-        self.assertFalse(self.base_tree.has_id(c_id))
+        self.assertRaises(errors.NoSuchId, self.base_tree.id2path, c_id)
 
         d_id = new_tree.path2id('subdir/d')
         self.assertNotEqual(None, d_id)
-        self.assertFalse(self.base_tree.has_id(d_id))
+        self.assertRaises(errors.NoSuchId, self.base_tree.id2path, d_id)
 
     def test_copy_existing_dir(self):
         self.make_base_tree()
@@ -141,7 +142,7 @@
         self.assertNotEqual(None, a_id)
         self.base_tree.lock_read()
         self.addCleanup(self.base_tree.unlock)
-        self.assertFalse(self.base_tree.has_id(a_id))
+        self.assertRaises(errors.NoSuchId, self.base_tree.id2path, a_id)
 
 
 class TestAddActions(tests.TestCase):
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2019-09-25 19:11:10 +0000
+++ breezy/transform.py	2019-10-13 15:35:30 +0000
@@ -2121,18 +2121,6 @@
 
         return tree_paths
 
-    def _has_id(self, file_id, fallback_check):
-        if file_id in self._transform._r_new_id:
-            return True
-        elif file_id in {self._transform.tree_file_id(trans_id) for
-                         trans_id in self._transform._removed_id}:
-            return False
-        else:
-            return fallback_check(file_id)
-
-    def has_id(self, file_id):
-        return self._has_id(file_id, self._transform._tree.has_id)
-
     def _path2trans_id(self, path):
         # We must not use None here, because that is a valid value to store.
         trans_id = self._path2trans_id_cache.get(path, object)
@@ -2180,11 +2168,6 @@
         self._all_children_cache[trans_id] = children
         return children
 
-    def _iter_children(self, file_id):
-        trans_id = self._transform.trans_id_file_id(file_id)
-        for child_trans_id in self._all_children(trans_id):
-            yield self._transform.final_file_id(child_trans_id)
-
     def extras(self):
         possible_extras = set(self._transform.trans_id_tree_path(p) for p
                               in self._transform._tree.extras())
@@ -2561,13 +2544,6 @@
         return [(self.get_path(t), t) for t in trans_ids]
 
 
-def topology_sorted_ids(tree):
-    """Determine the topological order of the ids in a tree"""
-    file_ids = list(tree)
-    file_ids.sort(key=tree.id2path)
-    return file_ids
-
-
 def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
                delta_from_tree=False):
     """Create working tree for a branch, using a TreeTransform.