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