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

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/export/dir_exporter.py
17
17
"""Export a Tree to a non-versioned directory.
18
18
"""
19
19
 
 
20
 
20
21
import os
 
22
 
 
23
from bzrlib import errors, osutils
 
24
from bzrlib.export import _export_iter_entries
21
25
from bzrlib.trace import mutter
22
26
 
23
 
def dir_exporter(tree, dest, root):
 
27
 
 
28
def dir_exporter(tree, dest, root, subdir):
24
29
    """Export this tree to a new directory.
25
30
 
26
31
    `dest` should not exist, and will be created holding the
32
37
    :note: If the export fails, the destination directory will be
33
38
           left in a half-assed state.
34
39
    """
35
 
    import os
 
40
    mutter('export version %r', tree)
36
41
    os.mkdir(dest)
37
 
    mutter('export version %r', tree)
38
 
    inv = tree.inventory
39
 
    entries = inv.iter_entries()
40
 
    entries.next() # skip root
41
 
    for dp, ie in entries:
42
 
        # .bzrignore has no meaning outside of a working tree
43
 
        # so do not export it
44
 
        if dp == ".bzrignore":
45
 
            continue
46
 
        
47
 
        ie.put_on_disk(dest, dp, tree)
48
 
 
 
42
    for dp, ie in _export_iter_entries(tree, subdir):
 
43
        fullpath = osutils.pathjoin(dest, dp)
 
44
        if ie.kind == "file":
 
45
            fileobj = tree.get_file(ie.file_id)
 
46
            osutils.pumpfile(fileobj, file(fullpath, 'wb'))
 
47
            if tree.is_executable(ie.file_id):
 
48
                os.chmod(fullpath, 0755)
 
49
        elif ie.kind == "directory":
 
50
            os.mkdir(fullpath)
 
51
        elif ie.kind == "symlink":
 
52
            try:
 
53
                os.symlink(ie.symlink_target, fullpath)
 
54
            except OSError,e:
 
55
                raise errors.BzrError(
 
56
                    "Failed to create symlink %r -> %r, error: %s"
 
57
                    % (fullpath, self.symlink_target, e))
 
58
        else:
 
59
            raise errors.BzrError("don't know how to export {%s} of kind %r" %
 
60
               (ie.file_id, ie.kind))