/brz/remove-bazaar

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