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