~bzr-pqm/bzr/bzr.dev

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