/brz/remove-bazaar

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