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