~bzr-pqm/bzr/bzr.dev

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