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