Rev 4610: Merge RemoteBranch.open fix for ignore_fallbacks. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4610 [merge]
revision-id: robertc at robertcollins.net-20090813005934-v1mmfvpvwm24jrb0
parent: robertc at robertcollins.net-20090813004310-uuurt6yiz0f28p51
parent: robertc at robertcollins.net-20090813005723-e92km9w7airhhjze
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Thu 2009-08-13 10:59:34 +1000
message:
  Merge RemoteBranch.open fix for ignore_fallbacks.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
=== modified file 'NEWS'
--- a/NEWS	2009-08-13 00:40:09 +0000
+++ b/NEWS	2009-08-13 00:59:34 +0000
@@ -50,6 +50,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-13 00:40:09 +0000
+++ b/bzrlib/remote.py	2009-08-13 00:59:34 +0000
@@ -2028,6 +2028,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()
@@ -2078,7 +2081,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