← 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
73
73
     * set_executability
74
74
    """
75
75
    def __init__(self, tree, pb=DummyProgress()):
76
 
        """Note: a write lock is taken on the tree.
 
76
        """Note: a tree_write lock is taken on the tree.
77
77
        
78
78
        Use TreeTransform.finalize() to release the lock
79
79
        """
80
80
        object.__init__(self)
81
81
        self._tree = tree
82
 
        self._tree.lock_write()
 
82
        self._tree.lock_tree_write()
83
83
        try:
84
84
            control_files = self._tree._control_files
85
85
            self._limbodir = urlutils.local_path_from_url(
1086
1086
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1087
1087
    """Create new file contents according to an inventory entry."""
1088
1088
    if entry.kind == "file":
1089
 
        if lines == None:
 
1089
        if lines is None:
1090
1090
            lines = tree.get_file(entry.file_id).readlines()
1091
1091
        tt.create_file(lines, trans_id, mode_id=mode_id)
1092
1092
    elif entry.kind == "symlink":