Merge lp:~jelmer/brz/default-is-reference into lp:brz

[Jelmer Vernooij]

Allow the default branch to be a reference branch.

Allow the default branch to be a reference branch.

This is necessary since Git's HEAD branch (the default branch) is a reference
branch by default.

[Martin Packman (gz)]

Thanks.

review: Approve

=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2018-03-05 21:45:41 +0000
+++ breezy/tests/per_branch/test_branch.py	2018-03-07 01:22:28 +0000
@@ -633,9 +633,22 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        made_branch = self.make_branch('.')
+        made_controldir = self.make_controldir('.')
+        made_controldir.create_repository()
+        if made_controldir._format.colocated_branches:
+            # Formats that support colocated branches sometimes have a default
+            # branch that is a reference branch (such as Git). Cope with
+            # those by creating a different colocated branch.
+            name = 'foo'
+        else:
+            name = None
+        try:
+            made_branch = made_controldir.create_branch(name)
+        except errors.UninitializableFormat:
+            raise tests.TestNotApplicable('Uninitializable branch format')
+
         self.assertEqual(None,
-            made_branch._format.get_reference(made_branch.controldir))
+            made_branch._format.get_reference(made_branch.controldir, name))
 
     def test_set_reference(self):
         """set_reference on all regular branches should be callable."""

=== modified file 'breezy/tests/per_controldir/test_controldir.py'
--- breezy/tests/per_controldir/test_controldir.py	2018-03-04 02:57:55 +0000
+++ breezy/tests/per_controldir/test_controldir.py	2018-03-07 01:22:28 +0000
@@ -497,8 +497,16 @@
 
     def test_get_branch_reference_on_non_reference(self):
         """get_branch_reference should return None for non-reference branches."""
-        branch = self.make_branch('referenced')
-        self.assertEqual(None, branch.controldir.get_branch_reference())
+        dir = self.make_controldir('referenced')
+        dir.create_repository()
+        if dir._format.colocated_branches:
+            # The default branch in a controldir might be a reference branch
+            # (e.g. for Git), so let's create another one.
+            name = 'foo'
+        else:
+            name = None
+        branch = dir.create_branch(name)
+        self.assertEqual(None, branch.controldir.get_branch_reference(name))
 
     def test_get_branch_reference_no_branch(self):
         """get_branch_reference should not mask NotBranchErrors."""