/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
17
import os
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
18
import errno
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
19
from stat import S_ISREG
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
20
import tempfile
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
21
1551.11.12 by Aaron Bentley
Changes from review
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
24
from bzrlib import (
25
    bzrdir,
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
26
    delta,
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
27
    errors,
28
    inventory
29
    )
1551.11.12 by Aaron Bentley
Changes from review
30
""")
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
31
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
32
                           ReusingTransform, NotVersionedError, CantMoveRoot,
3006.2.1 by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows)
33
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
34
                           UnableCreateSymlink)
3368.2.9 by Ian Clatworthy
default context should only support relpath
35
from bzrlib.filters import filtered_output_lines, ContentFilterContext
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
36
from bzrlib.inventory import InventoryEntry
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
37
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
3006.2.1 by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows)
38
                            delete_any, has_symlinks)
1551.2.34 by Aaron Bentley
Refactored the revert phases
39
from bzrlib.progress import DummyProgress, ProgressPhase
2687.2.1 by Martin Pool
Rename upcoming release from 0.19 to 0.90
40
from bzrlib.symbol_versioning import (
41
        deprecated_function,
42
        zero_fifteen,
43
        zero_ninety,
44
        )
1534.7.173 by Aaron Bentley
Added conflict warnings to revert
45
from bzrlib.trace import mutter, warning
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
46
from bzrlib import tree
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
47
import bzrlib.ui
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
48
import bzrlib.urlutils as urlutils
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
49
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
50
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
51
ROOT_PARENT = "root-parent"
52
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
53
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
54
def unique_add(map, key, value):
55
    if key in map:
1534.7.5 by Aaron Bentley
Got unique_add under test
56
        raise DuplicateKey(key=key)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
57
    map[key] = value
58
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
59
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
60
class _TransformResults(object):
2502.1.5 by Aaron Bentley
Cleanup
61
    def __init__(self, modified_paths, rename_count):
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
62
        object.__init__(self)
63
        self.modified_paths = modified_paths
2502.1.5 by Aaron Bentley
Cleanup
64
        self.rename_count = rename_count
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
65
66
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
67
class TreeTransformBase(object):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
68
    """The base class for TreeTransform and TreeTransformBase"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
69
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
70
    def __init__(self, tree, limbodir, pb=DummyProgress(),
71
                 case_sensitive=True):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
72
        """Constructor.
73
74
        :param tree: The tree that will be transformed, but not necessarily
75
            the output tree.
76
        :param limbodir: A directory where new files can be stored until
77
            they are installed in their proper places
78
        :param pb: A ProgressBar indicating how much progress is being made
79
        :param case_sensitive: If True, the target of the transform is
80
            case sensitive, not just case preserving.
81
        """
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
82
        object.__init__(self)
83
        self._tree = tree
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
84
        self._limbodir = limbodir
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
85
        self._deletiondir = None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
86
        self._id_number = 0
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
87
        # mapping of trans_id -> new basename
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
88
        self._new_name = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
89
        # mapping of trans_id -> new parent trans_id
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
90
        self._new_parent = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
91
        # mapping of trans_id with new contents -> new file_kind
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
92
        self._new_contents = {}
2502.1.5 by Aaron Bentley
Cleanup
93
        # A mapping of transform ids to their limbo filename
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
94
        self._limbo_files = {}
2502.1.5 by Aaron Bentley
Cleanup
95
        # A mapping of transform ids to a set of the transform ids of children
2502.1.6 by Aaron Bentley
Update from review comments
96
        # that their limbo directory has
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
97
        self._limbo_children = {}
2502.1.5 by Aaron Bentley
Cleanup
98
        # Map transform ids to maps of child filename to child transform id
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
99
        self._limbo_children_names = {}
2502.1.5 by Aaron Bentley
Cleanup
100
        # List of transform ids that need to be renamed from limbo into place
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
101
        self._needs_rename = set()
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
102
        # Set of trans_ids whose contents will be removed
1534.7.34 by Aaron Bentley
Proper conflicts for removals
103
        self._removed_contents = set()
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
104
        # Mapping of trans_id -> new execute-bit value
1534.7.25 by Aaron Bentley
Added set_executability
105
        self._new_executability = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
106
        # Mapping of trans_id -> new tree-reference value
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
107
        self._new_reference_revision = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
108
        # Mapping of trans_id -> new file_id
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
109
        self._new_id = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
110
        # Mapping of old file-id -> trans_id
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
111
        self._non_present_ids = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
112
        # Mapping of new file_id -> trans_id
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
113
        self._r_new_id = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
114
        # Set of file_ids that will be removed
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
115
        self._removed_id = set()
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
116
        # Mapping of path in old tree -> trans_id
1534.7.7 by Aaron Bentley
Added support for all-file path ids
117
        self._tree_path_ids = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
118
        # Mapping trans_id -> path in old tree
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
119
        self._tree_id_paths = {}
2502.1.5 by Aaron Bentley
Cleanup
120
        # Cache of realpath results, to speed up canonical_path
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
121
        self._realpaths = {}
2502.1.5 by Aaron Bentley
Cleanup
122
        # Cache of relpath results, to speed up canonical_path
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
123
        self._relpaths = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
124
        # The trans_id that will be used as the tree root
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
125
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
126
        # Indictor of whether the transform has been applied
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
127
        self._done = False
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
128
        # A progress bar
1534.9.1 by Aaron Bentley
Added progress bars to merge
129
        self._pb = pb
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
130
        # Whether the target is case sensitive
131
        self._case_sensitive_target = case_sensitive
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
132
        # A counter of how many files have been renamed
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
133
        self.rename_count = 0
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
134
1534.7.132 by Aaron Bentley
Got cooked conflicts working
135
    def __get_root(self):
136
        return self._new_root
137
138
    root = property(__get_root)
139
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
140
    def finalize(self):
2502.1.6 by Aaron Bentley
Update from review comments
141
        """Release the working tree lock, if held, clean up limbo dir.
142
143
        This is required if apply has not been invoked, but can be invoked
144
        even after apply.
145
        """
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
146
        if self._tree is None:
147
            return
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
148
        try:
2502.1.7 by Aaron Bentley
Fix finalize deletion ordering
149
            entries = [(self._limbo_name(t), t, k) for t, k in
150
                       self._new_contents.iteritems()]
2502.1.8 by Aaron Bentley
Updates from review comments
151
            entries.sort(reverse=True)
152
            for path, trans_id, kind in entries:
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
153
                if kind == "directory":
154
                    os.rmdir(path)
155
                else:
156
                    os.unlink(path)
157
            try:
158
                os.rmdir(self._limbodir)
159
            except OSError:
160
                # We don't especially care *why* the dir is immortal.
161
                raise ImmortalLimbo(self._limbodir)
2733.2.11 by Aaron Bentley
Detect irregularities with the pending-deletion directory
162
            try:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
163
                if self._deletiondir is not None:
164
                    os.rmdir(self._deletiondir)
2733.2.11 by Aaron Bentley
Detect irregularities with the pending-deletion directory
165
            except OSError:
166
                raise errors.ImmortalPendingDeletion(self._deletiondir)
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
167
        finally:
168
            self._tree.unlock()
169
            self._tree = None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
170
171
    def _assign_id(self):
172
        """Produce a new tranform id"""
173
        new_id = "new-%s" % self._id_number
174
        self._id_number +=1
175
        return new_id
176
177
    def create_path(self, name, parent):
178
        """Assign a transaction id to a new path"""
179
        trans_id = self._assign_id()
180
        unique_add(self._new_name, trans_id, name)
181
        unique_add(self._new_parent, trans_id, parent)
182
        return trans_id
183
1534.7.6 by Aaron Bentley
Added conflict handling
184
    def adjust_path(self, name, parent, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
185
        """Change the path that is assigned to a transaction id."""
1534.7.66 by Aaron Bentley
Ensured we don't accidentally move the root directory
186
        if trans_id == self._new_root:
187
            raise CantMoveRoot
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
188
        previous_parent = self._new_parent.get(trans_id)
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
189
        previous_name = self._new_name.get(trans_id)
1534.7.6 by Aaron Bentley
Added conflict handling
190
        self._new_name[trans_id] = name
191
        self._new_parent[trans_id] = parent
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
192
        if (trans_id in self._limbo_files and
193
            trans_id not in self._needs_rename):
194
            self._rename_in_limbo([trans_id])
195
            self._limbo_children[previous_parent].remove(trans_id)
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
196
            del self._limbo_children_names[previous_parent][previous_name]
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
197
198
    def _rename_in_limbo(self, trans_ids):
2502.1.6 by Aaron Bentley
Update from review comments
199
        """Fix limbo names so that the right final path is produced.
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
200
201
        This means we outsmarted ourselves-- we tried to avoid renaming
2502.1.6 by Aaron Bentley
Update from review comments
202
        these files later by creating them with their final names in their
203
        final parents.  But now the previous name or parent is no longer
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
204
        suitable, so we have to rename them.
2502.1.14 by Aaron Bentley
Style update suggested by Robert
205
206
        Even for trans_ids that have no new contents, we must remove their
207
        entries from _limbo_files, because they are now stale.
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
208
        """
209
        for trans_id in trans_ids:
2502.1.14 by Aaron Bentley
Style update suggested by Robert
210
            old_path = self._limbo_files.pop(trans_id)
2502.1.13 by Aaron Bentley
Updates from review
211
            if trans_id not in self._new_contents:
212
                continue
2502.1.14 by Aaron Bentley
Style update suggested by Robert
213
            new_path = self._limbo_name(trans_id)
2502.1.13 by Aaron Bentley
Updates from review
214
            os.rename(old_path, new_path)
1534.7.6 by Aaron Bentley
Added conflict handling
215
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
216
    def adjust_root_path(self, name, parent):
217
        """Emulate moving the root by moving all children, instead.
218
        
219
        We do this by undoing the association of root's transaction id with the
220
        current tree.  This allows us to create a new directory with that
1534.7.69 by Aaron Bentley
Got real root moves working
221
        transaction id.  We unversion the root directory and version the 
222
        physically new directory, and hope someone versions the tree root
223
        later.
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
224
        """
225
        old_root = self._new_root
226
        old_root_file_id = self.final_file_id(old_root)
227
        # force moving all children of root
228
        for child_id in self.iter_tree_children(old_root):
229
            if child_id != parent:
230
                self.adjust_path(self.final_name(child_id), 
231
                                 self.final_parent(child_id), child_id)
1534.7.69 by Aaron Bentley
Got real root moves working
232
            file_id = self.final_file_id(child_id)
233
            if file_id is not None:
234
                self.unversion_file(child_id)
235
            self.version_file(file_id, child_id)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
236
        
237
        # the physical root needs a new transaction id
238
        self._tree_path_ids.pop("")
239
        self._tree_id_paths.pop(old_root)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
240
        self._new_root = self.trans_id_tree_file_id(self._tree.get_root_id())
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
241
        if parent == old_root:
242
            parent = self._new_root
243
        self.adjust_path(name, parent, old_root)
244
        self.create_directory(old_root)
1534.7.69 by Aaron Bentley
Got real root moves working
245
        self.version_file(old_root_file_id, old_root)
246
        self.unversion_file(self._new_root)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
247
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
248
    def trans_id_tree_file_id(self, inventory_id):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
249
        """Determine the transaction id of a working tree file.
250
        
251
        This reflects only files that already exist, not ones that will be
252
        added by transactions.
253
        """
3146.8.1 by Aaron Bentley
Fix two tree.inventory uses in checkout
254
        path = self._tree.id2path(inventory_id)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
255
        return self.trans_id_tree_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
256
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
257
    def trans_id_file_id(self, file_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
258
        """Determine or set the transaction id associated with a file ID.
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
259
        A new id is only created for file_ids that were never present.  If
260
        a transaction has been unversioned, it is deliberately still returned.
261
        (this will likely lead to an unversioned parent conflict.)
262
        """
263
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
264
            return self._r_new_id[file_id]
265
        elif file_id in self._tree.inventory:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
266
            return self.trans_id_tree_file_id(file_id)
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
267
        elif file_id in self._non_present_ids:
268
            return self._non_present_ids[file_id]
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
269
        else:
270
            trans_id = self._assign_id()
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
271
            self._non_present_ids[file_id] = trans_id
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
272
            return trans_id
273
1534.7.12 by Aaron Bentley
Added canonical_path function
274
    def canonical_path(self, path):
275
        """Get the canonical tree-relative path"""
276
        # don't follow final symlinks
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
277
        abs = self._tree.abspath(path)
278
        if abs in self._relpaths:
279
            return self._relpaths[abs]
280
        dirname, basename = os.path.split(abs)
281
        if dirname not in self._realpaths:
282
            self._realpaths[dirname] = os.path.realpath(dirname)
283
        dirname = self._realpaths[dirname]
284
        abs = pathjoin(dirname, basename)
285
        if dirname in self._relpaths:
286
            relpath = pathjoin(self._relpaths[dirname], basename)
1534.10.32 by Aaron Bentley
Test and fix case where name has trailing slash
287
            relpath = relpath.rstrip('/\\')
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
288
        else:
289
            relpath = self._tree.relpath(abs)
290
        self._relpaths[abs] = relpath
291
        return relpath
1534.7.12 by Aaron Bentley
Added canonical_path function
292
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
293
    def trans_id_tree_path(self, path):
1534.7.7 by Aaron Bentley
Added support for all-file path ids
294
        """Determine (and maybe set) the transaction ID for a tree path."""
1534.7.12 by Aaron Bentley
Added canonical_path function
295
        path = self.canonical_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
296
        if path not in self._tree_path_ids:
297
            self._tree_path_ids[path] = self._assign_id()
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
298
            self._tree_id_paths[self._tree_path_ids[path]] = path
1534.7.7 by Aaron Bentley
Added support for all-file path ids
299
        return self._tree_path_ids[path]
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
300
1534.7.16 by Aaron Bentley
Added get_tree_parent
301
    def get_tree_parent(self, trans_id):
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
302
        """Determine id of the parent in the tree."""
1534.7.16 by Aaron Bentley
Added get_tree_parent
303
        path = self._tree_id_paths[trans_id]
304
        if path == "":
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
305
            return ROOT_PARENT
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
306
        return self.trans_id_tree_path(os.path.dirname(path))
1534.7.16 by Aaron Bentley
Added get_tree_parent
307
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
308
    def create_file(self, contents, trans_id, mode_id=None):
1534.7.21 by Aaron Bentley
Updated docstrings
309
        """Schedule creation of a new file.
310
311
        See also new_file.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
312
        
313
        Contents is an iterator of strings, all of which will be written
1534.7.21 by Aaron Bentley
Updated docstrings
314
        to the target destination.
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
315
316
        New file takes the permissions of any existing file with that id,
317
        unless mode_id is specified.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
318
        """
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
319
        name = self._limbo_name(trans_id)
320
        f = open(name, 'wb')
1711.7.8 by John Arbash Meinel
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
321
        try:
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
322
            try:
323
                unique_add(self._new_contents, trans_id, 'file')
324
            except:
325
                # Clean up the file, it never got registered so
326
                # TreeTransform.finalize() won't clean it up.
327
                f.close()
328
                os.unlink(name)
329
                raise
330
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
331
            # Is this the best way to get the relative path?
332
            # (The +1 adjusts for the path separator.)
333
            relpath = name[len(self._limbodir) + 1:]
334
            filters = self._tree._content_filter_stack(relpath)
3368.2.9 by Ian Clatworthy
default context should only support relpath
335
            f.writelines(filtered_output_lines(contents, filters,
336
                ContentFilterContext(relpath)))
1711.7.8 by John Arbash Meinel
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
337
        finally:
338
            f.close()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
339
        self._set_mode(trans_id, mode_id, S_ISREG)
340
341
    def _set_mode(self, trans_id, mode_id, typefunc):
1534.7.157 by Aaron Bentley
Added more docs
342
        """Set the mode of new file contents.
343
        The mode_id is the existing file to get the mode from (often the same
344
        as trans_id).  The operation is only performed if there's a mode match
345
        according to typefunc.
346
        """
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
347
        if mode_id is None:
348
            mode_id = trans_id
349
        try:
350
            old_path = self._tree_id_paths[mode_id]
351
        except KeyError:
352
            return
353
        try:
2027.1.1 by John Arbash Meinel
Fix bug #56549, and write a direct test that the right path is being statted
354
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
355
        except OSError, e:
356
            if e.errno == errno.ENOENT:
357
                return
358
            else:
359
                raise
360
        if typefunc(mode):
361
            os.chmod(self._limbo_name(trans_id), mode)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
362
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
363
    def create_hardlink(self, path, trans_id):
364
        """Schedule creation of a hard link"""
365
        name = self._limbo_name(trans_id)
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
366
        try:
367
            os.link(path, name)
368
        except OSError, e:
369
            if e.errno != errno.EPERM:
370
                raise
371
            raise errors.HardLinkNotSupported(path)
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
372
        try:
373
            unique_add(self._new_contents, trans_id, 'file')
374
        except:
375
            # Clean up the file, it never got registered so
376
            # TreeTransform.finalize() won't clean it up.
377
            os.unlink(name)
378
            raise
379
1534.7.20 by Aaron Bentley
Added directory handling
380
    def create_directory(self, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
381
        """Schedule creation of a new directory.
382
        
383
        See also new_directory.
384
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
385
        os.mkdir(self._limbo_name(trans_id))
386
        unique_add(self._new_contents, trans_id, 'directory')
1534.7.20 by Aaron Bentley
Added directory handling
387
1534.7.22 by Aaron Bentley
Added symlink support
388
    def create_symlink(self, target, trans_id):
389
        """Schedule creation of a new symbolic link.
390
391
        target is a bytestring.
392
        See also new_symlink.
393
        """
3006.2.1 by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows)
394
        if has_symlinks():
395
            os.symlink(target, self._limbo_name(trans_id))
396
            unique_add(self._new_contents, trans_id, 'symlink')
397
        else:
3006.2.2 by Alexander Belchenko
tests added.
398
            try:
399
                path = FinalPaths(self).get_path(trans_id)
400
            except KeyError:
401
                path = None
402
            raise UnableCreateSymlink(path=path)
1534.7.22 by Aaron Bentley
Added symlink support
403
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
404
    def cancel_creation(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
405
        """Cancel the creation of new file contents."""
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
406
        del self._new_contents[trans_id]
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
407
        children = self._limbo_children.get(trans_id)
408
        # if this is a limbo directory with children, move them before removing
409
        # the directory
410
        if children is not None:
411
            self._rename_in_limbo(children)
412
            del self._limbo_children[trans_id]
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
413
            del self._limbo_children_names[trans_id]
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
414
        delete_any(self._limbo_name(trans_id))
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
415
1534.7.34 by Aaron Bentley
Proper conflicts for removals
416
    def delete_contents(self, trans_id):
417
        """Schedule the contents of a path entry for deletion"""
1534.7.130 by Aaron Bentley
More conflict handling, test porting
418
        self.tree_kind(trans_id)
1534.7.34 by Aaron Bentley
Proper conflicts for removals
419
        self._removed_contents.add(trans_id)
420
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
421
    def cancel_deletion(self, trans_id):
422
        """Cancel a scheduled deletion"""
423
        self._removed_contents.remove(trans_id)
424
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
425
    def unversion_file(self, trans_id):
426
        """Schedule a path entry to become unversioned"""
427
        self._removed_id.add(trans_id)
428
429
    def delete_versioned(self, trans_id):
430
        """Delete and unversion a versioned file"""
431
        self.delete_contents(trans_id)
432
        self.unversion_file(trans_id)
433
1534.7.25 by Aaron Bentley
Added set_executability
434
    def set_executability(self, executability, trans_id):
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
435
        """Schedule setting of the 'execute' bit
436
        To unschedule, set to None
437
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
438
        if executability is None:
439
            del self._new_executability[trans_id]
440
        else:
441
            unique_add(self._new_executability, trans_id, executability)
1534.7.25 by Aaron Bentley
Added set_executability
442
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
443
    def set_tree_reference(self, revision_id, trans_id):
444
        """Set the reference associated with a directory"""
445
        unique_add(self._new_reference_revision, trans_id, revision_id)
446
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
447
    def version_file(self, file_id, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
448
        """Schedule a file to become versioned."""
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
449
        assert file_id is not None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
450
        unique_add(self._new_id, trans_id, file_id)
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
451
        unique_add(self._r_new_id, file_id, trans_id)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
452
1534.7.105 by Aaron Bentley
Got merge with rename working
453
    def cancel_versioning(self, trans_id):
454
        """Undo a previous versioning of a file"""
455
        file_id = self._new_id[trans_id]
456
        del self._new_id[trans_id]
457
        del self._r_new_id[file_id]
458
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
459
    def new_paths(self):
1534.7.21 by Aaron Bentley
Updated docstrings
460
        """Determine the paths of all new and changed files"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
461
        new_ids = set()
1534.7.132 by Aaron Bentley
Got cooked conflicts working
462
        fp = FinalPaths(self)
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
463
        for id_set in (self._new_name, self._new_parent, self._new_contents,
1534.7.25 by Aaron Bentley
Added set_executability
464
                       self._new_id, self._new_executability):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
465
            new_ids.update(id_set)
466
        new_paths = [(fp.get_path(t), t) for t in new_ids]
467
        new_paths.sort()
468
        return new_paths
1534.7.6 by Aaron Bentley
Added conflict handling
469
1534.7.34 by Aaron Bentley
Proper conflicts for removals
470
    def tree_kind(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
471
        """Determine the file kind in the working tree.
472
473
        Raises NoSuchFile if the file does not exist
474
        """
1534.7.34 by Aaron Bentley
Proper conflicts for removals
475
        path = self._tree_id_paths.get(trans_id)
476
        if path is None:
477
            raise NoSuchFile(None)
478
        try:
479
            return file_kind(self._tree.abspath(path))
480
        except OSError, e:
481
            if e.errno != errno.ENOENT:
482
                raise
483
            else:
484
                raise NoSuchFile(path)
485
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
486
    def final_kind(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
487
        """Determine the final file kind, after any changes applied.
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
488
        
489
        Raises NoSuchFile if the file does not exist/has no contents.
490
        (It is conceivable that a path would be created without the
491
        corresponding contents insertion command)
492
        """
493
        if trans_id in self._new_contents:
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
494
            return self._new_contents[trans_id]
1534.7.34 by Aaron Bentley
Proper conflicts for removals
495
        elif trans_id in self._removed_contents:
496
            raise NoSuchFile(None)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
497
        else:
1534.7.34 by Aaron Bentley
Proper conflicts for removals
498
            return self.tree_kind(trans_id)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
499
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
500
    def tree_file_id(self, trans_id):
1534.7.41 by Aaron Bentley
Got inventory ID movement working
501
        """Determine the file id associated with the trans_id in the tree"""
502
        try:
503
            path = self._tree_id_paths[trans_id]
504
        except KeyError:
505
            # the file is a new, unversioned file, or invalid trans_id
506
            return None
507
        # the file is old; the old id is still valid
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
508
        if self._new_root == trans_id:
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
509
            return self._tree.get_root_id()
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
510
        return self._tree.inventory.path2id(path)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
511
1534.7.13 by Aaron Bentley
Implemented final_file_id
512
    def final_file_id(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
513
        """Determine the file id after any changes are applied, or None.
1534.7.21 by Aaron Bentley
Updated docstrings
514
        
515
        None indicates that the file will not be versioned after changes are
516
        applied.
517
        """
1534.7.13 by Aaron Bentley
Implemented final_file_id
518
        try:
519
            # there is a new id for this file
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
520
            assert self._new_id[trans_id] is not None
1534.7.13 by Aaron Bentley
Implemented final_file_id
521
            return self._new_id[trans_id]
522
        except KeyError:
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
523
            if trans_id in self._removed_id:
524
                return None
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
525
        return self.tree_file_id(trans_id)
1534.7.13 by Aaron Bentley
Implemented final_file_id
526
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
527
    def inactive_file_id(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
528
        """Return the inactive file_id associated with a transaction id.
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
529
        That is, the one in the tree or in non_present_ids.
530
        The file_id may actually be active, too.
531
        """
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
532
        file_id = self.tree_file_id(trans_id)
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
533
        if file_id is not None:
534
            return file_id
535
        for key, value in self._non_present_ids.iteritems():
536
            if value == trans_id:
537
                return key
538
1534.7.17 by Aaron Bentley
Added final_parent function
539
    def final_parent(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
540
        """Determine the parent file_id, after any changes are applied.
1534.7.21 by Aaron Bentley
Updated docstrings
541
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
542
        ROOT_PARENT is returned for the tree root.
1534.7.21 by Aaron Bentley
Updated docstrings
543
        """
1534.7.17 by Aaron Bentley
Added final_parent function
544
        try:
545
            return self._new_parent[trans_id]
546
        except KeyError:
547
            return self.get_tree_parent(trans_id)
548
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
549
    def final_name(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
550
        """Determine the final filename, after all changes are applied."""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
551
        try:
552
            return self._new_name[trans_id]
553
        except KeyError:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
554
            try:
555
                return os.path.basename(self._tree_id_paths[trans_id])
556
            except KeyError:
557
                raise NoFinalPath(trans_id, self)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
558
1534.10.28 by Aaron Bentley
Use numbered backup files
559
    def by_parent(self):
1534.7.40 by Aaron Bentley
Updated docs
560
        """Return a map of parent: children for known parents.
561
        
562
        Only new paths and parents of tree files with assigned ids are used.
563
        """
1534.7.6 by Aaron Bentley
Added conflict handling
564
        by_parent = {}
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
565
        items = list(self._new_parent.iteritems())
1534.7.76 by Aaron Bentley
Fixed final_parent, for the case where finding a parent adds tree id paths.
566
        items.extend((t, self.final_parent(t)) for t in 
567
                      self._tree_id_paths.keys())
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
568
        for trans_id, parent_id in items:
1534.7.6 by Aaron Bentley
Added conflict handling
569
            if parent_id not in by_parent:
570
                by_parent[parent_id] = set()
571
            by_parent[parent_id].add(trans_id)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
572
        return by_parent
1534.7.11 by Aaron Bentley
Refactored conflict handling
573
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
574
    def path_changed(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
575
        """Return True if a trans_id's path has changed."""
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
576
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
577
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
578
    def new_contents(self, trans_id):
579
        return (trans_id in self._new_contents)
580
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
581
    def find_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
582
        """Find any violations of inventory or filesystem invariants"""
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
583
        if self._done is True:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
584
            raise ReusingTransform()
585
        conflicts = []
586
        # ensure all children of all existent parents are known
587
        # all children of non-existent parents are known, by definition.
588
        self._add_tree_children()
1534.10.28 by Aaron Bentley
Use numbered backup files
589
        by_parent = self.by_parent()
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
590
        conflicts.extend(self._unversioned_parents(by_parent))
1534.7.19 by Aaron Bentley
Added tests for parent loops
591
        conflicts.extend(self._parent_loops())
1534.7.11 by Aaron Bentley
Refactored conflict handling
592
        conflicts.extend(self._duplicate_entries(by_parent))
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
593
        conflicts.extend(self._duplicate_ids())
1534.7.11 by Aaron Bentley
Refactored conflict handling
594
        conflicts.extend(self._parent_type_conflicts(by_parent))
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
595
        conflicts.extend(self._improper_versioning())
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
596
        conflicts.extend(self._executability_conflicts())
1534.7.152 by Aaron Bentley
Fixed overwrites
597
        conflicts.extend(self._overwrite_conflicts())
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
598
        return conflicts
599
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
600
    def _add_tree_children(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
601
        """Add all the children of all active parents to the known paths.
1534.7.40 by Aaron Bentley
Updated docs
602
603
        Active parents are those which gain children, and those which are
604
        removed.  This is a necessary first step in detecting conflicts.
605
        """
1534.10.28 by Aaron Bentley
Use numbered backup files
606
        parents = self.by_parent().keys()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
607
        parents.extend([t for t in self._removed_contents if 
608
                        self.tree_kind(t) == 'directory'])
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
609
        for trans_id in self._removed_id:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
610
            file_id = self.tree_file_id(trans_id)
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
611
            if file_id is not None:
612
                if self._tree.inventory[file_id].kind == 'directory':
613
                    parents.append(trans_id)
614
            elif self.tree_kind(trans_id) == 'directory':
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
615
                parents.append(trans_id)
616
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
617
        for parent_id in parents:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
618
            # ensure that all children are registered with the transaction
619
            list(self.iter_tree_children(parent_id))
620
621
    def iter_tree_children(self, parent_id):
622
        """Iterate through the entry's tree children, if any"""
623
        try:
624
            path = self._tree_id_paths[parent_id]
625
        except KeyError:
626
            return
627
        try:
628
            children = os.listdir(self._tree.abspath(path))
629
        except OSError, e:
3144.4.1 by Aaron Bentley
Handle trying to list parents of a non-directory
630
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
631
                raise
632
            return
633
            
634
        for child in children:
635
            childpath = joinpath(path, child)
1534.7.180 by Aaron Bentley
Merge from mainline
636
            if self._tree.is_control_filename(childpath):
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
637
                continue
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
638
            yield self.trans_id_tree_path(childpath)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
639
1534.10.28 by Aaron Bentley
Use numbered backup files
640
    def has_named_child(self, by_parent, parent_id, name):
641
        try:
642
            children = by_parent[parent_id]
643
        except KeyError:
644
            children = []
645
        for child in children:
646
            if self.final_name(child) == name:
647
                return True
648
        try:
649
            path = self._tree_id_paths[parent_id]
650
        except KeyError:
651
            return False
652
        childpath = joinpath(path, name)
653
        child_id = self._tree_path_ids.get(childpath)
654
        if child_id is None:
655
            return lexists(self._tree.abspath(childpath))
656
        else:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
657
            if self.final_parent(child_id) != parent_id:
1534.10.28 by Aaron Bentley
Use numbered backup files
658
                return False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
659
            if child_id in self._removed_contents:
1534.10.28 by Aaron Bentley
Use numbered backup files
660
                # XXX What about dangling file-ids?
661
                return False
662
            else:
663
                return True
664
1534.7.19 by Aaron Bentley
Added tests for parent loops
665
    def _parent_loops(self):
666
        """No entry should be its own ancestor"""
667
        conflicts = []
668
        for trans_id in self._new_parent:
669
            seen = set()
670
            parent_id = trans_id
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
671
            while parent_id is not ROOT_PARENT:
1534.7.19 by Aaron Bentley
Added tests for parent loops
672
                seen.add(parent_id)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
673
                try:
674
                    parent_id = self.final_parent(parent_id)
675
                except KeyError:
676
                    break
1534.7.19 by Aaron Bentley
Added tests for parent loops
677
                if parent_id == trans_id:
678
                    conflicts.append(('parent loop', trans_id))
679
                if parent_id in seen:
680
                    break
681
        return conflicts
682
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
683
    def _unversioned_parents(self, by_parent):
684
        """If parent directories are versioned, children must be versioned."""
685
        conflicts = []
686
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
687
            if parent_id is ROOT_PARENT:
688
                continue
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
689
            if self.final_file_id(parent_id) is not None:
690
                continue
691
            for child_id in children:
692
                if self.final_file_id(child_id) is not None:
693
                    conflicts.append(('unversioned parent', parent_id))
694
                    break;
695
        return conflicts
696
697
    def _improper_versioning(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
698
        """Cannot version a file with no contents, or a bad type.
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
699
        
700
        However, existing entries with no contents are okay.
701
        """
702
        conflicts = []
703
        for trans_id in self._new_id.iterkeys():
704
            try:
705
                kind = self.final_kind(trans_id)
706
            except NoSuchFile:
707
                conflicts.append(('versioning no contents', trans_id))
708
                continue
709
            if not InventoryEntry.versionable_kind(kind):
1534.7.20 by Aaron Bentley
Added directory handling
710
                conflicts.append(('versioning bad kind', trans_id, kind))
1534.7.11 by Aaron Bentley
Refactored conflict handling
711
        return conflicts
712
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
713
    def _executability_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
714
        """Check for bad executability changes.
715
        
716
        Only versioned files may have their executability set, because
717
        1. only versioned entries can have executability under windows
718
        2. only files can be executable.  (The execute bit on a directory
719
           does not indicate searchability)
720
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
721
        conflicts = []
722
        for trans_id in self._new_executability:
723
            if self.final_file_id(trans_id) is None:
724
                conflicts.append(('unversioned executability', trans_id))
1534.7.34 by Aaron Bentley
Proper conflicts for removals
725
            else:
726
                try:
727
                    non_file = self.final_kind(trans_id) != "file"
728
                except NoSuchFile:
729
                    non_file = True
730
                if non_file is True:
731
                    conflicts.append(('non-file executability', trans_id))
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
732
        return conflicts
733
1534.7.152 by Aaron Bentley
Fixed overwrites
734
    def _overwrite_conflicts(self):
735
        """Check for overwrites (not permitted on Win32)"""
736
        conflicts = []
737
        for trans_id in self._new_contents:
738
            try:
739
                self.tree_kind(trans_id)
740
            except NoSuchFile:
741
                continue
742
            if trans_id not in self._removed_contents:
743
                conflicts.append(('overwrite', trans_id,
744
                                 self.final_name(trans_id)))
745
        return conflicts
746
1534.7.11 by Aaron Bentley
Refactored conflict handling
747
    def _duplicate_entries(self, by_parent):
748
        """No directory may have two entries with the same name."""
749
        conflicts = []
2590.2.16 by Aaron Bentley
Shortcut duplicate_entries conflict check if no new names introduced
750
        if (self._new_name, self._new_parent) == ({}, {}):
751
            return conflicts
1534.7.6 by Aaron Bentley
Added conflict handling
752
        for children in by_parent.itervalues():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
753
            name_ids = [(self.final_name(t), t) for t in children]
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
754
            if not self._case_sensitive_target:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
755
                name_ids = [(n.lower(), t) for n, t in name_ids]
1534.7.6 by Aaron Bentley
Added conflict handling
756
            name_ids.sort()
757
            last_name = None
758
            last_trans_id = None
759
            for name, trans_id in name_ids:
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
760
                try:
761
                    kind = self.final_kind(trans_id)
762
                except NoSuchFile:
763
                    kind = None
764
                file_id = self.final_file_id(trans_id)
765
                if kind is None and file_id is None:
766
                    continue
1534.7.6 by Aaron Bentley
Added conflict handling
767
                if name == last_name:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
768
                    conflicts.append(('duplicate', last_trans_id, trans_id,
769
                    name))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
770
                last_name = name
771
                last_trans_id = trans_id
1534.7.11 by Aaron Bentley
Refactored conflict handling
772
        return conflicts
773
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
774
    def _duplicate_ids(self):
775
        """Each inventory id may only be used once"""
776
        conflicts = []
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
777
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
778
                                self._removed_id))
3146.8.16 by Aaron Bentley
Updates from review
779
        all_ids = self._tree.all_file_ids()
780
        active_tree_ids = all_ids.difference(removed_tree_ids)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
781
        for trans_id, file_id in self._new_id.iteritems():
782
            if file_id in active_tree_ids:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
783
                old_trans_id = self.trans_id_tree_file_id(file_id)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
784
                conflicts.append(('duplicate id', old_trans_id, trans_id))
785
        return conflicts
786
1534.7.11 by Aaron Bentley
Refactored conflict handling
787
    def _parent_type_conflicts(self, by_parent):
788
        """parents must have directory 'contents'."""
789
        conflicts = []
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
790
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
791
            if parent_id is ROOT_PARENT:
792
                continue
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
793
            if not self._any_contents(children):
794
                continue
795
            for child in children:
796
                try:
797
                    self.final_kind(child)
798
                except NoSuchFile:
799
                    continue
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
800
            try:
801
                kind = self.final_kind(parent_id)
802
            except NoSuchFile:
803
                kind = None
804
            if kind is None:
805
                conflicts.append(('missing parent', parent_id))
806
            elif kind != "directory":
807
                conflicts.append(('non-directory parent', parent_id))
1534.7.6 by Aaron Bentley
Added conflict handling
808
        return conflicts
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
809
810
    def _any_contents(self, trans_ids):
811
        """Return true if any of the trans_ids, will have contents."""
812
        for trans_id in trans_ids:
813
            try:
814
                kind = self.final_kind(trans_id)
815
            except NoSuchFile:
816
                continue
817
            return True
818
        return False
1534.7.35 by Aaron Bentley
Got file renaming working
819
2502.1.14 by Aaron Bentley
Style update suggested by Robert
820
    def _limbo_name(self, trans_id):
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
821
        """Generate the limbo name of a file"""
2502.1.14 by Aaron Bentley
Style update suggested by Robert
822
        limbo_name = self._limbo_files.get(trans_id)
823
        if limbo_name is not None:
824
            return limbo_name
2502.1.3 by Aaron Bentley
Don't cause errors when creating contents for trans_ids with no parent/name
825
        parent = self._new_parent.get(trans_id)
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
826
        # if the parent directory is already in limbo (e.g. when building a
827
        # tree), choose a limbo name inside the parent, to reduce further
828
        # renames.
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
829
        use_direct_path = False
830
        if self._new_contents.get(parent) == 'directory':
831
            filename = self._new_name.get(trans_id)
832
            if filename is not None:
833
                if parent not in self._limbo_children:
834
                    self._limbo_children[parent] = set()
835
                    self._limbo_children_names[parent] = {}
836
                    use_direct_path = True
2502.1.6 by Aaron Bentley
Update from review comments
837
                # the direct path can only be used if no other file has
838
                # already taken this pathname, i.e. if the name is unused, or
839
                # if it is already associated with this trans_id.
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
840
                elif self._case_sensitive_target:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
841
                    if (self._limbo_children_names[parent].get(filename)
842
                        in (trans_id, None)):
843
                        use_direct_path = True
844
                else:
845
                    for l_filename, l_trans_id in\
846
                        self._limbo_children_names[parent].iteritems():
847
                        if l_trans_id == trans_id:
848
                            continue
849
                        if l_filename.lower() == filename.lower():
850
                            break
851
                    else:
852
                        use_direct_path = True
853
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
854
        if use_direct_path:
855
            limbo_name = pathjoin(self._limbo_files[parent], filename)
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
856
            self._limbo_children[parent].add(trans_id)
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
857
            self._limbo_children_names[parent][filename] = trans_id
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
858
        else:
859
            limbo_name = pathjoin(self._limbodir, trans_id)
860
            self._needs_rename.add(trans_id)
861
        self._limbo_files[trans_id] = limbo_name
862
        return limbo_name
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
863
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
864
    def _set_executability(self, path, entry, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
865
        """Set the executability of versioned files """
1534.7.25 by Aaron Bentley
Added set_executability
866
        new_executability = self._new_executability[trans_id]
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
867
        entry.executable = new_executability
1534.7.25 by Aaron Bentley
Added set_executability
868
        if supports_executable():
869
            abspath = self._tree.abspath(path)
870
            current_mode = os.stat(abspath).st_mode
871
            if new_executability:
872
                umask = os.umask(0)
873
                os.umask(umask)
874
                to_mode = current_mode | (0100 & ~umask)
875
                # Enable x-bit for others only if they can read it.
876
                if current_mode & 0004:
877
                    to_mode |= 0001 & ~umask
878
                if current_mode & 0040:
879
                    to_mode |= 0010 & ~umask
880
            else:
881
                to_mode = current_mode & ~0111
882
            os.chmod(abspath, to_mode)
883
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
884
    def _new_entry(self, name, parent_id, file_id):
1534.7.21 by Aaron Bentley
Updated docstrings
885
        """Helper function to create a new filesystem entry."""
1534.7.2 by Aaron Bentley
Added convenience function
886
        trans_id = self.create_path(name, parent_id)
887
        if file_id is not None:
888
            self.version_file(file_id, trans_id)
889
        return trans_id
890
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
891
    def new_file(self, name, parent_id, contents, file_id=None, 
892
                 executable=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
893
        """Convenience method to create files.
1534.7.21 by Aaron Bentley
Updated docstrings
894
        
895
        name is the name of the file to create.
896
        parent_id is the transaction id of the parent directory of the file.
897
        contents is an iterator of bytestrings, which will be used to produce
898
        the file.
1740.2.4 by Aaron Bentley
Update transform tests and docs
899
        :param file_id: The inventory ID of the file, if it is to be versioned.
900
        :param executable: Only valid when a file_id has been supplied.
1534.7.21 by Aaron Bentley
Updated docstrings
901
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
902
        trans_id = self._new_entry(name, parent_id, file_id)
1740.2.4 by Aaron Bentley
Update transform tests and docs
903
        # TODO: rather than scheduling a set_executable call,
904
        # have create_file create the file with the right mode.
1534.7.20 by Aaron Bentley
Added directory handling
905
        self.create_file(contents, trans_id)
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
906
        if executable is not None:
907
            self.set_executability(executable, trans_id)
1534.7.20 by Aaron Bentley
Added directory handling
908
        return trans_id
909
910
    def new_directory(self, name, parent_id, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
911
        """Convenience method to create directories.
1534.7.21 by Aaron Bentley
Updated docstrings
912
913
        name is the name of the directory to create.
914
        parent_id is the transaction id of the parent directory of the
915
        directory.
916
        file_id is the inventory ID of the directory, if it is to be versioned.
917
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
918
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.20 by Aaron Bentley
Added directory handling
919
        self.create_directory(trans_id)
920
        return trans_id 
921
1534.7.22 by Aaron Bentley
Added symlink support
922
    def new_symlink(self, name, parent_id, target, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
923
        """Convenience method to create symbolic link.
1534.7.22 by Aaron Bentley
Added symlink support
924
        
925
        name is the name of the symlink to create.
926
        parent_id is the transaction id of the parent directory of the symlink.
927
        target is a bytestring of the target of the symlink.
928
        file_id is the inventory ID of the file, if it is to be versioned.
929
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
930
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.22 by Aaron Bentley
Added symlink support
931
        self.create_symlink(target, trans_id)
932
        return trans_id
933
1551.11.12 by Aaron Bentley
Changes from review
934
    def _affected_ids(self):
935
        """Return the set of transform ids affected by the transform"""
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
936
        trans_ids = set(self._removed_id)
937
        trans_ids.update(self._new_id.keys())
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
938
        trans_ids.update(self._removed_contents)
939
        trans_ids.update(self._new_contents.keys())
940
        trans_ids.update(self._new_executability.keys())
941
        trans_ids.update(self._new_name.keys())
942
        trans_ids.update(self._new_parent.keys())
1551.11.12 by Aaron Bentley
Changes from review
943
        return trans_ids
944
945
    def _get_file_id_maps(self):
946
        """Return mapping of file_ids to trans_ids in the to and from states"""
947
        trans_ids = self._affected_ids()
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
948
        from_trans_ids = {}
949
        to_trans_ids = {}
950
        # Build up two dicts: trans_ids associated with file ids in the
951
        # FROM state, vs the TO state.
952
        for trans_id in trans_ids:
953
            from_file_id = self.tree_file_id(trans_id)
954
            if from_file_id is not None:
955
                from_trans_ids[from_file_id] = trans_id
956
            to_file_id = self.final_file_id(trans_id)
957
            if to_file_id is not None:
958
                to_trans_ids[to_file_id] = trans_id
1551.11.12 by Aaron Bentley
Changes from review
959
        return from_trans_ids, to_trans_ids
960
961
    def _from_file_data(self, from_trans_id, from_versioned, file_id):
962
        """Get data about a file in the from (tree) state
963
964
        Return a (name, parent, kind, executable) tuple
965
        """
966
        from_path = self._tree_id_paths.get(from_trans_id)
967
        if from_versioned:
968
            # get data from working tree if versioned
969
            from_entry = self._tree.inventory[file_id]
970
            from_name = from_entry.name
971
            from_parent = from_entry.parent_id
972
        else:
973
            from_entry = None
974
            if from_path is None:
975
                # File does not exist in FROM state
976
                from_name = None
977
                from_parent = None
978
            else:
979
                # File exists, but is not versioned.  Have to use path-
980
                # splitting stuff
981
                from_name = os.path.basename(from_path)
982
                tree_parent = self.get_tree_parent(from_trans_id)
983
                from_parent = self.tree_file_id(tree_parent)
984
        if from_path is not None:
985
            from_kind, from_executable, from_stats = \
986
                self._tree._comparison_data(from_entry, from_path)
987
        else:
988
            from_kind = None
989
            from_executable = False
990
        return from_name, from_parent, from_kind, from_executable
991
992
    def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
993
        """Get data about a file in the to (target) state
994
995
        Return a (name, parent, kind, executable) tuple
996
        """
997
        to_name = self.final_name(to_trans_id)
998
        try:
999
            to_kind = self.final_kind(to_trans_id)
1000
        except NoSuchFile:
1001
            to_kind = None
1002
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
1003
        if to_trans_id in self._new_executability:
1004
            to_executable = self._new_executability[to_trans_id]
1005
        elif to_trans_id == from_trans_id:
1006
            to_executable = from_executable
1007
        else:
1008
            to_executable = False
1009
        return to_name, to_parent, to_kind, to_executable
1010
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1011
    def iter_changes(self):
1012
        """Produce output in the same format as Tree.iter_changes.
1551.11.12 by Aaron Bentley
Changes from review
1013
1014
        Will produce nonsensical results if invoked while inventory/filesystem
1015
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
1016
1017
        This reads the Transform, but only reproduces changes involving a
1018
        file_id.  Files that are not versioned in either of the FROM or TO
1019
        states are not reflected.
1020
        """
1021
        final_paths = FinalPaths(self)
1022
        from_trans_ids, to_trans_ids = self._get_file_id_maps()
1551.11.4 by Aaron Bentley
Sort output of Transform.iter_changes by path
1023
        results = []
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1024
        # Now iterate through all active file_ids
1025
        for file_id in set(from_trans_ids.keys() + to_trans_ids.keys()):
1551.11.7 by Aaron Bentley
Stop modified flag bleeding into later changes
1026
            modified = False
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1027
            from_trans_id = from_trans_ids.get(file_id)
1028
            # find file ids, and determine versioning state
1029
            if from_trans_id is None:
1030
                from_versioned = False
1031
                from_trans_id = to_trans_ids[file_id]
1032
            else:
1033
                from_versioned = True
1034
            to_trans_id = to_trans_ids.get(file_id)
1035
            if to_trans_id is None:
1036
                to_versioned = False
1037
                to_trans_id = from_trans_id
1038
            else:
1039
                to_versioned = True
1551.11.12 by Aaron Bentley
Changes from review
1040
1041
            from_name, from_parent, from_kind, from_executable = \
1042
                self._from_file_data(from_trans_id, from_versioned, file_id)
1043
1044
            to_name, to_parent, to_kind, to_executable = \
1045
                self._to_file_data(to_trans_id, from_trans_id, from_executable)
1046
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1047
            if not from_versioned:
1048
                from_path = None
1049
            else:
1050
                from_path = self._tree_id_paths.get(from_trans_id)
1051
            if not to_versioned:
1052
                to_path = None
1053
            else:
1054
                to_path = final_paths.get_path(to_trans_id)
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1055
            if from_kind != to_kind:
1056
                modified = True
1551.10.37 by Aaron Bentley
recommit of TreeTransform._iter_changes fix with missing files
1057
            elif to_kind in ('file', 'symlink') and (
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1058
                to_trans_id != from_trans_id or
1059
                to_trans_id in self._new_contents):
1060
                modified = True
1061
            if (not modified and from_versioned == to_versioned and
1062
                from_parent==to_parent and from_name == to_name and
1063
                from_executable == to_executable):
1064
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1065
            results.append((file_id, (from_path, to_path), modified,
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1066
                   (from_versioned, to_versioned),
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1067
                   (from_parent, to_parent),
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1068
                   (from_name, to_name),
1069
                   (from_kind, to_kind),
1551.11.4 by Aaron Bentley
Sort output of Transform.iter_changes by path
1070
                   (from_executable, to_executable)))
1071
        return iter(sorted(results, key=lambda x:x[1]))
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1072
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1073
    def get_preview_tree(self):
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1074
        """Return a tree representing the result of the transform.
1075
1076
        This tree only supports the subset of Tree functionality required
1077
        by show_diff_trees.  It must only be compared to tt._tree.
1078
        """
1079
        return _PreviewTree(self)
1080
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1081
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1082
class TreeTransform(TreeTransformBase):
1083
    """Represent a tree transformation.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1084
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1085
    This object is designed to support incremental generation of the transform,
1086
    in any order.
1087
1088
    However, it gives optimum performance when parent directories are created
1089
    before their contents.  The transform is then able to put child files
1090
    directly in their parent directory, avoiding later renames.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1091
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1092
    It is easy to produce malformed transforms, but they are generally
1093
    harmless.  Attempting to apply a malformed transform will cause an
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1094
    exception to be raised before any modifications are made to the tree.
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1095
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1096
    Many kinds of malformed transforms can be corrected with the
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1097
    resolve_conflicts function.  The remaining ones indicate programming error,
1098
    such as trying to create a file with no path.
1099
1100
    Two sets of file creation methods are supplied.  Convenience methods are:
1101
     * new_file
1102
     * new_directory
1103
     * new_symlink
1104
1105
    These are composed of the low-level methods:
1106
     * create_path
1107
     * create_file or create_directory or create_symlink
1108
     * version_file
1109
     * set_executability
3008.1.13 by Michael Hudson
merge bzr.dev
1110
1111
    Transform/Transaction ids
1112
    -------------------------
1113
    trans_ids are temporary ids assigned to all files involved in a transform.
1114
    It's possible, even common, that not all files in the Tree have trans_ids.
1115
1116
    trans_ids are used because filenames and file_ids are not good enough
1117
    identifiers; filenames change, and not all files have file_ids.  File-ids
1118
    are also associated with trans-ids, so that moving a file moves its
1119
    file-id.
1120
1121
    trans_ids are only valid for the TreeTransform that generated them.
1122
1123
    Limbo
1124
    -----
1125
    Limbo is a temporary directory use to hold new versions of files.
1126
    Files are added to limbo by create_file, create_directory, create_symlink,
1127
    and their convenience variants (new_*).  Files may be removed from limbo
1128
    using cancel_creation.  Files are renamed from limbo into their final
1129
    location as part of TreeTransform.apply
1130
1131
    Limbo must be cleaned up, by either calling TreeTransform.apply or
1132
    calling TreeTransform.finalize.
1133
1134
    Files are placed into limbo inside their parent directories, where
1135
    possible.  This reduces subsequent renames, and makes operations involving
1136
    lots of files faster.  This optimization is only possible if the parent
1137
    directory is created *before* creating any of its children, so avoid
1138
    creating children before parents, where possible.
1139
1140
    Pending-deletion
1141
    ----------------
1142
    This temporary directory is used by _FileMover for storing files that are
1143
    about to be deleted.  In case of rollback, the files will be restored.
1144
    FileMover does not delete files until it is sure that a rollback will not
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1145
    happen.
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1146
    """
1147
    def __init__(self, tree, pb=DummyProgress()):
1148
        """Note: a tree_write lock is taken on the tree.
1149
1150
        Use TreeTransform.finalize() to release the lock (can be omitted if
1151
        TreeTransform.apply() called).
1152
        """
1153
        tree.lock_tree_write()
3008.1.13 by Michael Hudson
merge bzr.dev
1154
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1155
        try:
1156
            control_files = tree._control_files
1157
            limbodir = urlutils.local_path_from_url(
1158
                control_files.controlfilename('limbo'))
1159
            try:
1160
                os.mkdir(limbodir)
1161
            except OSError, e:
1162
                if e.errno == errno.EEXIST:
1163
                    raise ExistingLimbo(limbodir)
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1164
            deletiondir = urlutils.local_path_from_url(
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1165
                control_files.controlfilename('pending-deletion'))
1166
            try:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1167
                os.mkdir(deletiondir)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1168
            except OSError, e:
1169
                if e.errno == errno.EEXIST:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1170
                    raise errors.ExistingPendingDeletion(deletiondir)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1171
        except:
1172
            tree.unlock()
1173
            raise
3008.1.13 by Michael Hudson
merge bzr.dev
1174
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1175
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1176
                                   tree.case_sensitive)
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1177
        self._deletiondir = deletiondir
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1178
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1179
    def apply(self, no_conflicts=False, _mover=None):
1180
        """Apply all changes to the inventory and filesystem.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1181
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1182
        If filesystem or inventory conflicts are present, MalformedTransform
1183
        will be thrown.
1184
1185
        If apply succeeds, finalize is not necessary.
1186
1187
        :param no_conflicts: if True, the caller guarantees there are no
1188
            conflicts, so no check is made.
1189
        :param _mover: Supply an alternate FileMover, for testing
1190
        """
1191
        if not no_conflicts:
1192
            conflicts = self.find_conflicts()
1193
            if len(conflicts) != 0:
1194
                raise MalformedTransform(conflicts=conflicts)
1195
        inventory_delta = []
1196
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1197
        try:
1198
            if _mover is None:
1199
                mover = _FileMover()
1200
            else:
1201
                mover = _mover
1202
            try:
1203
                child_pb.update('Apply phase', 0, 2)
3146.8.18 by Aaron Bentley
Merge with dev
1204
                self._apply_removals(inventory_delta, mover)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1205
                child_pb.update('Apply phase', 1, 2)
3146.8.18 by Aaron Bentley
Merge with dev
1206
                modified_paths = self._apply_insertions(inventory_delta, mover)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1207
            except:
1208
                mover.rollback()
1209
                raise
1210
            else:
1211
                mover.apply_deletions()
1212
        finally:
1213
            child_pb.finished()
1214
        self._tree.apply_inventory_delta(inventory_delta)
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1215
        self._done = True
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1216
        self.finalize()
1217
        return _TransformResults(modified_paths, self.rename_count)
1218
3146.8.18 by Aaron Bentley
Merge with dev
1219
    def _apply_removals(self, inventory_delta, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1220
        """Perform tree operations that remove directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1221
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1222
        That is, delete files that are to be deleted, and put any files that
1223
        need renaming into limbo.  This must be done in strict child-to-parent
1224
        order.
1225
        """
1226
        tree_paths = list(self._tree_path_ids.iteritems())
1227
        tree_paths.sort(reverse=True)
1228
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1229
        try:
1230
            for num, data in enumerate(tree_paths):
1231
                path, trans_id = data
1232
                child_pb.update('removing file', num, len(tree_paths))
1233
                full_path = self._tree.abspath(path)
1234
                if trans_id in self._removed_contents:
1235
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
1236
                                     trans_id))
1237
                elif trans_id in self._new_name or trans_id in \
1238
                    self._new_parent:
1239
                    try:
1240
                        mover.rename(full_path, self._limbo_name(trans_id))
1241
                    except OSError, e:
1242
                        if e.errno != errno.ENOENT:
1243
                            raise
1244
                    else:
1245
                        self.rename_count += 1
1246
                if trans_id in self._removed_id:
1247
                    if trans_id == self._new_root:
1248
                        file_id = self._tree.get_root_id()
1249
                    else:
1250
                        file_id = self.tree_file_id(trans_id)
3146.8.18 by Aaron Bentley
Merge with dev
1251
                    assert file_id is not None
1252
                    # File-id isn't really being deleted, just moved
1253
                    if file_id in self._r_new_id:
1254
                        continue
1255
                    inventory_delta.append((path, None, file_id, None))
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1256
        finally:
1257
            child_pb.finished()
1258
3146.8.18 by Aaron Bentley
Merge with dev
1259
    def _apply_insertions(self, inventory_delta, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1260
        """Perform tree operations that insert directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1261
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1262
        That is, create any files that need to be created, and restore from
1263
        limbo any files that needed renaming.  This must be done in strict
1264
        parent-to-child order.
1265
        """
1266
        new_paths = self.new_paths()
1267
        modified_paths = []
1268
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1269
        completed_new = []
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1270
        try:
1271
            for num, (path, trans_id) in enumerate(new_paths):
1272
                new_entry = None
1273
                child_pb.update('adding file', num, len(new_paths))
1274
                if trans_id in self._new_contents or \
1275
                    self.path_changed(trans_id):
1276
                    full_path = self._tree.abspath(path)
1277
                    if trans_id in self._needs_rename:
1278
                        try:
1279
                            mover.rename(self._limbo_name(trans_id), full_path)
1280
                        except OSError, e:
1281
                            # We may be renaming a dangling inventory id
1282
                            if e.errno != errno.ENOENT:
1283
                                raise
1284
                        else:
1285
                            self.rename_count += 1
1286
                    if trans_id in self._new_contents:
1287
                        modified_paths.append(full_path)
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1288
                        completed_new.append(trans_id)
3146.8.18 by Aaron Bentley
Merge with dev
1289
                file_id = self.final_file_id(trans_id)
1290
                if file_id is not None and (trans_id in self._new_id or
1291
                    trans_id in self._new_name or trans_id in self._new_parent
1292
                    or trans_id in self._new_executability):
1293
                    try:
1294
                        kind = self.final_kind(trans_id)
1295
                    except NoSuchFile:
1296
                        kind = self._tree.stored_kind(file_id)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1297
                    if trans_id in self._new_reference_revision:
1298
                        new_entry = inventory.TreeReference(
3146.8.18 by Aaron Bentley
Merge with dev
1299
                            self.final_file_id(trans_id),
3146.8.20 by Aaron Bentley
Fix trailing whitespace
1300
                            self._new_name[trans_id],
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1301
                            self.final_file_id(self._new_parent[trans_id]),
1302
                            None, self._new_reference_revision[trans_id])
1303
                    else:
1304
                        new_entry = inventory.make_entry(kind,
1305
                            self.final_name(trans_id),
1306
                            self.final_file_id(self.final_parent(trans_id)),
3146.8.18 by Aaron Bentley
Merge with dev
1307
                            self.final_file_id(trans_id))
1308
                    try:
1309
                        old_path = self._tree.id2path(new_entry.file_id)
1310
                    except errors.NoSuchId:
1311
                        old_path = None
1312
                    inventory_delta.append((old_path, path, new_entry.file_id,
1313
                                            new_entry))
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1314
1315
                if trans_id in self._new_executability:
1316
                    self._set_executability(path, new_entry, trans_id)
1317
        finally:
1318
            child_pb.finished()
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1319
        for trans_id in completed_new:
1320
            del self._new_contents[trans_id]
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1321
        return modified_paths
1322
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1323
1324
class TransformPreview(TreeTransformBase):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1325
    """A TreeTransform for generating preview trees.
1326
1327
    Unlike TreeTransform, this version works when the input tree is a
1328
    RevisionTree, rather than a WorkingTree.  As a result, it tends to ignore
1329
    unversioned files in the input tree.
1330
    """
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1331
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1332
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1333
        tree.lock_read()
3199.1.4 by Vincent Ladeuil
Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview
1334
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1335
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1336
1337
    def canonical_path(self, path):
1338
        return path
1339
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1340
    def tree_kind(self, trans_id):
1341
        path = self._tree_id_paths.get(trans_id)
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1342
        if path is None:
1343
            raise NoSuchFile(None)
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1344
        file_id = self._tree.path2id(path)
1345
        return self._tree.kind(file_id)
1346
1347
    def _set_mode(self, trans_id, mode_id, typefunc):
1348
        """Set the mode of new file contents.
1349
        The mode_id is the existing file to get the mode from (often the same
1350
        as trans_id).  The operation is only performed if there's a mode match
1351
        according to typefunc.
1352
        """
1353
        # is it ok to ignore this?  probably
1354
        pass
1355
1356
    def iter_tree_children(self, parent_id):
1357
        """Iterate through the entry's tree children, if any"""
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1358
        try:
1359
            path = self._tree_id_paths[parent_id]
1360
        except KeyError:
1361
            return
1362
        file_id = self.tree_file_id(parent_id)
1363
        for child in self._tree.inventory[file_id].children.iterkeys():
1364
            childpath = joinpath(path, child)
1365
            yield self.trans_id_tree_path(childpath)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1366
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1367
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1368
class _PreviewTree(object):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1369
    """Partial implementation of Tree to support show_diff_trees"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1370
1371
    def __init__(self, transform):
1372
        self._transform = transform
1373
1374
    def lock_read(self):
3008.1.18 by Aaron Bentley
Get supported PreviewTree functionality under test
1375
        # Perhaps in theory, this should lock the TreeTransform?
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1376
        pass
1377
1378
    def unlock(self):
1379
        pass
1380
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1381
    def iter_changes(self, from_tree, include_unchanged=False,
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1382
                      specific_files=None, pb=None, extra_trees=None,
1383
                      require_versioned=True, want_unversioned=False):
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1384
        """See InterTree.iter_changes.
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1385
1386
        This implementation does not support include_unchanged, specific_files,
1387
        or want_unversioned.  extra_trees, require_versioned, and pb are
1388
        ignored.
1389
        """
1390
        if from_tree is not self._transform._tree:
1391
            raise ValueError('from_tree must be transform source tree.')
1392
        if include_unchanged:
1393
            raise ValueError('include_unchanged is not supported')
1394
        if specific_files is not None:
1395
            raise ValueError('specific_files is not supported')
1396
        if want_unversioned:
1397
            raise ValueError('want_unversioned is not supported')
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1398
        return self._transform.iter_changes()
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1399
3008.1.3 by Aaron Bentley
Support basic diff
1400
    def kind(self, file_id):
1401
        trans_id = self._transform.trans_id_file_id(file_id)
1402
        return self._transform.final_kind(trans_id)
1403
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1404
    def get_file_mtime(self, file_id, path=None):
3008.1.20 by Aaron Bentley
Add some docstrings
1405
        """See Tree.get_file_mtime"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1406
        trans_id = self._transform.trans_id_file_id(file_id)
1407
        name = self._transform._limbo_name(trans_id)
1408
        return os.stat(name).st_mtime
1409
3008.1.3 by Aaron Bentley
Support basic diff
1410
    def get_file(self, file_id):
3008.1.20 by Aaron Bentley
Add some docstrings
1411
        """See Tree.get_file"""
3008.1.3 by Aaron Bentley
Support basic diff
1412
        trans_id = self._transform.trans_id_file_id(file_id)
1413
        name = self._transform._limbo_name(trans_id)
1414
        return open(name, 'rb')
1415
3228.1.1 by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so
1416
    def get_symlink_target(self, file_id):
1417
        """See Tree.get_symlink_target"""
1418
        trans_id = self._transform.trans_id_file_id(file_id)
1419
        name = self._transform._limbo_name(trans_id)
1420
        return os.readlink(name)
1421
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1422
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1423
        """See Tree.paths2ids"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1424
        return 'not_empty'
1425
1426
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1427
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
1428
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1429
    if parent is None or parent == "":
1430
        return child
1431
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1432
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1433
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
1434
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1435
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1436
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
1437
1438
    The underlying tree must not be manipulated between calls, or else
1439
    the results will likely be incorrect.
1440
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1441
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1442
        object.__init__(self)
1443
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
1444
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1445
1446
    def _determine_path(self, trans_id):
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1447
        if trans_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1448
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
1449
        name = self.transform.final_name(trans_id)
1450
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1451
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1452
            return name
1453
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1454
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1455
1456
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1457
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1458
        if trans_id not in self._known_paths:
1459
            self._known_paths[trans_id] = self._determine_path(trans_id)
1460
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1461
3006.2.2 by Alexander Belchenko
tests added.
1462
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1463
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
1464
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1465
    file_ids = list(tree)
1466
    file_ids.sort(key=tree.id2path)
1467
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1468
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1469
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1470
def build_tree(tree, wt, accelerator_tree=None, hardlink=False):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1471
    """Create working tree for a branch, using a TreeTransform.
1472
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1473
    This function should be used on empty trees, having a tree root at most.
1474
    (see merge and revert functionality for working with existing trees)
1475
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1476
    Existing files are handled like so:
1477
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1478
    - Existing bzrdirs take precedence over creating new items.  They are
1479
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1480
    - Otherwise, if the content on disk matches the content we are building,
1481
      it is silently replaced.
1482
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
3123.5.17 by Aaron Bentley
Update docs
1483
1484
    :param tree: The tree to convert wt into a copy of
1485
    :param wt: The working tree that files will be placed into
1486
    :param accelerator_tree: A tree which can be used for retrieving file
1487
        contents more quickly than tree itself, i.e. a workingtree.  tree
1488
        will be used for cases where accelerator_tree's content is different.
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1489
    :param hardlink: If true, hard-link files to accelerator_tree, where
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
1490
        possible.  accelerator_tree must implement abspath, i.e. be a
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1491
        working tree.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1492
    """
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1493
    wt.lock_tree_write()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1494
    try:
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1495
        tree.lock_read()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1496
        try:
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
1497
            if accelerator_tree is not None:
1498
                accelerator_tree.lock_read()
1499
            try:
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1500
                return _build_tree(tree, wt, accelerator_tree, hardlink)
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
1501
            finally:
1502
                if accelerator_tree is not None:
1503
                    accelerator_tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1504
        finally:
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1505
            tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1506
    finally:
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1507
        wt.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1508
3006.2.2 by Alexander Belchenko
tests added.
1509
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1510
def _build_tree(tree, wt, accelerator_tree, hardlink):
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1511
    """See build_tree."""
3146.8.17 by Aaron Bentley
Change to explicit file_id list
1512
    for num, _unused in enumerate(wt.all_file_ids()):
3146.8.16 by Aaron Bentley
Updates from review
1513
        if num > 0:  # more than just a root
1514
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1515
    file_trans_id = {}
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1516
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1517
    pp = ProgressPhase("Build phase", 2, top_pb)
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1518
    if tree.inventory.root is not None:
2502.1.6 by Aaron Bentley
Update from review comments
1519
        # This is kind of a hack: we should be altering the root
1520
        # as part of the regular tree shape diff logic.
1521
        # The conditional test here is to avoid doing an
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1522
        # expensive operation (flush) every time the root id
1523
        # is set within the tree, nor setting the root and thus
1524
        # marking the tree as dirty, because we use two different
1525
        # idioms here: tree interfaces and inventory interfaces.
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
1526
        if wt.get_root_id() != tree.get_root_id():
1527
            wt.set_root_id(tree.get_root_id())
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1528
            wt.flush()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1529
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1530
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1531
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1532
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1533
        file_trans_id[wt.get_root_id()] = \
1534
            tt.trans_id_tree_file_id(wt.get_root_id())
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1535
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1536
        try:
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1537
            deferred_contents = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1538
            num = 0
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1539
            for num, (tree_path, entry) in \
1540
                enumerate(tree.inventory.iter_entries_by_dir()):
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1541
                pb.update("Building tree", num - len(deferred_contents),
1542
                          len(tree.inventory))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1543
                if entry.parent_id is None:
1544
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1545
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1546
                file_id = entry.file_id
1547
                target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1548
                try:
1549
                    kind = file_kind(target_path)
1550
                except NoSuchFile:
1551
                    pass
1552
                else:
1553
                    if kind == "directory":
1554
                        try:
1555
                            bzrdir.BzrDir.open(target_path)
1556
                        except errors.NotBranchError:
1557
                            pass
1558
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1559
                            divert.add(file_id)
1560
                    if (file_id not in divert and
1561
                        _content_match(tree, entry, file_id, kind,
1562
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1563
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1564
                        if kind == 'directory':
1565
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1566
                if entry.parent_id not in file_trans_id:
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1567
                    raise AssertionError(
1568
                        'entry %s parent id %r is not in file_trans_id %r'
1569
                        % (entry, entry.parent_id, file_trans_id))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1570
                parent_id = file_trans_id[entry.parent_id]
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1571
                if entry.kind == 'file':
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1572
                    # We *almost* replicate new_by_entry, so that we can defer
1573
                    # getting the file text, and get them all at once.
1574
                    trans_id = tt.create_path(entry.name, parent_id)
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1575
                    file_trans_id[file_id] = trans_id
1576
                    tt.version_file(entry.file_id, trans_id)
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1577
                    executable = tree.is_executable(entry.file_id, tree_path)
1578
                    if executable is not None:
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1579
                        tt.set_executability(executable, trans_id)
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1580
                    deferred_contents.append((entry.file_id, trans_id))
1581
                else:
1582
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1583
                                                          tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1584
                if reparent:
1585
                    new_trans_id = file_trans_id[file_id]
1586
                    old_parent = tt.trans_id_tree_path(tree_path)
1587
                    _reparent_children(tt, old_parent, new_trans_id)
3136.1.11 by Aaron Bentley
Updates from review
1588
            offset = num + 1 - len(deferred_contents)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1589
            _create_files(tt, tree, deferred_contents, pb, offset,
1590
                          accelerator_tree, hardlink)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1591
        finally:
1592
            pb.finished()
1593
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1594
        divert_trans = set(file_trans_id[f] for f in divert)
1595
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1596
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1597
        conflicts = cook_conflicts(raw_conflicts, tt)
1598
        for conflict in conflicts:
1599
            warning(conflict)
1600
        try:
1601
            wt.add_conflicts(conflicts)
1602
        except errors.UnsupportedOperation:
1603
            pass
3123.5.7 by Aaron Bentley
Avoid redundant conflict check
1604
        result = tt.apply(no_conflicts=True)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1605
    finally:
1606
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1607
        top_pb.finished()
2502.1.5 by Aaron Bentley
Cleanup
1608
    return result
1534.7.47 by Aaron Bentley
Started work on 'revert'
1609
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1610
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1611
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
1612
                  hardlink):
1613
    total = len(desired_files) + offset
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1614
    if accelerator_tree is None:
1615
        new_desired_files = desired_files
1616
    else:
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1617
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
3137.1.1 by Aaron Bentley
Fix build_tree acceleration when file is moved in accelerator_tree
1618
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1619
                         in iter if not (c or e[0] != e[1]))
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1620
        new_desired_files = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1621
        count = 0
1622
        for file_id, trans_id in desired_files:
3123.5.13 by Aaron Bentley
Accelerate further by using iter_changes
1623
            accelerator_path = unchanged.get(file_id)
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
1624
            if accelerator_path is None:
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1625
                new_desired_files.append((file_id, trans_id))
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
1626
                continue
3136.1.11 by Aaron Bentley
Updates from review
1627
            pb.update('Adding file contents', count + offset, total)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1628
            if hardlink:
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
1629
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1630
                                   trans_id)
1631
            else:
1632
                contents = accelerator_tree.get_file(file_id, accelerator_path)
1633
                try:
1634
                    tt.create_file(contents, trans_id)
1635
                finally:
1636
                    contents.close()
1637
            count += 1
1638
        offset += count
1639
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
1640
                                                 new_desired_files)):
1641
        tt.create_file(contents, trans_id)
3136.1.11 by Aaron Bentley
Updates from review
1642
        pb.update('Adding file contents', count + offset, total)
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1643
1644
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1645
def _reparent_children(tt, old_parent, new_parent):
1646
    for child in tt.iter_tree_children(old_parent):
1647
        tt.adjust_path(tt.final_name(child), new_parent, child)
1648
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
1649
def _reparent_transform_children(tt, old_parent, new_parent):
1650
    by_parent = tt.by_parent()
1651
    for child in by_parent[old_parent]:
1652
        tt.adjust_path(tt.final_name(child), new_parent, child)
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
1653
    return by_parent[old_parent]
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1654
1655
def _content_match(tree, entry, file_id, kind, target_path):
1656
    if entry.kind != kind:
1657
        return False
1658
    if entry.kind == "directory":
1659
        return True
1660
    if entry.kind == "file":
1661
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
1662
            return True
1663
    elif entry.kind == "symlink":
1664
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
1665
            return True
1666
    return False
1667
1668
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1669
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1670
    new_conflicts = set()
1671
    for c_type, conflict in ((c[0], c) for c in conflicts):
1672
        # Anything but a 'duplicate' would indicate programmer error
1673
        assert c_type == 'duplicate', c_type
1674
        # Now figure out which is new and which is old
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1675
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1676
            new_file = conflict[1]
1677
            old_file = conflict[2]
1678
        else:
1679
            new_file = conflict[2]
1680
            old_file = conflict[1]
1681
1682
        # We should only get here if the conflict wasn't completely
1683
        # resolved
1684
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1685
        if new_file in divert:
1686
            new_name = tt.final_name(old_file)+'.diverted'
1687
            tt.adjust_path(new_name, final_parent, new_file)
1688
            new_conflicts.add((c_type, 'Diverted to',
1689
                               new_file, old_file))
1690
        else:
1691
            new_name = tt.final_name(old_file)+'.moved'
1692
            tt.adjust_path(new_name, final_parent, old_file)
1693
            new_conflicts.add((c_type, 'Moved existing file to',
1694
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1695
    return new_conflicts
1696
1697
1534.7.47 by Aaron Bentley
Started work on 'revert'
1698
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
1699
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1700
    name = entry.name
1701
    kind = entry.kind
1702
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
1703
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1704
        executable = tree.is_executable(entry.file_id)
1705
        return tt.new_file(name, parent_id, contents, entry.file_id, 
1706
                           executable)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1707
    elif kind in ('directory', 'tree-reference'):
1708
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
1709
        if kind == 'tree-reference':
1710
            tt.set_tree_reference(entry.reference_revision, trans_id)
1711
        return trans_id 
1534.7.47 by Aaron Bentley
Started work on 'revert'
1712
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
1713
        target = tree.get_symlink_target(entry.file_id)
1714
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1715
    else:
1716
        raise errors.BadFileKindError(name, kind)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1717
3006.2.2 by Alexander Belchenko
tests added.
1718
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1719
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1534.7.157 by Aaron Bentley
Added more docs
1720
    """Create new file contents according to an inventory entry."""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1721
    if entry.kind == "file":
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1722
        if lines is None:
1534.7.97 by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict
1723
            lines = tree.get_file(entry.file_id).readlines()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1724
        tt.create_file(lines, trans_id, mode_id=mode_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1725
    elif entry.kind == "symlink":
1534.7.101 by Aaron Bentley
Got conflicts on symlinks working properly
1726
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1727
    elif entry.kind == "directory":
1534.7.51 by Aaron Bentley
New approach to revert
1728
        tt.create_directory(trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1729
3006.2.2 by Alexander Belchenko
tests added.
1730
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1731
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1732
    """Set the executability of a trans_id according to an inventory entry"""
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1733
    if entry.kind == "file":
1734
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1735
1534.7.157 by Aaron Bentley
Added more docs
1736
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1737
@deprecated_function(zero_fifteen)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1738
def find_interesting(working_tree, target_tree, filenames):
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1739
    """Find the ids corresponding to specified filenames.
1740
    
1741
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1742
    """
1743
    working_tree.lock_read()
1744
    try:
1745
        target_tree.lock_read()
1746
        try:
1747
            return working_tree.paths2ids(filenames, [target_tree])
1748
        finally:
1749
            target_tree.unlock()
1750
    finally:
1751
        working_tree.unlock()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1752
1753
2687.2.1 by Martin Pool
Rename upcoming release from 0.19 to 0.90
1754
@deprecated_function(zero_ninety)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1755
def change_entry(tt, file_id, working_tree, target_tree, 
1534.10.28 by Aaron Bentley
Use numbered backup files
1756
                 trans_id_file_id, backups, trans_id, by_parent):
1534.7.157 by Aaron Bentley
Added more docs
1757
    """Replace a file_id's contents with those from a target tree."""
2625.4.3 by Ian Clatworthy
Add a test to ensure the deprecation worked.
1758
    if file_id is None and target_tree is None:
1759
        # skip the logic altogether in the deprecation test
1760
        return
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1761
    e_trans_id = trans_id_file_id(file_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1762
    entry = target_tree.inventory[file_id]
1763
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1764
                                                           working_tree)
1765
    if contents_mod:
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1766
        mode_id = e_trans_id
1534.7.55 by Aaron Bentley
Fixed up the change detection
1767
        if has_contents:
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1768
            if not backups:
1769
                tt.delete_contents(e_trans_id)
1770
            else:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1771
                parent_trans_id = trans_id_file_id(entry.parent_id)
1534.10.28 by Aaron Bentley
Use numbered backup files
1772
                backup_name = get_backup_name(entry, by_parent,
1773
                                              parent_trans_id, tt)
1774
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1775
                tt.unversion_file(e_trans_id)
1776
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1777
                tt.version_file(file_id, e_trans_id)
1778
                trans_id[file_id] = e_trans_id
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1779
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1780
        create_entry_executability(tt, entry, e_trans_id)
1781
1711.4.26 by John Arbash Meinel
Fix #45010 correctly. Don't forget the execute bit.
1782
    elif meta_mod:
1783
        tt.set_executability(entry.executable, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1784
    if tt.final_name(e_trans_id) != entry.name:
1785
        adjust_path  = True
1786
    else:
1787
        parent_id = tt.final_parent(e_trans_id)
1788
        parent_file_id = tt.final_file_id(parent_id)
1789
        if parent_file_id != entry.parent_id:
1790
            adjust_path = True
1791
        else:
1792
            adjust_path = False
1793
    if adjust_path:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1794
        parent_trans_id = trans_id_file_id(entry.parent_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1795
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1796
1797
1534.10.28 by Aaron Bentley
Use numbered backup files
1798
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1799
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1800
1801
1802
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1534.10.28 by Aaron Bentley
Use numbered backup files
1803
    """Produce a backup-style name that appears to be available"""
1804
    def name_gen():
1805
        counter = 1
1806
        while True:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1807
            yield "%s.~%d~" % (name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
1808
            counter += 1
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1809
    for new_name in name_gen():
1810
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
1811
            return new_name
1812
1534.10.28 by Aaron Bentley
Use numbered backup files
1813
1534.7.55 by Aaron Bentley
Fixed up the change detection
1814
def _entry_changes(file_id, entry, working_tree):
1534.7.156 by Aaron Bentley
PEP8 fixes
1815
    """Determine in which ways the inventory entry has changed.
1534.7.55 by Aaron Bentley
Fixed up the change detection
1816
1817
    Returns booleans: has_contents, content_mod, meta_mod
1818
    has_contents means there are currently contents, but they differ
1819
    contents_mod means contents need to be modified
1820
    meta_mod means the metadata needs to be modified
1821
    """
1822
    cur_entry = working_tree.inventory[file_id]
1823
    try:
1824
        working_kind = working_tree.kind(file_id)
1825
        has_contents = True
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
1826
    except NoSuchFile:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1827
        has_contents = False
1828
        contents_mod = True
1829
        meta_mod = False
1830
    if has_contents is True:
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1831
        if entry.kind != working_kind:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1832
            contents_mod, meta_mod = True, False
1833
        else:
1834
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1835
                                       working_tree)
1836
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
1837
            cur_entry._forget_tree_state()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1838
    return has_contents, contents_mod, meta_mod
1839
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1840
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1841
def revert(working_tree, target_tree, filenames, backups=False,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1842
           pb=DummyProgress(), change_reporter=None):
1534.7.157 by Aaron Bentley
Added more docs
1843
    """Revert a working tree's contents to those of a target tree."""
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1844
    target_tree.lock_read()
1534.9.7 by Aaron Bentley
Show progress bars in revert
1845
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1846
    try:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1847
        pp = ProgressPhase("Revert phase", 3, pb)
1848
        pp.next_phase()
1849
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1850
        try:
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1851
            merge_modified = _alter_files(working_tree, target_tree, tt,
1852
                                          child_pb, filenames, backups)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1853
        finally:
1854
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1855
        pp.next_phase()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1856
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1857
        try:
1551.19.5 by Aaron Bentley
Fix revert when parent dir is missing
1858
            raw_conflicts = resolve_conflicts(tt, child_pb,
1859
                lambda t, c: conflict_pass(t, c, target_tree))
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1860
        finally:
1861
            child_pb.finished()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1862
        conflicts = cook_conflicts(raw_conflicts, tt)
1551.11.5 by Aaron Bentley
cleanup
1863
        if change_reporter:
1551.10.25 by Aaron Bentley
Make ChangeReporter private
1864
            change_reporter = delta._ChangeReporter(
2255.7.98 by Robert Collins
Merge bzr.dev.
1865
                unversioned_filter=working_tree.is_ignored)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1866
            delta.report_changes(tt.iter_changes(), change_reporter)
1551.11.6 by Aaron Bentley
Emit change listings before conflict warnings
1867
        for conflict in conflicts:
1868
            warning(conflict)
1869
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1870
        tt.apply()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1871
        working_tree.set_merge_modified(merge_modified)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1872
    finally:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1873
        target_tree.unlock()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1874
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1875
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1876
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
1877
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1878
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1879
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
1880
                 backups):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1881
    merge_modified = working_tree.merge_modified()
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1882
    change_list = target_tree.iter_changes(working_tree,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1883
        specific_files=specific_files, pb=pb)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1884
    if target_tree.inventory.root is None:
1885
        skip_root = True
1886
    else:
1887
        skip_root = False
1888
    basis_tree = None
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1889
    try:
2708.1.5 by Aaron Bentley
Use Tree.extract_files_bytes in revert
1890
        deferred_files = []
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1891
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1892
                kind, executable) in enumerate(change_list):
1893
            if skip_root and file_id[0] is not None and parent[0] is None:
1894
                continue
1895
            trans_id = tt.trans_id_file_id(file_id)
1896
            mode_id = None
1897
            if changed_content:
1898
                keep_content = False
1899
                if kind[0] == 'file' and (backups or kind[1] is None):
1900
                    wt_sha1 = working_tree.get_file_sha1(file_id)
1901
                    if merge_modified.get(file_id) != wt_sha1:
2502.1.6 by Aaron Bentley
Update from review comments
1902
                        # acquire the basis tree lazily to prevent the
1903
                        # expense of accessing it when it's not needed ?
1904
                        # (Guessing, RBC, 200702)
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1905
                        if basis_tree is None:
1906
                            basis_tree = working_tree.basis_tree()
1907
                            basis_tree.lock_read()
1908
                        if file_id in basis_tree:
1909
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
1910
                                keep_content = True
1911
                        elif kind[1] is None and not versioned[1]:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1912
                            keep_content = True
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1913
                if kind[0] is not None:
1914
                    if not keep_content:
1915
                        tt.delete_contents(trans_id)
1916
                    elif kind[1] is not None:
1917
                        parent_trans_id = tt.trans_id_file_id(parent[0])
1918
                        by_parent = tt.by_parent()
1919
                        backup_name = _get_backup_name(name[0], by_parent,
1920
                                                       parent_trans_id, tt)
1921
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
1922
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
1923
                        if versioned == (True, True):
1924
                            tt.unversion_file(trans_id)
1925
                            tt.version_file(file_id, new_trans_id)
1926
                        # New contents should have the same unix perms as old
1927
                        # contents
1928
                        mode_id = trans_id
1929
                        trans_id = new_trans_id
1930
                if kind[1] == 'directory':
1931
                    tt.create_directory(trans_id)
1932
                elif kind[1] == 'symlink':
1933
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1934
                                      trans_id)
1935
                elif kind[1] == 'file':
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1936
                    deferred_files.append((file_id, (trans_id, mode_id)))
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1937
                    if basis_tree is None:
1938
                        basis_tree = working_tree.basis_tree()
1939
                        basis_tree.lock_read()
1940
                    new_sha1 = target_tree.get_file_sha1(file_id)
1941
                    if (file_id in basis_tree and new_sha1 ==
1942
                        basis_tree.get_file_sha1(file_id)):
1943
                        if file_id in merge_modified:
1944
                            del merge_modified[file_id]
1945
                    else:
1946
                        merge_modified[file_id] = new_sha1
1947
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1948
                    # preserve the execute bit when backing up
1949
                    if keep_content and executable[0] == executable[1]:
1950
                        tt.set_executability(executable[1], trans_id)
1951
                else:
1952
                    assert kind[1] is None
1953
            if versioned == (False, True):
1954
                tt.version_file(file_id, trans_id)
1955
            if versioned == (True, False):
1956
                tt.unversion_file(trans_id)
1957
            if (name[1] is not None and 
1958
                (name[0] != name[1] or parent[0] != parent[1])):
1959
                tt.adjust_path(
1960
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
1961
            if executable[0] != executable[1] and kind[1] == "file":
1962
                tt.set_executability(executable[1], trans_id)
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1963
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1964
            deferred_files):
1965
            tt.create_file(bytes, trans_id, mode_id)
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1966
    finally:
1967
        if basis_tree is not None:
1968
            basis_tree.unlock()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1969
    return merge_modified
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1970
1971
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1972
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1973
    """Make many conflict-resolution attempts, but die if they fail"""
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1974
    if pass_func is None:
1975
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1976
    new_conflicts = set()
1534.9.1 by Aaron Bentley
Added progress bars to merge
1977
    try:
1978
        for n in range(10):
1979
            pb.update('Resolution pass', n+1, 10)
1980
            conflicts = tt.find_conflicts()
1981
            if len(conflicts) == 0:
1982
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1983
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
1984
        raise MalformedTransform(conflicts=conflicts)
1985
    finally:
1986
        pb.clear()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1987
1988
2590.2.8 by Aaron Bentley
Restore conflict handling changes
1989
def conflict_pass(tt, conflicts, path_tree=None):
1990
    """Resolve some classes of conflicts.
1991
1992
    :param tt: The transform to resolve conflicts in
1993
    :param conflicts: The conflicts to resolve
1994
    :param path_tree: A Tree to get supplemental paths from
1995
    """
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1996
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1997
    for c_type, conflict in ((c[0], c) for c in conflicts):
1998
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
1999
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2000
            new_conflicts.add((c_type, 'Unversioned existing file',
2001
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2002
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2003
            # files that were renamed take precedence
2004
            final_parent = tt.final_parent(conflict[1])
2005
            if tt.path_changed(conflict[1]):
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
2006
                existing_file, new_file = conflict[2], conflict[1]
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2007
            else:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
2008
                existing_file, new_file = conflict[1], conflict[2]
2009
            new_name = tt.final_name(existing_file)+'.moved'
2010
            tt.adjust_path(new_name, final_parent, existing_file)
2011
            new_conflicts.add((c_type, 'Moved existing file to', 
2012
                               existing_file, new_file))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2013
        elif c_type == 'parent loop':
2014
            # break the loop by undoing one of the ops that caused the loop
2015
            cur = conflict[1]
2016
            while not tt.path_changed(cur):
2017
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2018
            new_conflicts.add((c_type, 'Cancelled move', cur,
2019
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2020
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2021
            
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2022
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
2023
            trans_id = conflict[1]
2024
            try:
2025
                tt.cancel_deletion(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
2026
                new_conflicts.add(('deleting parent', 'Not deleting', 
2027
                                   trans_id))
1534.7.128 by Aaron Bentley
Got missing contents test working
2028
            except KeyError:
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
2029
                create = True
2590.2.8 by Aaron Bentley
Restore conflict handling changes
2030
                try:
2031
                    tt.final_name(trans_id)
2032
                except NoFinalPath:
1551.19.6 by Aaron Bentley
Revert doesn't crash restoring a file from a deleted directory
2033
                    if path_tree is not None:
2034
                        file_id = tt.final_file_id(trans_id)
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
2035
                        if file_id is None:
2036
                            file_id = tt.inactive_file_id(trans_id)
1551.19.6 by Aaron Bentley
Revert doesn't crash restoring a file from a deleted directory
2037
                        entry = path_tree.inventory[file_id]
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
2038
                        # special-case the other tree root (move its
2039
                        # children to current root)
2040
                        if entry.parent_id is None:
2041
                            create=False
2042
                            moved = _reparent_transform_children(
2043
                                tt, trans_id, tt.root)
2044
                            for child in moved:
2045
                                new_conflicts.add((c_type, 'Moved to root',
2046
                                                   child))
2047
                        else:
2048
                            parent_trans_id = tt.trans_id_file_id(
2049
                                entry.parent_id)
2050
                            tt.adjust_path(entry.name, parent_trans_id,
2051
                                           trans_id)
2052
                if create:
2053
                    tt.create_directory(trans_id)
2054
                    new_conflicts.add((c_type, 'Created directory', trans_id))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2055
        elif c_type == 'unversioned parent':
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
2056
            file_id = tt.inactive_file_id(conflict[1])
2057
            # special-case the other tree root (move its children instead)
2058
            if path_tree and file_id in path_tree:
2059
                if path_tree.inventory[file_id].parent_id is None:
2060
                    continue
2061
            tt.version_file(file_id, conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
2062
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
2063
        elif c_type == 'non-directory parent':
2064
            parent_id = conflict[1]
2065
            parent_parent = tt.final_parent(parent_id)
2066
            parent_name = tt.final_name(parent_id)
2067
            parent_file_id = tt.final_file_id(parent_id)
2068
            new_parent_id = tt.new_directory(parent_name + '.new',
2069
                parent_parent, parent_file_id)
2070
            _reparent_transform_children(tt, parent_id, new_parent_id)
3146.8.19 by Aaron Bentley
Merge with bzr.dev
2071
            if parent_file_id is not None:
2072
                tt.unversion_file(parent_id)
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
2073
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2074
    return new_conflicts
2075
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
2076
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2077
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2078
    """Generate a list of cooked conflicts, sorted by file path"""
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
2079
    from bzrlib.conflicts import Conflict
2080
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
2081
    return sorted(conflict_iter, key=Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2082
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2083
2084
def iter_cook_conflicts(raw_conflicts, tt):
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2085
    from bzrlib.conflicts import Conflict
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2086
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2087
    for conflict in raw_conflicts:
2088
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2089
        action = conflict[1]
2090
        modified_path = fp.get_path(conflict[2])
2091
        modified_id = tt.final_file_id(conflict[2])
2092
        if len(conflict) == 3:
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2093
            yield Conflict.factory(c_type, action=action, path=modified_path,
2094
                                     file_id=modified_id)
2095
             
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2096
        else:
2097
            conflicting_path = fp.get_path(conflict[3])
2098
            conflicting_id = tt.final_file_id(conflict[3])
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2099
            yield Conflict.factory(c_type, action=action, path=modified_path,
2100
                                   file_id=modified_id, 
2101
                                   conflict_path=conflicting_path,
2102
                                   conflict_file_id=conflicting_id)
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2103
2104
2105
class _FileMover(object):
2733.2.9 by Aaron Bentley
Update docstrings
2106
    """Moves and deletes files for TreeTransform, tracking operations"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2107
2108
    def __init__(self):
2109
        self.past_renames = []
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2110
        self.pending_deletions = []
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2111
2112
    def rename(self, from_, to):
2733.2.9 by Aaron Bentley
Update docstrings
2113
        """Rename a file from one path to another.  Functions like os.rename"""
3063.1.1 by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).
2114
        try:
2115
            os.rename(from_, to)
2116
        except OSError, e:
3063.1.3 by Aaron Bentley
Update for Linux
2117
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
3063.1.1 by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).
2118
                raise errors.FileExists(to, str(e))
2119
            raise
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2120
        self.past_renames.append((from_, to))
2121
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2122
    def pre_delete(self, from_, to):
2733.2.9 by Aaron Bentley
Update docstrings
2123
        """Rename a file out of the way and mark it for deletion.
2124
2125
        Unlike os.unlink, this works equally well for files and directories.
2126
        :param from_: The current file path
2127
        :param to: A temporary path for the file
2128
        """
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2129
        self.rename(from_, to)
2130
        self.pending_deletions.append(to)
2131
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2132
    def rollback(self):
2733.2.9 by Aaron Bentley
Update docstrings
2133
        """Reverse all renames that have been performed"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2134
        for from_, to in reversed(self.past_renames):
2135
            os.rename(to, from_)
2733.2.12 by Aaron Bentley
Updates from review
2136
        # after rollback, don't reuse _FileMover
2137
        past_renames = None
2138
        pending_deletions = None
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2139
2140
    def apply_deletions(self):
2733.2.9 by Aaron Bentley
Update docstrings
2141
        """Apply all marked deletions"""
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2142
        for path in self.pending_deletions:
2143
            delete_any(path)
2733.2.12 by Aaron Bentley
Updates from review
2144
        # after apply_deletions, don't reuse _FileMover
2145
        past_renames = None
2146
        pending_deletions = None