Merge lp:~abentley/bzr-loom/merge-1 into lp:~launchpad-pqm/bzr-loom/trunk

[Aaron Bentley]

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 reviewer rockstar

This patch makes bzr-loom compatible with both 1.13 and 1.14. This
allows us to upgrade bzr-loom, and then upgrade bzr. The version in
bzr-loom's trunk is not compatible with 1.13.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknvTm4ACgkQ0F+nu1YWqI0tOACeM2699U1+AefWnA3mDvKgppjx
TtEAn00/91RAsJXd2CiqcdV8FBKNG6gB
=7DK3
-----END PGP SIGNATURE-----

[Paul Hummer (rockstar)]

review: Approve

[Paul Hummer (rockstar)]

Can we get this merged?

[Vincent Ladeuil (vila)]

lp can't access this branch and AFAICS the relevant change is in trunk anyway, so I'm going to mark this merge proposal merged.

[Vincent Ladeuil (vila)]

Doh. Except I can't do that for lack of... permissions ? The pencil icon is nowhere to be seen near the status...

[Robert Collins (lifeless)]

Marking merge as per Vincent's discussion.

=== modified file 'branch.py'
--- branch.py	2009-02-28 11:02:28 +0000
+++ branch.py	2009-04-22 16:55:43 +0000
@@ -801,7 +801,7 @@
             control_files.unlock()
         return self.open(a_bzrdir, _found=True, )
 
-    def open(self, a_bzrdir, _found=False):
+    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
         """Return the branch object for a_bzrdir
 
         _found is a private parameter, do not use it. It is used to indicate
@@ -813,10 +813,15 @@
         transport = a_bzrdir.get_branch_transport(None)
         control_files = bzrlib.lockable_files.LockableFiles(
             transport, 'lock', bzrlib.lockdir.LockDir)
+        if ignore_fallbacks:
+            kwargs = {'ignore_fallbacks': True}
+        else:
+            kwargs = {}
         return self._branch_class(_format=self,
                           _control_files=control_files,
                           a_bzrdir=a_bzrdir,
-                          _repository=a_bzrdir.find_repository())
+                          _repository=a_bzrdir.find_repository(),
+                          **kwargs)
 
     def take_over(self, branch):
         """Take an existing bzrlib branch over into Loom format.