Merge lp:~jameinel/bzr/2.5.2-get_file_text-1046284 into lp:bzr/2.5

[John A Meinel]

Fix bug #1046284. When iterating over iter_files_bytes, we should consume the content iterator before we proceed with the files iterator.

This is a quick fix for bug #1046284. It fixes get_file_text so that it consumes the content iterator before it consumes the outer iterator.

I don't have a specific test for it, because I'm working on bug #1046697 which has a bit bigger scope.

I'll see if I can get that branch up and working quickly for bzr-2.5 before we release bzr-2.5.2, but I don't think we have to block on getting all that working, rather than getting a fix out for users.

=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py	2012-01-06 14:09:04 +0000
+++ bzrlib/workingtree_4.py	2012-09-06 07:40:24 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011 Canonical Ltd
+# Copyright (C) 2007-2012 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1882,8 +1882,19 @@
         return self.inventory[file_id].text_size
 
     def get_file_text(self, file_id, path=None):
-        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
-        return ''.join(content)
+        full_content = None
+        for _, content in self.iter_files_bytes([(file_id, None)]):
+            if full_content is not None:
+                raise AssertionError('iter_files_bytes returned'
+                    ' too many entries')
+            # For each entry returned by iter_files_bytes, we must consume the
+            # content before we step the iterator.
+            full_content = ''.join(content)
+            del content
+        if full_content is None:
+            raise AssertionError('iter_files_bytes did not return'
+                ' the requested data')
+        return full_content
 
     def get_reference_revision(self, file_id, path=None):
         return self.inventory[file_id].reference_revision
 
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2012-08-01 08:51:57 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2012-09-06 07:40:24 +0000
@@ -35,6 +35,10 @@
 * ``bzr config`` properly handles aliases and references in the
   ``--directory`` parameter (Vincent Ladeuil, Wouter van Heyst, #947049)
 
+* Lightweight checkouts of remote repositories had a bug with how they
+  extracted texts from the repository. (Just an ordering constraint on how
+  they consumed the stream.) (John Arbash Meinel, #1046284)
+
 * Revert use of --no-tty when gpg signing commits. (Jelmer Vernooij, #1014570)
 
 Documentation