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