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