/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/tar_exporter.py

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/export/tar_exporter.py
49
49
    if force_mtime is not None:
50
50
        item.mtime = force_mtime
51
51
    else:
52
 
        item.mtime = tree.get_file_mtime(entry.file_id, tree_path)
 
52
        item.mtime = tree.get_file_mtime(tree_path, entry.file_id)
53
53
    if entry.kind == "file":
54
54
        item.type = tarfile.REGTYPE
55
 
        if tree.is_executable(entry.file_id, tree_path):
 
55
        if tree.is_executable(tree_path, entry.file_id):
56
56
            item.mode = 0o755
57
57
        else:
58
58
            item.mode = 0o644
60
60
        # the tarfile contract, which wants the size of the file up front.  We
61
61
        # want to make sure it doesn't change, and we need to read it in one
62
62
        # go for content filtering.
63
 
        content = tree.get_file_text(entry.file_id, tree_path)
 
63
        content = tree.get_file_text(tree_path, entry.file_id)
64
64
        item.size = len(content)
65
65
        fileobj = BytesIO(content)
66
66
    elif entry.kind == "directory":
73
73
        item.type = tarfile.SYMTYPE
74
74
        item.size = 0
75
75
        item.mode = 0o755
76
 
        item.linkname = tree.get_symlink_target(entry.file_id, tree_path)
 
76
        item.linkname = tree.get_symlink_target(tree_path, entry.file_id)
77
77
        fileobj = None
78
78
    else:
79
79
        raise errors.BzrError("don't know how to export {%s} of kind %r"
124
124
        rev = tree.repository.get_revision(tree.get_revision_id())
125
125
        root_mtime = rev.timestamp
126
126
    elif tree.get_root_id() is not None:
127
 
        root_mtime = tree.get_file_mtime(tree.get_root_id())
 
127
        root_mtime = tree.get_file_mtime('', tree.get_root_id())
128
128
    else:
129
129
        root_mtime = None
130
130