/brz/remove-bazaar

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