/brz/remove-bazaar

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