Merge lp:~jelmer/brz/follow-tree-references-id2path into lp:brz

[Jelmer Vernooij]

Add support for tree references in id2path.

Add support for tree references in id2path.

[Jelmer Vernooij (jelmer)]

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/583/

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2019-10-15 19:16:34 +0000
+++ breezy/bzr/workingtree_4.py	2019-10-15 19:16:34 +0000
@@ -475,6 +475,16 @@
             state = self.current_dirstate()
             entry = self._get_entry(file_id=file_id)
             if entry == (None, None):
+                if 'evil' in debug.debug_flags:
+                    trace.mutter_callsite(
+                        2, "Tree.id2path scans all nested trees.")
+                for nested_path in self.iter_references():
+                    nested_tree = self.get_nested_tree(nested_path)
+                    try:
+                        return osutils.pathjoin(
+                            nested_path, nested_tree.id2path(file_id))
+                    except errors.NoSuchId:
+                        pass
                 raise errors.NoSuchId(tree=self, file_id=file_id)
             path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
             return path_utf8.decode('utf8')
@@ -1739,11 +1749,18 @@
 
     def id2path(self, file_id):
         "Convert a file-id to a path."
-        entry = self._get_entry(file_id=file_id)
-        if entry == (None, None):
-            raise errors.NoSuchId(tree=self, file_id=file_id)
-        path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
-        return path_utf8.decode('utf8')
+        with self.lock_read():
+            entry = self._get_entry(file_id=file_id)
+            if entry == (None, None):
+                for nested_path in self.iter_references():
+                    nested_tree = self.get_nested_tree(nested_path)
+                    try:
+                        return osutils.pathjoin(nested_path, nested_tree.id2path(file_id))
+                    except errors.NoSuchId:
+                        pass
+                raise errors.NoSuchId(tree=self, file_id=file_id)
+            path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
+            return path_utf8.decode('utf8')
 
     def get_nested_tree(self, path):
         with self.lock_read():
@@ -2075,6 +2092,9 @@
         with self.lock_read():
             entry = self._get_entry(path=path)
             if entry == (None, None):
+                nested_tree, subpath = self.get_containing_nested_tree(path)
+                if nested_tree is not None:
+                    return nested_tree.path2id(subpath)
                 return None
             return entry[0][2]
 

=== modified file 'breezy/tests/per_tree/test_ids.py'
--- breezy/tests/per_tree/test_ids.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/per_tree/test_ids.py	2019-10-15 19:16:34 +0000
@@ -55,6 +55,30 @@
         self.assertEqual('dir/file', self.tree_a.id2path(b'file-id'))
         self.assertRaises(errors.NoSuchId, self.tree_a.id2path, b'nonexistant')
 
+    def skip_if_no_reference(self, tree):
+        if not getattr(tree, 'supports_tree_reference', lambda: False)():
+            raise tests.TestNotApplicable('Tree references not supported')
+
+    def create_nested(self):
+        work_tree = self.make_branch_and_tree('wt')
+        with work_tree.lock_write():
+            self.skip_if_no_reference(work_tree)
+            subtree = self.make_branch_and_tree('wt/subtree')
+            self.build_tree(['wt/subtree/a'])
+            subtree.add(['a'])
+            subtree.commit('foo')
+            work_tree.add_reference(subtree)
+        tree = self._convert_tree(work_tree)
+        self.skip_if_no_reference(tree)
+        return tree, subtree
+
+    def test_path2id_nested_tree(self):
+        tree, subtree = self.create_nested()
+        self.assertIsNot(None, tree.path2id('subtree'))
+        self.assertIsNot(None, tree.path2id('subtree/a'))
+        self.assertEqual('subtree', tree.id2path(tree.path2id('subtree')))
+        self.assertEqual('subtree/a', tree.id2path(tree.path2id('subtree/a')))
+
 
 class Path2IdsTests(TestCaseWithTree):
 

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2019-06-29 13:16:26 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2019-10-15 19:16:34 +0000
@@ -159,14 +159,12 @@
         self.assertEqual(1, len(result))
         if tree.has_versioned_directories():
             self.assertEqual(
-                ('filename', 'V', 'directory', tree.path2id('filename')),
-                (result[0][0], result[0][1], result[0][2],
-                    getattr(result[0][3], 'file_id', None)))
+                ('filename', 'V', 'directory'),
+                (result[0][0], result[0][1], result[0][2]))
         else:
             self.assertEqual(
-                ('filename', '?', 'directory', None),
-                (result[0][0], result[0][1], result[0][2],
-                    getattr(result[0][3], 'file_id', None)))
+                ('filename', '?', 'directory'),
+                (result[0][0], result[0][1], result[0][2]))
 
     def test_get_config_stack(self):
         # Smoke test that all working trees succeed getting a config