/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-24 12:34:34 UTC
  • mfrom: (6874.2.9 iter-files-bytes)
  • Revision ID: breezy.the.bot@gmail.com-20180324123434-zogy2xskr96vv5xm
Change Tree.iter_files_bytes() to take a (path, identifier) list rather than a (file_id, identifier) list.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/export/dir_exporter.py
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