/brz/remove-bazaar

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