/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: Vincent Ladeuil
  • Date: 2019-03-06 14:03:19 UTC
  • mfrom: (7290.1.15 work)
  • mto: This revision was merged to the branch mainline in revision 7295.
  • Revision ID: v.ladeuil+brz@free.fr-20190306140319-zgjegynpjv3vv0jg
Merge 3.0 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
359
359
            continue
360
360
 
361
361
        if tree.kind(path) != 'directory':
362
 
            raise AssertionError
 
362
            continue
363
363
 
364
364
        obj = Tree()
365
365
        for value in tree.iter_child_entries(path):
589
589
        for (file_id, revision, expected_sha), chunks in stream:
590
590
            blob = Blob()
591
591
            blob.chunked = chunks
592
 
            if blob.id != expected_sha and blob.data == "":
 
592
            if blob.id != expected_sha and blob.data == b"":
593
593
                # Perhaps it's a symlink ?
594
594
                tree = self.tree_cache.revision_tree(revision)
595
595
                path = tree.id2path(file_id)