Merge lp:~jelmer/brz/auto-upgrade-reference into lp:brz

[Jelmer Vernooij]

Automatically upgrade to branch format 8 when setting branch references.

Automatically upgrade to branch format 8 when setting branch references.

I think this makes more sense than bothering users about an upgrade that involves creating a new file.

BzrBranchFormat8 has been included since bzr 1.15.

Note that just supporting tree references in branches doesn't mean support for nested trees is now available by default; for that you also need to have a repository that supports them, which is only available as part of development-subtree.

[Martin Packman (gz)]

We've discussed this in the past, and I think it's fair enough.

review: Approve

=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2019-02-15 18:57:38 +0000
+++ breezy/bzr/branch.py	2019-06-14 23:40:10 +0000
@@ -540,14 +540,17 @@
         with self.lock_read():
             if self._reference_info is not None:
                 return self._reference_info
-            with self._transport.get('references') as rio_file:
-                stanzas = rio.read_stanzas(rio_file)
-                info_dict = {
-                    s['tree_path']: (
-                        s['branch_location'],
-                        s['file_id'].encode('ascii')
-                        if 'file_id' in s else None)
-                    for s in stanzas}
+            try:
+                with self._transport.get('references') as rio_file:
+                    stanzas = rio.read_stanzas(rio_file)
+                    info_dict = {
+                        s['tree_path']: (
+                            s['branch_location'],
+                            s['file_id'].encode('ascii')
+                            if 'file_id' in s else None)
+                        for s in stanzas}
+            except errors.NoSuchFile:
+                info_dict = {}
             self._reference_info = info_dict
             return info_dict
 
@@ -687,14 +690,11 @@
     """A branch with support for a fallback repository."""
 
     def set_reference_info(self, tree_path, branch_location, file_id=None):
-        Branch.set_reference_info(self, file_id, tree_path, branch_location)
-
-    def get_reference_info(self, path):
-        Branch.get_reference_info(self, path)
-
-    def reference_parent(self, path, file_id=None, possible_transports=None):
-        return Branch.reference_parent(
-            self, path, file_id, possible_transports)
+        super(BzrBranch7, self).set_reference_info(
+            tree_path, branch_location, file_id=file_id)
+        format_string = BzrBranchFormat8.get_format_string()
+        mutter('Upgrading branch to format %r', format_string)
+        self._transport.put_bytes('format', format_string)
 
 
 class BzrBranch6(BzrBranch7):
@@ -862,6 +862,8 @@
     def supports_set_append_revisions_only(self):
         return True
 
+    supports_reference_locations = True
+
 
 class BzrBranchFormat8(BranchFormatMetadir):
     """Metadir format supporting storing locations of subtree branches."""
@@ -945,7 +947,9 @@
         """See breezy.branch.BranchFormat.make_tags()."""
         return _mod_tag.BasicTags(branch)
 
-    supports_reference_locations = False
+    # This is a white lie; as soon as you set a reference location, we upgrade
+    # you to BzrBranchFormat8.
+    supports_reference_locations = True
 
 
 class BranchReferenceFormat(BranchFormatMetadir):

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-06-03 23:26:04 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-06-14 23:40:10 +0000
@@ -37,6 +37,9 @@
   ``brz propose``, for hosting sites that support it.
   (Jelmer Vernooij)
 
+* Automatically upgrade to branch format 8 when setting branch references.
+  (Jelmer Vernooij)
+
 Bug Fixes
 *********