← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/export/tar_exporter.py

  • Committer: Patch Queue Manager
  • Date: 2011-12-01 11:27:49 UTC
  • mfrom: (6331.2.1 export-fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20111201112749-5b4e6ae2utuclht2
(jelmer) Always pass in the tree path to Tree methods when exporting.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/export/tar_exporter.py
28
28
from bzrlib.export import _export_iter_entries
29
29
 
30
30
 
31
 
def prepare_tarball_item(tree, root, final_path, entry, force_mtime=None):
 
31
def prepare_tarball_item(tree, root, final_path, tree_path, entry, force_mtime=None):
32
32
    """Prepare a tarball item for exporting
33
33
 
34
34
    :param tree: Tree to export
35
 
 
36
35
    :param final_path: Final path to place item
37
 
 
 
36
    :param tree_path: Path for the entry in the tree
38
37
    :param entry: Entry to export
39
 
 
40
38
    :param force_mtime: Option mtime to force, instead of using tree
41
39
        timestamps.
42
40
 
47
45
    if force_mtime is not None:
48
46
        item.mtime = force_mtime
49
47
    else:
50
 
        item.mtime = tree.get_file_mtime(entry.file_id, final_path)
 
48
        item.mtime = tree.get_file_mtime(entry.file_id, tree_path)
51
49
    if entry.kind == "file":
52
50
        item.type = tarfile.REGTYPE
53
 
        if tree.is_executable(entry.file_id):
 
51
        if tree.is_executable(entry.file_id, tree_path):
54
52
            item.mode = 0755
55
53
        else:
56
54
            item.mode = 0644
58
56
        # the tarfile contract, which wants the size of the file up front.  We
59
57
        # want to make sure it doesn't change, and we need to read it in one
60
58
        # go for content filtering.
61
 
        content = tree.get_file_text(entry.file_id)
 
59
        content = tree.get_file_text(entry.file_id, tree_path)
62
60
        item.size = len(content)
63
61
        fileobj = StringIO.StringIO(content)
64
62
    elif entry.kind == "directory":
71
69
        item.type = tarfile.SYMTYPE
72
70
        item.size = 0
73
71
        item.mode = 0755
74
 
        item.linkname = tree.get_symlink_target(entry.file_id)
 
72
        item.linkname = tree.get_symlink_target(entry.file_id, tree_path)
75
73
        fileobj = None
76
74
    else:
77
75
        raise errors.BzrError("don't know how to export {%s} of kind %r"
97
95
        timestamps.
98
96
    """
99
97
    try:
100
 
        for final_path, entry in _export_iter_entries(tree, subdir):
 
98
        for final_path, tree_path, entry in _export_iter_entries(tree, subdir):
101
99
            (item, fileobj) = prepare_tarball_item(
102
 
                tree, root, final_path, entry, force_mtime)
 
100
                tree, root, final_path, tree_path, entry, force_mtime)
103
101
            ball.addfile(item, fileobj)
104
102
            yield
105
103
    finally: