Merge lp:~jelmer/brz/revisiontree-chunks into lp:brz/3.1

[Jelmer Vernooij]

Don't keep file in memory in Tree.get_file.

Don't keep file in memory in Tree.get_file.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/697/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/698/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/745/

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/90/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/800/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/801/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/870/

=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2020-08-06 01:40:59 +0000
+++ breezy/bzr/vf_repository.py	2021-02-19 14:54:58 +0000
@@ -1279,7 +1279,7 @@
         for record in self.texts.get_record_stream(text_keys, 'unordered', True):
             if record.storage_kind == 'absent':
                 raise errors.RevisionNotPresent(record.key[1], record.key[0])
-            yield text_keys[record.key], record.get_bytes_as('chunked')
+            yield text_keys[record.key], record.iter_bytes_as('chunked')
 
     def _generate_text_key_index(self, text_key_references=None,
                                  ancestors=None):

=== modified file 'breezy/git/object_store.py'
--- breezy/git/object_store.py	2020-06-27 14:48:19 +0000
+++ breezy/git/object_store.py	2021-02-19 14:54:58 +0000
@@ -312,7 +312,7 @@
     for (path, file_id), chunks in tree.iter_files_bytes(
             [(path, (path, file_id)) for (path, file_id) in new_blobs]):
         obj = Blob()
-        obj.chunked = chunks
+        obj.chunked = list(chunks)
         if add_cache_entry is not None:
             add_cache_entry(obj, (file_id, tree.get_file_revision(path)), path)
         yield path, obj, (file_id, tree.get_file_revision(path))
@@ -573,7 +573,7 @@
             ((key[0], key[1], key) for key in keys))
         for (file_id, revision, expected_sha), chunks in stream:
             blob = Blob()
-            blob.chunked = chunks
+            blob.chunked = list(chunks)
             if blob.id != expected_sha and blob.data == b"":
                 # Perhaps it's a symlink ?
                 tree = self.tree_cache.revision_tree(revision)

=== modified file 'breezy/revisiontree.py'
--- breezy/revisiontree.py	2018-11-16 18:33:17 +0000
+++ breezy/revisiontree.py	2021-02-19 14:54:58 +0000
@@ -18,9 +18,9 @@
 
 from __future__ import absolute_import
 
-from io import BytesIO
 from . import (
     lock,
+    iterablefile,
     revision,
     tree,
     )
@@ -67,11 +67,11 @@
 
     def get_file_text(self, path):
         for (identifier, content) in self.iter_files_bytes([(path, None)]):
-            ret = b"".join(content)
-        return ret
+            return b"".join(content)
 
     def get_file(self, path):
-        return BytesIO(self.get_file_text(path))
+        for (identifier, content) in self.iter_files_bytes([(path, None)]):
+            return iterablefile.IterableFile(content)
 
     def is_locked(self):
         return self._repository.is_locked()