Merge lp:~jelmer/brz/iter-tree-references-lock into lp:brz

[Jelmer Vernooij]

Fix WorkingTree.iter_references, and add test.

Fix WorkingTree.iter_references, and add test.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2020-01-11 22:33:18 +0000
+++ breezy/bzr/workingtree_4.py	2020-01-18 00:19:13 +0000
@@ -130,6 +130,9 @@
         self.views = self._make_views()
         # --- allow tests to select the dirstate iter_changes implementation
         self._iter_changes = dirstate._process_entry
+        self._repo_supports_tree_reference = getattr(
+            self._branch.repository._format, "supports_tree_reference",
+            False)
 
     def _add(self, files, ids, kinds):
         """See MutableTree._add."""
@@ -550,20 +553,21 @@
             # When the repo doesn't support references, we will have nothing to
             # return
             return
-        for key, tree_details in self.current_dirstate()._iter_entries():
-            if tree_details[0][0] in (b'a', b'r'):  # absent, relocated
-                # not relevant to the working tree
-                continue
-            if not key[1]:
-                # the root is not a reference.
-                continue
-            relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
-            try:
-                if self.kind(relpath) == 'tree-reference':
-                    yield relpath
-            except errors.NoSuchFile:
-                # path is missing on disk.
-                continue
+        with self.lock_read():
+            for key, tree_details in self.current_dirstate()._iter_entries():
+                if tree_details[0][0] in (b'a', b'r'):  # absent, relocated
+                    # not relevant to the working tree
+                    continue
+                if not key[1]:
+                    # the root is not a reference.
+                    continue
+                relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
+                try:
+                    if self.kind(relpath) == 'tree-reference':
+                        yield relpath
+                except errors.NoSuchFile:
+                    # path is missing on disk.
+                    continue
 
     def _observed_sha1(self, path, sha_and_stat):
         """See MutableTree._observed_sha1."""

=== modified file 'breezy/tests/per_tree/test_tree.py'
--- breezy/tests/per_tree/test_tree.py	2019-09-27 02:48:17 +0000
+++ breezy/tests/per_tree/test_tree.py	2020-01-18 00:19:13 +0000
@@ -78,7 +78,7 @@
 class TestReference(TestCaseWithTree):
 
     def skip_if_no_reference(self, tree):
-        if not getattr(tree, 'supports_tree_reference', lambda: False)():
+        if not tree.supports_tree_reference():
             raise tests.TestNotApplicable('Tree references not supported')
 
     def create_nested(self):

=== modified file 'breezy/tests/per_workingtree/test_add_reference.py'
--- breezy/tests/per_workingtree/test_add_reference.py	2019-10-14 00:25:24 +0000
+++ breezy/tests/per_workingtree/test_add_reference.py	2020-01-18 00:19:13 +0000
@@ -61,6 +61,7 @@
                 self.assertEqual(
                     sub_tree.last_revision(),
                     tree.get_reference_revision('sub-tree'))
+        self.assertEqual(['sub-tree'], list(tree.iter_references()))
 
     def test_add_reference_same_root(self):
         tree = self.make_branch_and_tree('tree')

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2020-01-10 01:40:18 +0000
+++ breezy/transform.py	2020-01-18 00:19:13 +0000
@@ -2036,6 +2036,11 @@
         self._iter_changes_cache = dict((c.file_id, c) for c in
                                         self._transform.iter_changes())
 
+    def supports_tree_reference(self):
+        # TODO(jelmer): Support tree references in _PreviewTree.
+        # return self._transform._tree.supports_tree_reference()
+        return False
+
     def _content_change(self, file_id):
         """Return True if the content of this file changed"""
         changes = self._iter_changes_cache.get(file_id)
@@ -2342,6 +2347,15 @@
             with self.get_file(path) as fileobj:
                 return sha_file(fileobj)
 
+    def get_reference_revision(self, path):
+        trans_id = self._path2trans_id(path)
+        if trans_id is None:
+            raise errors.NoSuchFile(path)
+        reference_revision = self._transform._new_reference_revision.get(trans_id)
+        if reference_revision is None:
+            return self._transform._tree.get_reference_revision(path)
+        return reference_revision
+
     def is_executable(self, path):
         trans_id = self._path2trans_id(path)
         if trans_id is None: