~bzr-pqm/bzr/bzr.dev

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