~bzr-pqm/bzr/bzr.dev

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