/brz/remove-bazaar

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