Merge lp:~spiv/bzr/default-stacking-again into lp:~bzr/bzr/trunk-old

[Andrew Bennetts]

[Andrew Bennetts (spiv)]

Fix for bug 388675. When using the BzrDirFormat.initialize_ex_1.16 verb the wrong branch format was created by the client if stacking was triggered by a default stacking policy. The cause was that in that case require_stacking() wasn't being triggered in the client, just server-side, but it's the client that chooses the branch format.

So this patch simply makes sure require_stacking() is called if the server requires stacking. This may be a candidate for cherrypicking into 1.16...

[Robert Collins (lifeless)]

On Thu, 2009-06-18 at 03:55 +0000, Andrew Bennetts wrote:
>
>
> So this patch simply makes sure require_stacking() is called if the
> server requires stacking. This may be a candidate for cherrypicking
> into 1.16...

 review +1

seems to be some noise in the diff

review: Approve

[Andrew Bennetts (spiv)]

(Btw, if we want to include this in 1.16, there's a cherry-pick integrated at: lp:~spiv/bzr/bzr-1.16)

[Andrew Bennetts (spiv)]

> review +1
>
> seems to be some noise in the diff

Yeah, odd. Perhaps lp's copy of bzr.dev is a bit out of date?

=== modified file 'NEWS'
--- NEWS	2009-06-18 02:01:16 +0000
+++ NEWS	2009-06-18 04:35:12 +0000
@@ -25,6 +25,10 @@
   diverged-branches`` when a push fails because the branches have
   diverged.  (Neil Martinsen-Burrell, #269477)
 
+* Automatic format upgrades triggered by default stacking policies on a
+  1.16rc1 (or later) smart server work again.
+  (Andrew Bennetts, #388675)
+
 * Better message in ``bzr split`` error suggesting a rich root format.
   (Neil Martinsen-Burrell, #220067)
 

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2009-06-12 03:44:12 +0000
+++ bzrlib/bzrdir.py	2009-06-18 04:35:12 +0000
@@ -2358,7 +2358,8 @@
     def set_branch_format(self, format):
         self._branch_format = format
 
-    def require_stacking(self, stack_on=None, possible_transports=None):
+    def require_stacking(self, stack_on=None, possible_transports=None,
+            _skip_repo=False):
         """We have a request to stack, try to ensure the formats support it.
 
         :param stack_on: If supplied, it is the URL to a branch that we want to
@@ -2402,7 +2403,8 @@
             target[:] = [target_branch, True, False]
             return target
 
-        if not (self.repository_format.supports_external_lookups):
+        if (not _skip_repo and
+                 not self.repository_format.supports_external_lookups):
             # We need to upgrade the Repository.
             target_branch, _, do_upgrade = get_target_branch()
             if target_branch is None:
@@ -3268,6 +3270,10 @@
         else:
             remote_repo = None
             policy = None
+        if require_stacking:
+            # The repo has already been created, but we need to make sure that
+            # we'll make a stackable branch.
+            bzrdir._format.require_stacking(_skip_repo=True)
         return remote_repo, bzrdir, require_stacking, policy
 
     def _open(self, transport):

=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2009-06-11 03:15:57 +0000
+++ bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2009-06-18 04:35:12 +0000
@@ -1275,6 +1275,9 @@
         fallback_repo = repo._fallback_repositories[0]
         self.assertEqual(
             stack_on.base, fallback_repo.bzrdir.root_transport.base)
+        # The bzrdir creates a branch in stacking-capable format.
+        new_branch = control.create_branch()
+        self.assertTrue(new_branch._format.supports_stacking())
 
     def test_format_initialize_on_transport_ex_repo_fmt_name_None(self):
         t = self.get_transport('dir')