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