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