Rev 4602: (robertc) Fix reading from CHK repositories over the (deprecated) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4602 [merge]
revision-id: pqm at pqm.ubuntu.com-20090813025005-k2k8pa2o38b8m0l8
parent: pqm at pqm.ubuntu.com-20090813014831-e0k1cmstvkhdre6e
parent: robertc at robertcollins.net-20090813004009-937jfqk33k7uow9v
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-08-13 03:50:05 +0100
message:
  (robertc) Fix reading from CHK repositories over the (deprecated)
  	bzr-v2 protocol. (Robert Collins)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
=== 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):