/brz/remove-bazaar

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