/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/object_store.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-01 13:47:29 UTC
  • mfrom: (7488.1.2 iter-bytes)
  • Revision ID: breezy.the.bot@gmail.com-20200601134729-6h4iywd85gpienn2
iter_files_bytes can return iterators.

Merged from https://code.launchpad.net/~jelmer/brz/iter-bytes/+merge/378776

Show diffs side-by-side

added added

removed removed

Lines of Context:
308
308
    for (path, file_id), chunks in tree.iter_files_bytes(
309
309
            [(path, (path, file_id)) for (path, file_id) in new_blobs]):
310
310
        obj = Blob()
311
 
        obj.chunked = chunks
 
311
        obj.chunked = list(chunks)
312
312
        if add_cache_entry is not None:
313
313
            add_cache_entry(obj, (file_id, tree.get_file_revision(path)), path)
314
314
        yield path, obj, (file_id, tree.get_file_revision(path))
569
569
            ((key[0], key[1], key) for key in keys))
570
570
        for (file_id, revision, expected_sha), chunks in stream:
571
571
            blob = Blob()
572
 
            blob.chunked = chunks
 
572
            blob.chunked = list(chunks)
573
573
            if blob.id != expected_sha and blob.data == b"":
574
574
                # Perhaps it's a symlink ?
575
575
                tree = self.tree_cache.revision_tree(revision)