Merge lp:~spiv/bzr-loom/bzr-2.3-compat into lp:bzr-loom

[Andrew Bennetts]

Fix compatibility with bzr trunk (which will become bzr 2.3).

A recent patch I landed on lp:bzr broke plugins that implement their own branch formats. This is a small patch to make looms support the new API (without breaking compatibility with 2.2).

[Martin Pool (mbp)]

That looks reasonable to me.

Perhaps in general it's better to check the bzrlib version than whether the parameter is None, because it makes it more obvious why we have it there, and it's less likely to cause trouble if for instance new code does pass None for that value.

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-07-16 08:30:13 +0000
+++ NEWS	2010-12-16 01:36:08 +0000
@@ -31,6 +31,10 @@
 IMPROVEMENTS
 ------------
 
+* bzr-loom is now compatible with bzr 2.3b5 and newer.  There were some API
+  additions bzr-loom needed to support.  Compatibility with earlier versions is
+  unaffected.  (Andrew Bennetts)
+
 * Loom now takes advantage of lazy loading of bzr objects (though not to a
   complete degree), reducing the overhead of having it installed.
   (Robert Collins)

=== modified file 'branch.py'
--- branch.py	2010-07-16 08:30:13 +0000
+++ branch.py	2010-12-16 01:36:08 +0000
@@ -749,11 +749,17 @@
     # A mixin is not ideal because it is tricky to test, but it seems to be the
     # best solution for now.
 
-    def initialize(self, a_bzrdir, name=None):
+    def initialize(self, a_bzrdir, name=None, repository=None):
         """Create a branch of this format in a_bzrdir."""
         if name is not None:
             raise bzrlib.errors.NoColocatedBranchSupport(self)
-        super(LoomFormatMixin, self).initialize(a_bzrdir, name=None)
+        if repository is None:
+            super(LoomFormatMixin, self).initialize(a_bzrdir, name=None)
+        else:
+            # The 'repository' optional keyword arg is new in bzr 2.3, so don't
+            # pass it unless it was passed in.
+            super(LoomFormatMixin, self).initialize(a_bzrdir, name=None,
+                    repository=repository)
         branch_transport = a_bzrdir.get_branch_transport(self)
         files = []
         state = loom_state.LoomState()
@@ -772,7 +778,8 @@
             control_files.unlock()
         return self.open(a_bzrdir, _found=True, )
 
-    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
+    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
+            found_repository=None):
         """Return the branch object for a_bzrdir
 
         _found is a private parameter, do not use it. It is used to indicate
@@ -790,10 +797,12 @@
         transport = a_bzrdir.get_branch_transport(None)
         control_files = bzrlib.lockable_files.LockableFiles(
             transport, 'lock', bzrlib.lockdir.LockDir)
+        if found_repository is None:
+            found_repository = a_bzrdir.find_repository()
         return self._branch_class(_format=self,
                           _control_files=control_files,
                           a_bzrdir=a_bzrdir,
-                          _repository=a_bzrdir.find_repository(),
+                          _repository=found_repository,
                           ignore_fallbacks=ignore_fallbacks)
 
     def take_over(self, branch):