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