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