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