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