~bzr-pqm/bzr/bzr.dev

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