~bzr-pqm/bzr/bzr.dev

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