/brz/remove-bazaar

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