Merge lp:~jelmer/brz/reference-absolute into lp:brz

[Jelmer Vernooij]

Use absolute URLs in branch reference locations.

Use absolute URLs in branch reference locations.

This fixes backward compatibility with bzr.

[Martin Packman (gz)]

Thank you very much! Great to have the test too.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2019-01-01 23:40:59 +0000
+++ breezy/builtins.py	2019-01-04 21:32:20 +0000
@@ -206,13 +206,13 @@
     try:
         reference = control_dir.get_branch_reference()
     except errors.NotBranchError:
-        # There is no active branch, just return the colocated branches.
-        for name, branch in viewitems(control_dir.get_branches()):
-            yield name, branch
-        return
+        reference = None
     if reference is not None:
-        ref_branch = Branch.open(
-            reference, possible_transports=possible_transports)
+        try:
+            ref_branch = Branch.open(
+                reference, possible_transports=possible_transports)
+        except errors.NotBranchError:
+            ref_branch = None
     else:
         ref_branch = None
     if ref_branch is None or ref_branch.name:
 
=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2018-11-30 12:39:04 +0000
+++ breezy/bzr/branch.py	2019-01-04 21:32:20 +0000
@@ -977,12 +977,12 @@
 
     def _write_reference(self, a_controldir, transport, to_branch):
         to_url = to_branch.user_url
-        if a_controldir.control_url == to_branch.controldir.control_url:
-            # Write relative paths for colocated branches, but absolute
-            # paths for everything else. This is for the benefit
-            # of older bzr versions that don't support relative paths.
-            to_url = urlutils.relative_url(
-                a_controldir.user_url, to_branch.user_url)
+        # Ideally, we'd write a relative path here for the benefit of colocated
+        # branches - so that moving a control directory doesn't break
+        # any references to colocated branches. Unfortunately, bzr
+        # does not support relative URLs. See pad.lv/1803845 -- jelmer
+        # to_url = urlutils.relative_url(
+        #    a_controldir.user_url, to_branch.user_url)
         transport.put_bytes('location', to_url.encode('utf-8'))
 
     def set_reference(self, a_controldir, name, to_branch):
 
=== modified file 'breezy/symbol_versioning.py'
--- breezy/symbol_versioning.py	2018-11-29 19:43:19 +0000
+++ breezy/symbol_versioning.py	2019-01-04 21:32:20 +0000
@@ -319,7 +319,7 @@
         if filter:
             try:
                 warnings.filters.remove(filter)
-            except IndexError:
+            except (ValueError, IndexError):
                 pass
     return cleanup
 
 
=== modified file 'breezy/tests/blackbox/test_switch.py'
--- breezy/tests/blackbox/test_switch.py	2018-12-21 18:57:26 +0000
+++ breezy/tests/blackbox/test_switch.py	2019-01-04 21:32:20 +0000
@@ -576,7 +576,7 @@
             $ mv mywork mywork1
             $ cd mywork1
             $ brz branches
-            * br1
+              br1
             ''', null_output_matches_anything=True)
 
     def test_switch_to_new_branch_on_old_rev(self):
 
=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py	2018-11-17 17:37:42 +0000
+++ breezy/tests/test_bzrdir.py	2019-01-04 21:32:20 +0000
@@ -1477,6 +1477,18 @@
             errors.AlreadyBranchError, tree.controldir.create_branch,
             name='foo')
 
+    def test_supports_relative_reference(self):
+        tree = self.make_branch_and_tree('.', format='development-colo')
+        target1 = tree.controldir.create_branch(name='target1')
+        target2 = tree.controldir.create_branch(name='target2')
+        source = tree.controldir.set_branch_reference(target1, name='source')
+        self.assertEqual(
+            target1.user_url, tree.controldir.open_branch('source').user_url)
+        source.controldir.get_branch_transport(None, 'source').put_bytes(
+            'location', b'file:,branch=target2')
+        self.assertEqual(
+            target2.user_url, tree.controldir.open_branch('source').user_url)
+
 
 class SampleBzrFormat(bzrdir.BzrFormat):