Rev 4601: Make RemoteBranch honour ignore_fallbacks when _ensure_real is triggered. in http://bazaar.launchpad.net/~lifeless/bzr/remote-ensure-real-ignore-fallbacks

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/remote-ensure-real-ignore-fallbacks

------------------------------------------------------------
revno: 4601
revision-id: robertc at robertcollins.net-20090813005723-e92km9w7airhhjze
parent: pqm at pqm.ubuntu.com-20090812222828-fdlyshwsomwvfaf2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: remote-ensure-real-ignore-fallbacks
timestamp: Thu 2009-08-13 10:57:23 +1000
message:
  Make RemoteBranch honour ignore_fallbacks when _ensure_real is triggered.
=== modified file 'NEWS'
--- a/NEWS	2009-08-12 22:28:28 +0000
+++ b/NEWS	2009-08-13 00:57:23 +0000
@@ -44,6 +44,9 @@
 Internals
 *********
 
+* RemoteBranch.open now honours ignore_fallbacks correctly on bzr-v2
+  protocols. (Robert Collins)
+
 Testing
 *******
 

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2009-08-05 02:30:59 +0000
+++ b/bzrlib/remote.py	2009-08-13 00:57:23 +0000
@@ -2027,6 +2027,9 @@
                     self._real_branch._format.network_name()
         else:
             self._format = format
+        # when we do _ensure_real we may need to pass ignore_fallbacks to the
+        # branch.open_branch method.
+        self._real_ignore_fallbacks = not setup_stacking
         if not self._format._network_name:
             # Did not get from open_branchV2 - old server.
             self._ensure_real()
@@ -2077,7 +2080,8 @@
                 raise AssertionError('smart server vfs must be enabled '
                     'to use vfs implementation')
             self.bzrdir._ensure_real()
-            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
+            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
+                ignore_fallbacks=self._real_ignore_fallbacks)
             if self.repository._real_repository is None:
                 # Give the remote repository the matching real repo.
                 real_repo = self._real_branch.repository