/brz/remove-bazaar

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