Merge lp:~jelmer/brz/2a-supports-tree-reference into lp:brz

[Jelmer Vernooij]

Mark 2a format as supporting tree references.

Mark 2a format as supporting tree references.

The 2a format always supported storing TreeReferences, and would happily pull
in TreeReferences when e.g. pulling in data from development-subtree
repositories. I don't think there is any value in forcing our users through
an upgrade step.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

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

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

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

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

[Vincent Ladeuil (vila)]

I don't recall any related issue around tree references so it could just be that some tests weren't updated when 2a was released.

=== modified file 'breezy/bzr/groupcompress_repo.py'
--- breezy/bzr/groupcompress_repo.py	2019-06-02 02:35:46 +0000
+++ breezy/bzr/groupcompress_repo.py	2019-12-23 03:04:15 +0000
@@ -1391,6 +1391,7 @@
     _fetch_uses_deltas = False
     fast_deltas = True
     pack_compresses = True
+    supports_tree_reference = True
 
     def _get_matching_bzrdir(self):
         return controldir.format_registry.make_controldir('2a')
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2019-09-27 02:48:17 +0000
+++ breezy/bzr/workingtree_4.py	2019-12-23 03:04:15 +0000
@@ -565,10 +565,11 @@
         abspath = self.abspath(relpath)
         kind = file_kind(abspath)
         if (self._repo_supports_tree_reference and kind == 'directory'):
-            entry = self._get_entry(path=relpath)
-            if entry[1] is not None:
-                if entry[1][0][0] == b't':
-                    kind = 'tree-reference'
+            with self.lock_read():
+                entry = self._get_entry(path=relpath)
+                if entry[1] is not None:
+                    if entry[1][0][0] == b't':
+                        kind = 'tree-reference'
         return kind
 
     def _last_revision(self):
 
=== modified file 'breezy/tests/per_pack_repository.py'
--- breezy/tests/per_pack_repository.py	2019-06-29 19:54:32 +0000
+++ breezy/tests/per_pack_repository.py	2019-12-23 03:04:15 +0000
@@ -884,7 +884,7 @@
             # can only stack on repositories that have compatible internal
             # metadata
             if getattr(repo._format, 'supports_tree_reference', False):
-                matching_format_name = 'pack-0.92-subtree'
+                matching_format_name = '2a'
             else:
                 if repo._format.supports_chks:
                     matching_format_name = '2a'
@@ -915,7 +915,7 @@
         if getattr(repo._format, 'supports_tree_reference', False):
             # can only stack on repositories that have compatible internal
             # metadata
-            matching_format_name = 'pack-0.92-subtree'
+            matching_format_name = '2a'
             mismatching_format_name = 'rich-root-pack'
         else:
             if repo.supports_rich_root():
 
=== modified file 'breezy/tests/test_smart.py'
--- breezy/tests/test_smart.py	2019-03-06 21:27:22 +0000
+++ breezy/tests/test_smart.py	2019-12-23 03:04:15 +0000
@@ -2720,7 +2720,7 @@
         base_inv = repository.revision_tree(base_revid).root_inventory
         inv = repository.revision_tree(revid).root_inventory
         inv_delta = inv._make_delta(base_inv)
-        serializer = inventory_delta.InventoryDeltaSerializer(True, False)
+        serializer = inventory_delta.InventoryDeltaSerializer(True, True)
         return b"".join(serializer.delta_to_lines(base_revid, revid, inv_delta))
 
     def test_single(self):
 
=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-12-22 13:52:45 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-12-23 03:04:15 +0000
@@ -46,6 +46,11 @@
    have installed and speeds up import time since psutil brings in
    various other modules. (Jelmer Vernooij)
 
+ * The ``2a`` format now officially supports storing tree references.
+   It always partially supported storing tree reference data,
+   and would happily pull in tree reference data from other repository
+   formats. (Jelmer Vernooij)
+
  * A new ``fossil`` plugin has been added that warns users when they
    attempt to access Fossil repositories.
    (Jelmer Vernooij, #1848821)