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