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