/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/export/dir_exporter.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-04 15:59:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6913.
  • Revision ID: jelmer@jelmer.uk-20180304155937-pssy5js0av6hvmba
Make Tree.iter_files_bytes() take paths rather than file_ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
    for dp, tp, ie in _export_iter_entries(tree, subdir):
58
58
        fullpath = osutils.pathjoin(dest, dp)
59
59
        if ie.kind == "file":
60
 
            to_fetch.append((ie.file_id, (dp, tp, ie.file_id)))
 
60
            to_fetch.append((tp, (dp, tp, ie.file_id)))
61
61
        elif ie.kind == "directory":
62
62
            os.mkdir(fullpath)
63
63
        elif ie.kind == "symlink":
70
70
                    % (fullpath, symlink_target, e))
71
71
        else:
72
72
            raise errors.BzrError("don't know how to export {%s} of kind %r" %
73
 
               (ie.file_id, ie.kind))
 
73
               (tp, ie.kind))
74
74
 
75
75
        yield
76
76
    # The data returned here can be in any order, but we've already created all