← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
27
27
from bzrlib.progress import DummyProgress, ProgressPhase
28
28
from bzrlib.trace import mutter, warning
29
29
import bzrlib.ui 
 
30
import bzrlib.urlutils as urlutils
30
31
 
31
32
 
32
33
ROOT_PARENT = "root-parent"
79
80
        self._tree.lock_write()
80
81
        try:
81
82
            control_files = self._tree._control_files
82
 
            self._limbodir = control_files.controlfilename('limbo')
 
83
            self._limbodir = urlutils.local_path_from_url(
 
84
                control_files.controlfilename('limbo'))
83
85
            try:
84
86
                os.mkdir(self._limbodir)
85
87
            except OSError, e:
850
852
        parent_id is the transaction id of the parent directory of the file.
851
853
        contents is an iterator of bytestrings, which will be used to produce
852
854
        the file.
853
 
        file_id is the inventory ID of the file, if it is to be versioned.
 
855
        :param file_id: The inventory ID of the file, if it is to be versioned.
 
856
        :param executable: Only valid when a file_id has been supplied.
854
857
        """
855
858
        trans_id = self._new_entry(name, parent_id, file_id)
 
859
        # TODO: rather than scheduling a set_executable call,
 
860
        # have create_file create the file with the right mode.
856
861
        self.create_file(contents, trans_id)
857
862
        if executable is not None:
858
863
            self.set_executability(executable, trans_id)