/brz/remove-bazaar

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