Rev 4601: Fix fetching from 2a branches over bzr-v2. in http://bazaar.launchpad.net/~lifeless/bzr/remote-source-upcall

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/remote-source-upcall

------------------------------------------------------------
revno: 4601
revision-id: robertc at robertcollins.net-20090813004009-937jfqk33k7uow9v
parent: pqm at pqm.ubuntu.com-20090812222828-fdlyshwsomwvfaf2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: remote-source-upcall
timestamp: Thu 2009-08-13 10:40:09 +1000
message:
  Fix fetching from 2a branches over bzr-v2.
=== modified file 'NEWS'
--- a/NEWS	2009-08-12 22:28:28 +0000
+++ b/NEWS	2009-08-13 00:40:09 +0000
@@ -32,6 +32,12 @@
   parent inventories incorrectly, and also not handling when one of the
   parents was a ghost. (John Arbash Meinel, #402778, #412198)
 
+* Fetching from 2a branches from a version-2 bzr protocol would fail to
+  copy the internal inventory pages from the CHK store. This cannot happen
+  in normal use as all 2a compatible clients and servers support the
+  version-3 protocol, but it does cause test suite failures when testing
+  downlevel protocol behaviour. (Robert Collins)
+
 Improvements
 ************
 

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2009-08-05 02:30:59 +0000
+++ b/bzrlib/remote.py	2009-08-13 00:40:09 +0000
@@ -1758,7 +1758,8 @@
         """
         source = repo._get_source(self.to_format)
         if isinstance(source, RemoteStreamSource):
-            return repository.StreamSource.get_stream(source, search)
+            repo._ensure_real()
+            source = repo._real_repository._get_source(self.to_format)
         return source.get_stream(search)
 
     def _get_stream(self, repo, search):