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