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