Merge lp:~jelmer/brz/iter-bytes into lp:brz

[Jelmer Vernooij]

iter_files_bytes can return iterators.

iter_files_bytes can return iterators.

[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/701/

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

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

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

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

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

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

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

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

=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2020-02-09 01:16:06 +0000
+++ breezy/bzr/vf_repository.py	2020-02-09 17:13:48 +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	2019-11-23 20:50:53 +0000
+++ breezy/git/object_store.py	2020-02-09 17:13:48 +0000
@@ -306,7 +306,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))
@@ -567,7 +567,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/plugins/commitfromnews/committemplate.py'
--- breezy/plugins/commitfromnews/committemplate.py	2019-03-02 21:46:18 +0000
+++ breezy/plugins/commitfromnews/committemplate.py	2020-02-09 17:13:48 +0000
@@ -58,9 +58,9 @@
             return self.message
         if found_old_path is None:
             # New file
-            _, new_chunks = list(
+            _, new_chunks = next(
                 self.commit.builder.repository.iter_files_bytes(
-                    [(found_entry.file_id, found_entry.revision, None)]))[0]
+                    [(found_entry.file_id, found_entry.revision, None)]))
             content = b''.join(new_chunks).decode('utf-8')
             return self.merge_message(content)
         else:
@@ -76,7 +76,7 @@
             contents = self.commit.builder.repository.iter_files_bytes(needed)
             lines = {}
             for name, chunks in contents:
-                lines[name] = osutils.chunks_to_lines(chunks)
+                lines[name] = osutils.chunks_to_lines(list(chunks))
             new = lines['new']
             sequence_matcher = patiencediff.PatienceSequenceMatcher(
                 None, lines['old'], new)