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