/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/archive/tar.py

  • Committer: Jelmer Vernooij
  • Date: 2018-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/archive/tar.py
51
51
    if force_mtime is not None:
52
52
        item.mtime = force_mtime
53
53
    else:
54
 
        item.mtime = tree.get_file_mtime(tree_path, file_id)
 
54
        item.mtime = tree.get_file_mtime(tree_path)
55
55
    if entry.kind == "file":
56
56
        item.type = tarfile.REGTYPE
57
 
        if tree.is_executable(tree_path, file_id):
 
57
        if tree.is_executable(tree_path):
58
58
            item.mode = 0o755
59
59
        else:
60
60
            item.mode = 0o644
62
62
        # the tarfile contract, which wants the size of the file up front.  We
63
63
        # want to make sure it doesn't change, and we need to read it in one
64
64
        # go for content filtering.
65
 
        content = tree.get_file_text(tree_path, file_id)
 
65
        content = tree.get_file_text(tree_path)
66
66
        item.size = len(content)
67
67
        fileobj = BytesIO(content)
68
68
    elif entry.kind in ("directory", "tree-reference"):
75
75
        item.type = tarfile.SYMTYPE
76
76
        item.size = 0
77
77
        item.mode = 0o755
78
 
        item.linkname = tree.get_symlink_target(tree_path, file_id)
 
78
        item.linkname = tree.get_symlink_target(tree_path)
79
79
        fileobj = None
80
80
    else:
81
81
        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.is_versioned(u''):
127
 
            root_mtime = tree.get_file_mtime('', tree.get_root_id())
 
127
            root_mtime = tree.get_file_mtime('')
128
128
        else:
129
129
            root_mtime = None
130
130