~bzr-pqm/bzr/bzr.dev

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