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