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