/brz/remove-bazaar

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