Merge lp:~jelmer/brz/id2path into lp:brz

[Jelmer Vernooij]

Remove Tree.id2path.

Remove Tree.id2path.

This is now a InventoryTree-specific method.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2021-05-30 16:44:00 +0000
+++ breezy/git/tree.py	2021-11-13 14:36:34 +0000
@@ -382,15 +382,6 @@
             raise _mod_tree.FileTimestampUnavailable(path)
         return rev.timestamp
 
-    def id2path(self, file_id, recurse='down'):
-        try:
-            path = self.mapping.parse_file_id(file_id)
-        except ValueError:
-            raise errors.NoSuchId(self, file_id)
-        if self.is_versioned(path):
-            return path
-        raise errors.NoSuchId(self, file_id)
-
     def is_versioned(self, path):
         return self.has_filename(path)
 
@@ -401,9 +392,6 @@
             return None
         return self.mapping.generate_file_id(osutils.safe_unicode(path))
 
-    def all_file_ids(self):
-        raise errors.UnsupportedOperation(self.all_file_ids, self)
-
     def all_versioned_paths(self):
         ret = {u''}
         todo = [(self.store, b'', self.tree)]
@@ -1164,20 +1152,6 @@
                     osutils.safe_unicode(path))
             return None
 
-    def id2path(self, file_id, recurse='down'):
-        if file_id is None:
-            return ''
-        if type(file_id) is not bytes:
-            raise TypeError(file_id)
-        with self.lock_read():
-            try:
-                path = self.mapping.parse_file_id(file_id)
-            except ValueError:
-                raise errors.NoSuchId(self, file_id)
-            if self.is_versioned(path):
-                return path
-            raise errors.NoSuchId(self, file_id)
-
     def _set_root_id(self, file_id):
         raise errors.UnsupportedOperation(self._set_root_id, self)
 

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2021-05-30 17:12:41 +0000
+++ breezy/git/workingtree.py	2021-11-13 14:36:34 +0000
@@ -920,9 +920,6 @@
                     yield (posixpath.relpath(path, from_dir),
                            ("I" if self.is_ignored(path) else "?"), kind, ie)
 
-    def all_file_ids(self):
-        raise errors.UnsupportedOperation(self.all_file_ids, self)
-
     def all_versioned_paths(self):
         with self.lock_read():
             paths = {u""}

=== modified file 'breezy/tests/per_tree/test_test_trees.py'
--- breezy/tests/per_tree/test_test_trees.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/per_tree/test_test_trees.py	2021-11-13 14:36:34 +0000
@@ -172,10 +172,11 @@
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
         # __iter__ has no strongly defined order
-        tree_root = tree.path2id('')
         try:
             all_file_ids = set(tree.all_file_ids())
-        except errors.UnsupportedOperation:
+            tree_root = tree.path2id('')
+        except AttributeError:
+            # doesn't support file ids
             all_file_ids = None
         if tree.has_versioned_directories():
             if all_file_ids is not None:
@@ -226,7 +227,6 @@
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
         # __iter__ has no strongly defined order
-        tree_root = tree.path2id('')
         if tree.has_versioned_directories():
             self.assertEqual(
                 {'', '0file', '1top-dir', '1top-dir/0file-in-1topdir',

=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2020-01-18 00:03:17 +0000
+++ breezy/tests/per_tree/test_tree.py	2021-11-13 14:36:34 +0000
@@ -138,11 +138,14 @@
 
 class TestFileIds(TestCaseWithTree):
 
+    def setUp(self):
+        super(TestFileIds, self).setUp()
+        if not self.workingtree_format.supports_setting_file_ids:
+            raise tests.TestNotApplicable("working tree does not support setting file ids")
+
     def test_id2path(self):
         # translate from file-id back to path
         work_tree = self.make_branch_and_tree('wt')
-        if not work_tree.supports_setting_file_ids():
-            self.skipTest("working tree does not support setting file ids")
         tree = self.get_tree_no_parents_abc_content(work_tree)
         a_id = tree.path2id('a')
         with tree.lock_read():
@@ -155,13 +158,9 @@
         tree = self.get_tree_no_parents_abc_content(work_tree)
         tree.lock_read()
         self.addCleanup(tree.unlock)
-        try:
-            self.assertEqual(tree.all_file_ids(),
-                             {tree.path2id('a'), tree.path2id(''),
-                              tree.path2id('b'), tree.path2id('b/c')})
-        except errors.UnsupportedOperation:
-            raise tests.TestNotApplicable(
-                'Tree does not support all_file_ids')
+        self.assertEqual(tree.all_file_ids(),
+                         {tree.path2id('a'), tree.path2id(''),
+                          tree.path2id('b'), tree.path2id('b/c')})
 
 
 class TestStoredKind(TestCaseWithTree):

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2020-08-22 22:46:24 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2021-11-13 14:36:34 +0000
@@ -1090,18 +1090,17 @@
             self.assertFalse(tree.is_executable('filename'))
 
     def test_all_file_ids_with_missing(self):
+        if not self.workingtree_format.supports_setting_file_ids:
+            raise TestNotApplicable('does not support setting file ids')
         tree = self.make_branch_and_tree('tree')
         tree.lock_write()
         self.addCleanup(tree.unlock)
         self.build_tree(['tree/a', 'tree/b'])
         tree.add(['a', 'b'])
         os.unlink('tree/a')
-        try:
-            self.assertEqual(
-                {'a', 'b', ''},
-                set(tree.all_versioned_paths()))
-        except errors.UnsupportedOperation:
-            raise TestNotApplicable('tree does not support all_file_ids')
+        self.assertEqual(
+            {'a', 'b', ''},
+            set(tree.all_versioned_paths()))
 
     def test_sprout_hardlink(self):
         real_os_link = getattr(os, 'link', None)

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2020-08-22 22:46:24 +0000
+++ breezy/tree.py	2021-11-13 14:36:34 +0000
@@ -281,21 +281,10 @@
         """
         return False
 
-    def all_file_ids(self):
-        """Iterate through all file ids, including ids for missing files."""
-        raise NotImplementedError(self.all_file_ids)
-
     def all_versioned_paths(self):
         """Iterate through all paths, including paths for missing files."""
         raise NotImplementedError(self.all_versioned_paths)
 
-    def id2path(self, file_id, recurse='down'):
-        """Return the path for a file id.
-
-        :raises NoSuchId:
-        """
-        raise NotImplementedError(self.id2path)
-
     def iter_entries_by_dir(self, specific_files=None, recurse_nested=False):
         """Walk the tree in 'by_dir' order.