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