/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
19
from stat import S_ISREG
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
20
import tempfile
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
21
1551.11.12 by Aaron Bentley
Changes from review
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
24
from bzrlib import (
25
    bzrdir,
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
26
    delta,
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
27
    errors,
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
28
    inventory,
29
    revision as _mod_revision,
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
30
    )
1551.11.12 by Aaron Bentley
Changes from review
31
""")
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
32
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
33
                           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)
34
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
35
                           UnableCreateSymlink)
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
36
from bzrlib.inventory import InventoryEntry
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
37
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
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)
38
                            delete_any, has_symlinks)
1551.2.34 by Aaron Bentley
Refactored the revert phases
39
from bzrlib.progress import DummyProgress, ProgressPhase
2687.2.1 by Martin Pool
Rename upcoming release from 0.19 to 0.90
40
from bzrlib.symbol_versioning import (
41
        deprecated_function,
42
        )
1534.7.173 by Aaron Bentley
Added conflict warnings to revert
43
from bzrlib.trace import mutter, warning
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
44
from bzrlib import tree
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
45
import bzrlib.ui
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
46
import bzrlib.urlutils as urlutils
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
47
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
48
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
49
ROOT_PARENT = "root-parent"
50
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
51
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
52
def unique_add(map, key, value):
53
    if key in map:
1534.7.5 by Aaron Bentley
Got unique_add under test
54
        raise DuplicateKey(key=key)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
55
    map[key] = value
56
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
57
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
58
class _TransformResults(object):
2502.1.5 by Aaron Bentley
Cleanup
59
    def __init__(self, modified_paths, rename_count):
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
60
        object.__init__(self)
61
        self.modified_paths = modified_paths
2502.1.5 by Aaron Bentley
Cleanup
62
        self.rename_count = rename_count
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
63
64
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
65
class TreeTransformBase(object):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
66
    """The base class for TreeTransform and TreeTransformBase"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
67
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
68
    def __init__(self, tree, limbodir, pb=DummyProgress(),
69
                 case_sensitive=True):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
70
        """Constructor.
71
72
        :param tree: The tree that will be transformed, but not necessarily
73
            the output tree.
74
        :param limbodir: A directory where new files can be stored until
75
            they are installed in their proper places
76
        :param pb: A ProgressBar indicating how much progress is being made
77
        :param case_sensitive: If True, the target of the transform is
78
            case sensitive, not just case preserving.
79
        """
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
80
        object.__init__(self)
81
        self._tree = tree
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
82
        self._limbodir = limbodir
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
83
        self._deletiondir = None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
84
        self._id_number = 0
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
85
        # mapping of trans_id -> new basename
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
86
        self._new_name = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
87
        # mapping of trans_id -> new parent trans_id
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
88
        self._new_parent = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
89
        # mapping of trans_id with new contents -> new file_kind
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
90
        self._new_contents = {}
2502.1.5 by Aaron Bentley
Cleanup
91
        # A mapping of transform ids to their limbo filename
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
92
        self._limbo_files = {}
2502.1.5 by Aaron Bentley
Cleanup
93
        # A mapping of transform ids to a set of the transform ids of children
2502.1.6 by Aaron Bentley
Update from review comments
94
        # that their limbo directory has
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
95
        self._limbo_children = {}
2502.1.5 by Aaron Bentley
Cleanup
96
        # Map transform ids to maps of child filename to child transform id
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
97
        self._limbo_children_names = {}
2502.1.5 by Aaron Bentley
Cleanup
98
        # List of transform ids that need to be renamed from limbo into place
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
99
        self._needs_rename = set()
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 = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
112
        # Set of file_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 = {}
2502.1.5 by Aaron Bentley
Cleanup
118
        # Cache of realpath results, to speed up canonical_path
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
119
        self._realpaths = {}
2502.1.5 by Aaron Bentley
Cleanup
120
        # Cache of relpath results, to speed up canonical_path
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
121
        self._relpaths = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
122
        # The trans_id that will be used as the tree root
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
123
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
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
1534.7.132 by Aaron Bentley
Got cooked conflicts working
133
    def __get_root(self):
134
        return self._new_root
135
136
    root = property(__get_root)
137
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
138
    def finalize(self):
2502.1.6 by Aaron Bentley
Update from review comments
139
        """Release the working tree lock, if held, clean up limbo dir.
140
141
        This is required if apply has not been invoked, but can be invoked
142
        even after apply.
143
        """
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
144
        if self._tree is None:
145
            return
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
146
        try:
2502.1.7 by Aaron Bentley
Fix finalize deletion ordering
147
            entries = [(self._limbo_name(t), t, k) for t, k in
148
                       self._new_contents.iteritems()]
2502.1.8 by Aaron Bentley
Updates from review comments
149
            entries.sort(reverse=True)
150
            for path, trans_id, kind in entries:
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
151
                if kind == "directory":
152
                    os.rmdir(path)
153
                else:
154
                    os.unlink(path)
155
            try:
156
                os.rmdir(self._limbodir)
157
            except OSError:
158
                # We don't especially care *why* the dir is immortal.
159
                raise ImmortalLimbo(self._limbodir)
2733.2.11 by Aaron Bentley
Detect irregularities with the pending-deletion directory
160
            try:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
161
                if self._deletiondir is not None:
162
                    os.rmdir(self._deletiondir)
2733.2.11 by Aaron Bentley
Detect irregularities with the pending-deletion directory
163
            except OSError:
164
                raise errors.ImmortalPendingDeletion(self._deletiondir)
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
165
        finally:
166
            self._tree.unlock()
167
            self._tree = None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
168
169
    def _assign_id(self):
170
        """Produce a new tranform id"""
171
        new_id = "new-%s" % self._id_number
172
        self._id_number +=1
173
        return new_id
174
175
    def create_path(self, name, parent):
176
        """Assign a transaction id to a new path"""
177
        trans_id = self._assign_id()
178
        unique_add(self._new_name, trans_id, name)
179
        unique_add(self._new_parent, trans_id, parent)
180
        return trans_id
181
1534.7.6 by Aaron Bentley
Added conflict handling
182
    def adjust_path(self, name, parent, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
183
        """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
184
        if trans_id == self._new_root:
185
            raise CantMoveRoot
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
186
        previous_parent = self._new_parent.get(trans_id)
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
187
        previous_name = self._new_name.get(trans_id)
1534.7.6 by Aaron Bentley
Added conflict handling
188
        self._new_name[trans_id] = name
189
        self._new_parent[trans_id] = parent
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
190
        if (trans_id in self._limbo_files and
191
            trans_id not in self._needs_rename):
192
            self._rename_in_limbo([trans_id])
193
            self._limbo_children[previous_parent].remove(trans_id)
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
194
            del self._limbo_children_names[previous_parent][previous_name]
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
195
196
    def _rename_in_limbo(self, trans_ids):
2502.1.6 by Aaron Bentley
Update from review comments
197
        """Fix limbo names so that the right final path is produced.
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
198
199
        This means we outsmarted ourselves-- we tried to avoid renaming
2502.1.6 by Aaron Bentley
Update from review comments
200
        these files later by creating them with their final names in their
201
        final parents.  But now the previous name or parent is no longer
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
202
        suitable, so we have to rename them.
2502.1.14 by Aaron Bentley
Style update suggested by Robert
203
204
        Even for trans_ids that have no new contents, we must remove their
205
        entries from _limbo_files, because they are now stale.
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
206
        """
207
        for trans_id in trans_ids:
2502.1.14 by Aaron Bentley
Style update suggested by Robert
208
            old_path = self._limbo_files.pop(trans_id)
2502.1.13 by Aaron Bentley
Updates from review
209
            if trans_id not in self._new_contents:
210
                continue
2502.1.14 by Aaron Bentley
Style update suggested by Robert
211
            new_path = self._limbo_name(trans_id)
2502.1.13 by Aaron Bentley
Updates from review
212
            os.rename(old_path, new_path)
1534.7.6 by Aaron Bentley
Added conflict handling
213
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
214
    def adjust_root_path(self, name, parent):
215
        """Emulate moving the root by moving all children, instead.
216
        
217
        We do this by undoing the association of root's transaction id with the
218
        current tree.  This allows us to create a new directory with that
1534.7.69 by Aaron Bentley
Got real root moves working
219
        transaction id.  We unversion the root directory and version the 
220
        physically new directory, and hope someone versions the tree root
221
        later.
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
222
        """
223
        old_root = self._new_root
224
        old_root_file_id = self.final_file_id(old_root)
225
        # force moving all children of root
226
        for child_id in self.iter_tree_children(old_root):
227
            if child_id != parent:
228
                self.adjust_path(self.final_name(child_id), 
229
                                 self.final_parent(child_id), child_id)
1534.7.69 by Aaron Bentley
Got real root moves working
230
            file_id = self.final_file_id(child_id)
231
            if file_id is not None:
232
                self.unversion_file(child_id)
233
            self.version_file(file_id, child_id)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
234
        
235
        # the physical root needs a new transaction id
236
        self._tree_path_ids.pop("")
237
        self._tree_id_paths.pop(old_root)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
238
        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
239
        if parent == old_root:
240
            parent = self._new_root
241
        self.adjust_path(name, parent, old_root)
242
        self.create_directory(old_root)
1534.7.69 by Aaron Bentley
Got real root moves working
243
        self.version_file(old_root_file_id, old_root)
244
        self.unversion_file(self._new_root)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
245
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
246
    def trans_id_tree_file_id(self, inventory_id):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
247
        """Determine the transaction id of a working tree file.
248
        
249
        This reflects only files that already exist, not ones that will be
250
        added by transactions.
251
        """
3146.8.1 by Aaron Bentley
Fix two tree.inventory uses in checkout
252
        path = self._tree.id2path(inventory_id)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
253
        return self.trans_id_tree_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
254
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
255
    def trans_id_file_id(self, file_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
256
        """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
257
        A new id is only created for file_ids that were never present.  If
258
        a transaction has been unversioned, it is deliberately still returned.
259
        (this will likely lead to an unversioned parent conflict.)
260
        """
261
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
262
            return self._r_new_id[file_id]
263
        elif file_id in self._tree.inventory:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
264
            return self.trans_id_tree_file_id(file_id)
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
265
        elif file_id in self._non_present_ids:
266
            return self._non_present_ids[file_id]
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
267
        else:
268
            trans_id = self._assign_id()
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
269
            self._non_present_ids[file_id] = trans_id
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
270
            return trans_id
271
1534.7.12 by Aaron Bentley
Added canonical_path function
272
    def canonical_path(self, path):
273
        """Get the canonical tree-relative path"""
274
        # don't follow final symlinks
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
275
        abs = self._tree.abspath(path)
276
        if abs in self._relpaths:
277
            return self._relpaths[abs]
278
        dirname, basename = os.path.split(abs)
279
        if dirname not in self._realpaths:
280
            self._realpaths[dirname] = os.path.realpath(dirname)
281
        dirname = self._realpaths[dirname]
282
        abs = pathjoin(dirname, basename)
283
        if dirname in self._relpaths:
284
            relpath = pathjoin(self._relpaths[dirname], basename)
1534.10.32 by Aaron Bentley
Test and fix case where name has trailing slash
285
            relpath = relpath.rstrip('/\\')
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
286
        else:
287
            relpath = self._tree.relpath(abs)
288
        self._relpaths[abs] = relpath
289
        return relpath
1534.7.12 by Aaron Bentley
Added canonical_path function
290
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
291
    def trans_id_tree_path(self, path):
1534.7.7 by Aaron Bentley
Added support for all-file path ids
292
        """Determine (and maybe set) the transaction ID for a tree path."""
1534.7.12 by Aaron Bentley
Added canonical_path function
293
        path = self.canonical_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
294
        if path not in self._tree_path_ids:
295
            self._tree_path_ids[path] = self._assign_id()
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
296
            self._tree_id_paths[self._tree_path_ids[path]] = path
1534.7.7 by Aaron Bentley
Added support for all-file path ids
297
        return self._tree_path_ids[path]
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
298
1534.7.16 by Aaron Bentley
Added get_tree_parent
299
    def get_tree_parent(self, trans_id):
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
300
        """Determine id of the parent in the tree."""
1534.7.16 by Aaron Bentley
Added get_tree_parent
301
        path = self._tree_id_paths[trans_id]
302
        if path == "":
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
303
            return ROOT_PARENT
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
304
        return self.trans_id_tree_path(os.path.dirname(path))
1534.7.16 by Aaron Bentley
Added get_tree_parent
305
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
306
    def create_file(self, contents, trans_id, mode_id=None):
1534.7.21 by Aaron Bentley
Updated docstrings
307
        """Schedule creation of a new file.
308
309
        See also new_file.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
310
        
311
        Contents is an iterator of strings, all of which will be written
1534.7.21 by Aaron Bentley
Updated docstrings
312
        to the target destination.
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
313
314
        New file takes the permissions of any existing file with that id,
315
        unless mode_id is specified.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
316
        """
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
317
        name = self._limbo_name(trans_id)
318
        f = open(name, 'wb')
1711.7.8 by John Arbash Meinel
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
319
        try:
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
320
            try:
321
                unique_add(self._new_contents, trans_id, 'file')
322
            except:
323
                # Clean up the file, it never got registered so
324
                # TreeTransform.finalize() won't clean it up.
325
                f.close()
326
                os.unlink(name)
327
                raise
328
2247.1.2 by John Arbash Meinel
Switch from for line in foo: f.write(line) to f.writelines(foo)
329
            f.writelines(contents)
1711.7.8 by John Arbash Meinel
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
330
        finally:
331
            f.close()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
332
        self._set_mode(trans_id, mode_id, S_ISREG)
333
334
    def _set_mode(self, trans_id, mode_id, typefunc):
1534.7.157 by Aaron Bentley
Added more docs
335
        """Set the mode of new file contents.
336
        The mode_id is the existing file to get the mode from (often the same
337
        as trans_id).  The operation is only performed if there's a mode match
338
        according to typefunc.
339
        """
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
340
        if mode_id is None:
341
            mode_id = trans_id
342
        try:
343
            old_path = self._tree_id_paths[mode_id]
344
        except KeyError:
345
            return
346
        try:
2027.1.1 by John Arbash Meinel
Fix bug #56549, and write a direct test that the right path is being statted
347
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
348
        except OSError, e:
349
            if e.errno == errno.ENOENT:
350
                return
351
            else:
352
                raise
353
        if typefunc(mode):
354
            os.chmod(self._limbo_name(trans_id), mode)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
355
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
356
    def create_hardlink(self, path, trans_id):
357
        """Schedule creation of a hard link"""
358
        name = self._limbo_name(trans_id)
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
359
        try:
360
            os.link(path, name)
361
        except OSError, e:
362
            if e.errno != errno.EPERM:
363
                raise
364
            raise errors.HardLinkNotSupported(path)
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
365
        try:
366
            unique_add(self._new_contents, trans_id, 'file')
367
        except:
368
            # Clean up the file, it never got registered so
369
            # TreeTransform.finalize() won't clean it up.
370
            os.unlink(name)
371
            raise
372
1534.7.20 by Aaron Bentley
Added directory handling
373
    def create_directory(self, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
374
        """Schedule creation of a new directory.
375
        
376
        See also new_directory.
377
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
378
        os.mkdir(self._limbo_name(trans_id))
379
        unique_add(self._new_contents, trans_id, 'directory')
1534.7.20 by Aaron Bentley
Added directory handling
380
1534.7.22 by Aaron Bentley
Added symlink support
381
    def create_symlink(self, target, trans_id):
382
        """Schedule creation of a new symbolic link.
383
384
        target is a bytestring.
385
        See also new_symlink.
386
        """
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)
387
        if has_symlinks():
388
            os.symlink(target, self._limbo_name(trans_id))
389
            unique_add(self._new_contents, trans_id, 'symlink')
390
        else:
3006.2.2 by Alexander Belchenko
tests added.
391
            try:
392
                path = FinalPaths(self).get_path(trans_id)
393
            except KeyError:
394
                path = None
395
            raise UnableCreateSymlink(path=path)
1534.7.22 by Aaron Bentley
Added symlink support
396
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
397
    def cancel_creation(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
398
        """Cancel the creation of new file contents."""
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
399
        del self._new_contents[trans_id]
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
400
        children = self._limbo_children.get(trans_id)
401
        # if this is a limbo directory with children, move them before removing
402
        # the directory
403
        if children is not None:
404
            self._rename_in_limbo(children)
405
            del self._limbo_children[trans_id]
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
406
            del self._limbo_children_names[trans_id]
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
407
        delete_any(self._limbo_name(trans_id))
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
408
1534.7.34 by Aaron Bentley
Proper conflicts for removals
409
    def delete_contents(self, trans_id):
410
        """Schedule the contents of a path entry for deletion"""
1534.7.130 by Aaron Bentley
More conflict handling, test porting
411
        self.tree_kind(trans_id)
1534.7.34 by Aaron Bentley
Proper conflicts for removals
412
        self._removed_contents.add(trans_id)
413
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
414
    def cancel_deletion(self, trans_id):
415
        """Cancel a scheduled deletion"""
416
        self._removed_contents.remove(trans_id)
417
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
418
    def unversion_file(self, trans_id):
419
        """Schedule a path entry to become unversioned"""
420
        self._removed_id.add(trans_id)
421
422
    def delete_versioned(self, trans_id):
423
        """Delete and unversion a versioned file"""
424
        self.delete_contents(trans_id)
425
        self.unversion_file(trans_id)
426
1534.7.25 by Aaron Bentley
Added set_executability
427
    def set_executability(self, executability, trans_id):
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
428
        """Schedule setting of the 'execute' bit
429
        To unschedule, set to None
430
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
431
        if executability is None:
432
            del self._new_executability[trans_id]
433
        else:
434
            unique_add(self._new_executability, trans_id, executability)
1534.7.25 by Aaron Bentley
Added set_executability
435
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
436
    def set_tree_reference(self, revision_id, trans_id):
437
        """Set the reference associated with a directory"""
438
        unique_add(self._new_reference_revision, trans_id, revision_id)
439
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
440
    def version_file(self, file_id, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
441
        """Schedule a file to become versioned."""
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
442
        assert file_id is not None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
443
        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
444
        unique_add(self._r_new_id, file_id, trans_id)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
445
1534.7.105 by Aaron Bentley
Got merge with rename working
446
    def cancel_versioning(self, trans_id):
447
        """Undo a previous versioning of a file"""
448
        file_id = self._new_id[trans_id]
449
        del self._new_id[trans_id]
450
        del self._r_new_id[file_id]
451
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
452
    def new_paths(self):
1534.7.21 by Aaron Bentley
Updated docstrings
453
        """Determine the paths of all new and changed files"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
454
        new_ids = set()
1534.7.132 by Aaron Bentley
Got cooked conflicts working
455
        fp = FinalPaths(self)
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
456
        for id_set in (self._new_name, self._new_parent, self._new_contents,
1534.7.25 by Aaron Bentley
Added set_executability
457
                       self._new_id, self._new_executability):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
458
            new_ids.update(id_set)
459
        new_paths = [(fp.get_path(t), t) for t in new_ids]
460
        new_paths.sort()
461
        return new_paths
1534.7.6 by Aaron Bentley
Added conflict handling
462
1534.7.34 by Aaron Bentley
Proper conflicts for removals
463
    def tree_kind(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
464
        """Determine the file kind in the working tree.
465
466
        Raises NoSuchFile if the file does not exist
467
        """
1534.7.34 by Aaron Bentley
Proper conflicts for removals
468
        path = self._tree_id_paths.get(trans_id)
469
        if path is None:
470
            raise NoSuchFile(None)
471
        try:
472
            return file_kind(self._tree.abspath(path))
473
        except OSError, e:
474
            if e.errno != errno.ENOENT:
475
                raise
476
            else:
477
                raise NoSuchFile(path)
478
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
479
    def final_kind(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
480
        """Determine the final file kind, after any changes applied.
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
481
        
482
        Raises NoSuchFile if the file does not exist/has no contents.
483
        (It is conceivable that a path would be created without the
484
        corresponding contents insertion command)
485
        """
486
        if trans_id in self._new_contents:
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
487
            return self._new_contents[trans_id]
1534.7.34 by Aaron Bentley
Proper conflicts for removals
488
        elif trans_id in self._removed_contents:
489
            raise NoSuchFile(None)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
490
        else:
1534.7.34 by Aaron Bentley
Proper conflicts for removals
491
            return self.tree_kind(trans_id)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
492
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
493
    def tree_file_id(self, trans_id):
1534.7.41 by Aaron Bentley
Got inventory ID movement working
494
        """Determine the file id associated with the trans_id in the tree"""
495
        try:
496
            path = self._tree_id_paths[trans_id]
497
        except KeyError:
498
            # the file is a new, unversioned file, or invalid trans_id
499
            return None
500
        # the file is old; the old id is still valid
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
501
        if self._new_root == trans_id:
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
502
            return self._tree.get_root_id()
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
503
        return self._tree.inventory.path2id(path)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
504
1534.7.13 by Aaron Bentley
Implemented final_file_id
505
    def final_file_id(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
506
        """Determine the file id after any changes are applied, or None.
1534.7.21 by Aaron Bentley
Updated docstrings
507
        
508
        None indicates that the file will not be versioned after changes are
509
        applied.
510
        """
1534.7.13 by Aaron Bentley
Implemented final_file_id
511
        try:
512
            # there is a new id for this file
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
513
            assert self._new_id[trans_id] is not None
1534.7.13 by Aaron Bentley
Implemented final_file_id
514
            return self._new_id[trans_id]
515
        except KeyError:
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
516
            if trans_id in self._removed_id:
517
                return None
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
518
        return self.tree_file_id(trans_id)
1534.7.13 by Aaron Bentley
Implemented final_file_id
519
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
520
    def inactive_file_id(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
521
        """Return the inactive file_id associated with a transaction id.
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
522
        That is, the one in the tree or in non_present_ids.
523
        The file_id may actually be active, too.
524
        """
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
525
        file_id = self.tree_file_id(trans_id)
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
526
        if file_id is not None:
527
            return file_id
528
        for key, value in self._non_present_ids.iteritems():
529
            if value == trans_id:
530
                return key
531
1534.7.17 by Aaron Bentley
Added final_parent function
532
    def final_parent(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
533
        """Determine the parent file_id, after any changes are applied.
1534.7.21 by Aaron Bentley
Updated docstrings
534
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
535
        ROOT_PARENT is returned for the tree root.
1534.7.21 by Aaron Bentley
Updated docstrings
536
        """
1534.7.17 by Aaron Bentley
Added final_parent function
537
        try:
538
            return self._new_parent[trans_id]
539
        except KeyError:
540
            return self.get_tree_parent(trans_id)
541
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
542
    def final_name(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
543
        """Determine the final filename, after all changes are applied."""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
544
        try:
545
            return self._new_name[trans_id]
546
        except KeyError:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
547
            try:
548
                return os.path.basename(self._tree_id_paths[trans_id])
549
            except KeyError:
550
                raise NoFinalPath(trans_id, self)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
551
1534.10.28 by Aaron Bentley
Use numbered backup files
552
    def by_parent(self):
1534.7.40 by Aaron Bentley
Updated docs
553
        """Return a map of parent: children for known parents.
554
        
555
        Only new paths and parents of tree files with assigned ids are used.
556
        """
1534.7.6 by Aaron Bentley
Added conflict handling
557
        by_parent = {}
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
558
        items = list(self._new_parent.iteritems())
1534.7.76 by Aaron Bentley
Fixed final_parent, for the case where finding a parent adds tree id paths.
559
        items.extend((t, self.final_parent(t)) for t in 
560
                      self._tree_id_paths.keys())
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
561
        for trans_id, parent_id in items:
1534.7.6 by Aaron Bentley
Added conflict handling
562
            if parent_id not in by_parent:
563
                by_parent[parent_id] = set()
564
            by_parent[parent_id].add(trans_id)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
565
        return by_parent
1534.7.11 by Aaron Bentley
Refactored conflict handling
566
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
567
    def path_changed(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
568
        """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)
569
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
570
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
571
    def new_contents(self, trans_id):
572
        return (trans_id in self._new_contents)
573
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
574
    def find_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
575
        """Find any violations of inventory or filesystem invariants"""
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
576
        if self._done is True:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
577
            raise ReusingTransform()
578
        conflicts = []
579
        # ensure all children of all existent parents are known
580
        # all children of non-existent parents are known, by definition.
581
        self._add_tree_children()
1534.10.28 by Aaron Bentley
Use numbered backup files
582
        by_parent = self.by_parent()
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
583
        conflicts.extend(self._unversioned_parents(by_parent))
1534.7.19 by Aaron Bentley
Added tests for parent loops
584
        conflicts.extend(self._parent_loops())
1534.7.11 by Aaron Bentley
Refactored conflict handling
585
        conflicts.extend(self._duplicate_entries(by_parent))
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
586
        conflicts.extend(self._duplicate_ids())
1534.7.11 by Aaron Bentley
Refactored conflict handling
587
        conflicts.extend(self._parent_type_conflicts(by_parent))
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
588
        conflicts.extend(self._improper_versioning())
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
589
        conflicts.extend(self._executability_conflicts())
1534.7.152 by Aaron Bentley
Fixed overwrites
590
        conflicts.extend(self._overwrite_conflicts())
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
591
        return conflicts
592
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
593
    def _add_tree_children(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
594
        """Add all the children of all active parents to the known paths.
1534.7.40 by Aaron Bentley
Updated docs
595
596
        Active parents are those which gain children, and those which are
597
        removed.  This is a necessary first step in detecting conflicts.
598
        """
1534.10.28 by Aaron Bentley
Use numbered backup files
599
        parents = self.by_parent().keys()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
600
        parents.extend([t for t in self._removed_contents if 
601
                        self.tree_kind(t) == 'directory'])
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
602
        for trans_id in self._removed_id:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
603
            file_id = self.tree_file_id(trans_id)
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
604
            if file_id is not None:
605
                if self._tree.inventory[file_id].kind == 'directory':
606
                    parents.append(trans_id)
607
            elif self.tree_kind(trans_id) == 'directory':
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
608
                parents.append(trans_id)
609
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
610
        for parent_id in parents:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
611
            # ensure that all children are registered with the transaction
612
            list(self.iter_tree_children(parent_id))
613
614
    def iter_tree_children(self, parent_id):
615
        """Iterate through the entry's tree children, if any"""
616
        try:
617
            path = self._tree_id_paths[parent_id]
618
        except KeyError:
619
            return
620
        try:
621
            children = os.listdir(self._tree.abspath(path))
622
        except OSError, e:
3144.4.1 by Aaron Bentley
Handle trying to list parents of a non-directory
623
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
624
                raise
625
            return
626
            
627
        for child in children:
628
            childpath = joinpath(path, child)
1534.7.180 by Aaron Bentley
Merge from mainline
629
            if self._tree.is_control_filename(childpath):
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
630
                continue
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
631
            yield self.trans_id_tree_path(childpath)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
632
1534.10.28 by Aaron Bentley
Use numbered backup files
633
    def has_named_child(self, by_parent, parent_id, name):
634
        try:
635
            children = by_parent[parent_id]
636
        except KeyError:
637
            children = []
638
        for child in children:
639
            if self.final_name(child) == name:
640
                return True
641
        try:
642
            path = self._tree_id_paths[parent_id]
643
        except KeyError:
644
            return False
645
        childpath = joinpath(path, name)
646
        child_id = self._tree_path_ids.get(childpath)
647
        if child_id is None:
648
            return lexists(self._tree.abspath(childpath))
649
        else:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
650
            if self.final_parent(child_id) != parent_id:
1534.10.28 by Aaron Bentley
Use numbered backup files
651
                return False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
652
            if child_id in self._removed_contents:
1534.10.28 by Aaron Bentley
Use numbered backup files
653
                # XXX What about dangling file-ids?
654
                return False
655
            else:
656
                return True
657
1534.7.19 by Aaron Bentley
Added tests for parent loops
658
    def _parent_loops(self):
659
        """No entry should be its own ancestor"""
660
        conflicts = []
661
        for trans_id in self._new_parent:
662
            seen = set()
663
            parent_id = trans_id
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
664
            while parent_id is not ROOT_PARENT:
1534.7.19 by Aaron Bentley
Added tests for parent loops
665
                seen.add(parent_id)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
666
                try:
667
                    parent_id = self.final_parent(parent_id)
668
                except KeyError:
669
                    break
1534.7.19 by Aaron Bentley
Added tests for parent loops
670
                if parent_id == trans_id:
671
                    conflicts.append(('parent loop', trans_id))
672
                if parent_id in seen:
673
                    break
674
        return conflicts
675
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
676
    def _unversioned_parents(self, by_parent):
677
        """If parent directories are versioned, children must be versioned."""
678
        conflicts = []
679
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
680
            if parent_id is ROOT_PARENT:
681
                continue
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
682
            if self.final_file_id(parent_id) is not None:
683
                continue
684
            for child_id in children:
685
                if self.final_file_id(child_id) is not None:
686
                    conflicts.append(('unversioned parent', parent_id))
687
                    break;
688
        return conflicts
689
690
    def _improper_versioning(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
691
        """Cannot version a file with no contents, or a bad type.
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
692
        
693
        However, existing entries with no contents are okay.
694
        """
695
        conflicts = []
696
        for trans_id in self._new_id.iterkeys():
697
            try:
698
                kind = self.final_kind(trans_id)
699
            except NoSuchFile:
700
                conflicts.append(('versioning no contents', trans_id))
701
                continue
702
            if not InventoryEntry.versionable_kind(kind):
1534.7.20 by Aaron Bentley
Added directory handling
703
                conflicts.append(('versioning bad kind', trans_id, kind))
1534.7.11 by Aaron Bentley
Refactored conflict handling
704
        return conflicts
705
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
706
    def _executability_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
707
        """Check for bad executability changes.
708
        
709
        Only versioned files may have their executability set, because
710
        1. only versioned entries can have executability under windows
711
        2. only files can be executable.  (The execute bit on a directory
712
           does not indicate searchability)
713
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
714
        conflicts = []
715
        for trans_id in self._new_executability:
716
            if self.final_file_id(trans_id) is None:
717
                conflicts.append(('unversioned executability', trans_id))
1534.7.34 by Aaron Bentley
Proper conflicts for removals
718
            else:
719
                try:
720
                    non_file = self.final_kind(trans_id) != "file"
721
                except NoSuchFile:
722
                    non_file = True
723
                if non_file is True:
724
                    conflicts.append(('non-file executability', trans_id))
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
725
        return conflicts
726
1534.7.152 by Aaron Bentley
Fixed overwrites
727
    def _overwrite_conflicts(self):
728
        """Check for overwrites (not permitted on Win32)"""
729
        conflicts = []
730
        for trans_id in self._new_contents:
731
            try:
732
                self.tree_kind(trans_id)
733
            except NoSuchFile:
734
                continue
735
            if trans_id not in self._removed_contents:
736
                conflicts.append(('overwrite', trans_id,
737
                                 self.final_name(trans_id)))
738
        return conflicts
739
1534.7.11 by Aaron Bentley
Refactored conflict handling
740
    def _duplicate_entries(self, by_parent):
741
        """No directory may have two entries with the same name."""
742
        conflicts = []
2590.2.16 by Aaron Bentley
Shortcut duplicate_entries conflict check if no new names introduced
743
        if (self._new_name, self._new_parent) == ({}, {}):
744
            return conflicts
1534.7.6 by Aaron Bentley
Added conflict handling
745
        for children in by_parent.itervalues():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
746
            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
747
            if not self._case_sensitive_target:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
748
                name_ids = [(n.lower(), t) for n, t in name_ids]
1534.7.6 by Aaron Bentley
Added conflict handling
749
            name_ids.sort()
750
            last_name = None
751
            last_trans_id = None
752
            for name, trans_id in name_ids:
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
753
                try:
754
                    kind = self.final_kind(trans_id)
755
                except NoSuchFile:
756
                    kind = None
757
                file_id = self.final_file_id(trans_id)
758
                if kind is None and file_id is None:
759
                    continue
1534.7.6 by Aaron Bentley
Added conflict handling
760
                if name == last_name:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
761
                    conflicts.append(('duplicate', last_trans_id, trans_id,
762
                    name))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
763
                last_name = name
764
                last_trans_id = trans_id
1534.7.11 by Aaron Bentley
Refactored conflict handling
765
        return conflicts
766
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
767
    def _duplicate_ids(self):
768
        """Each inventory id may only be used once"""
769
        conflicts = []
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
770
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
771
                                self._removed_id))
3146.8.16 by Aaron Bentley
Updates from review
772
        all_ids = self._tree.all_file_ids()
773
        active_tree_ids = all_ids.difference(removed_tree_ids)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
774
        for trans_id, file_id in self._new_id.iteritems():
775
            if file_id in active_tree_ids:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
776
                old_trans_id = self.trans_id_tree_file_id(file_id)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
777
                conflicts.append(('duplicate id', old_trans_id, trans_id))
778
        return conflicts
779
1534.7.11 by Aaron Bentley
Refactored conflict handling
780
    def _parent_type_conflicts(self, by_parent):
781
        """parents must have directory 'contents'."""
782
        conflicts = []
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
783
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
784
            if parent_id is ROOT_PARENT:
785
                continue
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
786
            if not self._any_contents(children):
787
                continue
788
            for child in children:
789
                try:
790
                    self.final_kind(child)
791
                except NoSuchFile:
792
                    continue
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
793
            try:
794
                kind = self.final_kind(parent_id)
795
            except NoSuchFile:
796
                kind = None
797
            if kind is None:
798
                conflicts.append(('missing parent', parent_id))
799
            elif kind != "directory":
800
                conflicts.append(('non-directory parent', parent_id))
1534.7.6 by Aaron Bentley
Added conflict handling
801
        return conflicts
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
802
803
    def _any_contents(self, trans_ids):
804
        """Return true if any of the trans_ids, will have contents."""
805
        for trans_id in trans_ids:
806
            try:
807
                kind = self.final_kind(trans_id)
808
            except NoSuchFile:
809
                continue
810
            return True
811
        return False
1534.7.35 by Aaron Bentley
Got file renaming working
812
2502.1.14 by Aaron Bentley
Style update suggested by Robert
813
    def _limbo_name(self, trans_id):
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
814
        """Generate the limbo name of a file"""
2502.1.14 by Aaron Bentley
Style update suggested by Robert
815
        limbo_name = self._limbo_files.get(trans_id)
816
        if limbo_name is not None:
817
            return limbo_name
2502.1.3 by Aaron Bentley
Don't cause errors when creating contents for trans_ids with no parent/name
818
        parent = self._new_parent.get(trans_id)
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
819
        # if the parent directory is already in limbo (e.g. when building a
820
        # tree), choose a limbo name inside the parent, to reduce further
821
        # renames.
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
822
        use_direct_path = False
823
        if self._new_contents.get(parent) == 'directory':
824
            filename = self._new_name.get(trans_id)
825
            if filename is not None:
826
                if parent not in self._limbo_children:
827
                    self._limbo_children[parent] = set()
828
                    self._limbo_children_names[parent] = {}
829
                    use_direct_path = True
2502.1.6 by Aaron Bentley
Update from review comments
830
                # the direct path can only be used if no other file has
831
                # already taken this pathname, i.e. if the name is unused, or
832
                # if it is already associated with this trans_id.
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
833
                elif self._case_sensitive_target:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
834
                    if (self._limbo_children_names[parent].get(filename)
835
                        in (trans_id, None)):
836
                        use_direct_path = True
837
                else:
838
                    for l_filename, l_trans_id in\
839
                        self._limbo_children_names[parent].iteritems():
840
                        if l_trans_id == trans_id:
841
                            continue
842
                        if l_filename.lower() == filename.lower():
843
                            break
844
                    else:
845
                        use_direct_path = True
846
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
847
        if use_direct_path:
848
            limbo_name = pathjoin(self._limbo_files[parent], filename)
2502.1.2 by Aaron Bentley
Make the limited-renames functionality safer in the general case
849
            self._limbo_children[parent].add(trans_id)
2502.1.4 by Aaron Bentley
Ensure we only reuse limbo names appropriately
850
            self._limbo_children_names[parent][filename] = trans_id
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
851
        else:
852
            limbo_name = pathjoin(self._limbodir, trans_id)
853
            self._needs_rename.add(trans_id)
854
        self._limbo_files[trans_id] = limbo_name
855
        return limbo_name
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
856
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
857
    def _set_executability(self, path, entry, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
858
        """Set the executability of versioned files """
1534.7.25 by Aaron Bentley
Added set_executability
859
        new_executability = self._new_executability[trans_id]
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
860
        entry.executable = new_executability
1534.7.25 by Aaron Bentley
Added set_executability
861
        if supports_executable():
862
            abspath = self._tree.abspath(path)
863
            current_mode = os.stat(abspath).st_mode
864
            if new_executability:
865
                umask = os.umask(0)
866
                os.umask(umask)
867
                to_mode = current_mode | (0100 & ~umask)
868
                # Enable x-bit for others only if they can read it.
869
                if current_mode & 0004:
870
                    to_mode |= 0001 & ~umask
871
                if current_mode & 0040:
872
                    to_mode |= 0010 & ~umask
873
            else:
874
                to_mode = current_mode & ~0111
875
            os.chmod(abspath, to_mode)
876
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
877
    def _new_entry(self, name, parent_id, file_id):
1534.7.21 by Aaron Bentley
Updated docstrings
878
        """Helper function to create a new filesystem entry."""
1534.7.2 by Aaron Bentley
Added convenience function
879
        trans_id = self.create_path(name, parent_id)
880
        if file_id is not None:
881
            self.version_file(file_id, trans_id)
882
        return trans_id
883
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
884
    def new_file(self, name, parent_id, contents, file_id=None, 
885
                 executable=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
886
        """Convenience method to create files.
1534.7.21 by Aaron Bentley
Updated docstrings
887
        
888
        name is the name of the file to create.
889
        parent_id is the transaction id of the parent directory of the file.
890
        contents is an iterator of bytestrings, which will be used to produce
891
        the file.
1740.2.4 by Aaron Bentley
Update transform tests and docs
892
        :param file_id: The inventory ID of the file, if it is to be versioned.
893
        :param executable: Only valid when a file_id has been supplied.
1534.7.21 by Aaron Bentley
Updated docstrings
894
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
895
        trans_id = self._new_entry(name, parent_id, file_id)
1740.2.4 by Aaron Bentley
Update transform tests and docs
896
        # TODO: rather than scheduling a set_executable call,
897
        # have create_file create the file with the right mode.
1534.7.20 by Aaron Bentley
Added directory handling
898
        self.create_file(contents, trans_id)
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
899
        if executable is not None:
900
            self.set_executability(executable, trans_id)
1534.7.20 by Aaron Bentley
Added directory handling
901
        return trans_id
902
903
    def new_directory(self, name, parent_id, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
904
        """Convenience method to create directories.
1534.7.21 by Aaron Bentley
Updated docstrings
905
906
        name is the name of the directory to create.
907
        parent_id is the transaction id of the parent directory of the
908
        directory.
909
        file_id is the inventory ID of the directory, if it is to be versioned.
910
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
911
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.20 by Aaron Bentley
Added directory handling
912
        self.create_directory(trans_id)
913
        return trans_id 
914
1534.7.22 by Aaron Bentley
Added symlink support
915
    def new_symlink(self, name, parent_id, target, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
916
        """Convenience method to create symbolic link.
1534.7.22 by Aaron Bentley
Added symlink support
917
        
918
        name is the name of the symlink to create.
919
        parent_id is the transaction id of the parent directory of the symlink.
920
        target is a bytestring of the target of the symlink.
921
        file_id is the inventory ID of the file, if it is to be versioned.
922
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
923
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.22 by Aaron Bentley
Added symlink support
924
        self.create_symlink(target, trans_id)
925
        return trans_id
926
1551.11.12 by Aaron Bentley
Changes from review
927
    def _affected_ids(self):
928
        """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
929
        trans_ids = set(self._removed_id)
930
        trans_ids.update(self._new_id.keys())
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
931
        trans_ids.update(self._removed_contents)
932
        trans_ids.update(self._new_contents.keys())
933
        trans_ids.update(self._new_executability.keys())
934
        trans_ids.update(self._new_name.keys())
935
        trans_ids.update(self._new_parent.keys())
1551.11.12 by Aaron Bentley
Changes from review
936
        return trans_ids
937
938
    def _get_file_id_maps(self):
939
        """Return mapping of file_ids to trans_ids in the to and from states"""
940
        trans_ids = self._affected_ids()
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
941
        from_trans_ids = {}
942
        to_trans_ids = {}
943
        # Build up two dicts: trans_ids associated with file ids in the
944
        # FROM state, vs the TO state.
945
        for trans_id in trans_ids:
946
            from_file_id = self.tree_file_id(trans_id)
947
            if from_file_id is not None:
948
                from_trans_ids[from_file_id] = trans_id
949
            to_file_id = self.final_file_id(trans_id)
950
            if to_file_id is not None:
951
                to_trans_ids[to_file_id] = trans_id
1551.11.12 by Aaron Bentley
Changes from review
952
        return from_trans_ids, to_trans_ids
953
954
    def _from_file_data(self, from_trans_id, from_versioned, file_id):
955
        """Get data about a file in the from (tree) state
956
957
        Return a (name, parent, kind, executable) tuple
958
        """
959
        from_path = self._tree_id_paths.get(from_trans_id)
960
        if from_versioned:
961
            # get data from working tree if versioned
962
            from_entry = self._tree.inventory[file_id]
963
            from_name = from_entry.name
964
            from_parent = from_entry.parent_id
965
        else:
966
            from_entry = None
967
            if from_path is None:
968
                # File does not exist in FROM state
969
                from_name = None
970
                from_parent = None
971
            else:
972
                # File exists, but is not versioned.  Have to use path-
973
                # splitting stuff
974
                from_name = os.path.basename(from_path)
975
                tree_parent = self.get_tree_parent(from_trans_id)
976
                from_parent = self.tree_file_id(tree_parent)
977
        if from_path is not None:
978
            from_kind, from_executable, from_stats = \
979
                self._tree._comparison_data(from_entry, from_path)
980
        else:
981
            from_kind = None
982
            from_executable = False
983
        return from_name, from_parent, from_kind, from_executable
984
985
    def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
986
        """Get data about a file in the to (target) state
987
988
        Return a (name, parent, kind, executable) tuple
989
        """
990
        to_name = self.final_name(to_trans_id)
991
        try:
992
            to_kind = self.final_kind(to_trans_id)
993
        except NoSuchFile:
994
            to_kind = None
995
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
996
        if to_trans_id in self._new_executability:
997
            to_executable = self._new_executability[to_trans_id]
998
        elif to_trans_id == from_trans_id:
999
            to_executable = from_executable
1000
        else:
1001
            to_executable = False
1002
        return to_name, to_parent, to_kind, to_executable
1003
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1004
    def iter_changes(self):
1005
        """Produce output in the same format as Tree.iter_changes.
1551.11.12 by Aaron Bentley
Changes from review
1006
1007
        Will produce nonsensical results if invoked while inventory/filesystem
1008
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
1009
1010
        This reads the Transform, but only reproduces changes involving a
1011
        file_id.  Files that are not versioned in either of the FROM or TO
1012
        states are not reflected.
1013
        """
1014
        final_paths = FinalPaths(self)
1015
        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
1016
        results = []
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1017
        # Now iterate through all active file_ids
1018
        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
1019
            modified = False
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1020
            from_trans_id = from_trans_ids.get(file_id)
1021
            # find file ids, and determine versioning state
1022
            if from_trans_id is None:
1023
                from_versioned = False
1024
                from_trans_id = to_trans_ids[file_id]
1025
            else:
1026
                from_versioned = True
1027
            to_trans_id = to_trans_ids.get(file_id)
1028
            if to_trans_id is None:
1029
                to_versioned = False
1030
                to_trans_id = from_trans_id
1031
            else:
1032
                to_versioned = True
1551.11.12 by Aaron Bentley
Changes from review
1033
1034
            from_name, from_parent, from_kind, from_executable = \
1035
                self._from_file_data(from_trans_id, from_versioned, file_id)
1036
1037
            to_name, to_parent, to_kind, to_executable = \
1038
                self._to_file_data(to_trans_id, from_trans_id, from_executable)
1039
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1040
            if not from_versioned:
1041
                from_path = None
1042
            else:
1043
                from_path = self._tree_id_paths.get(from_trans_id)
1044
            if not to_versioned:
1045
                to_path = None
1046
            else:
1047
                to_path = final_paths.get_path(to_trans_id)
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1048
            if from_kind != to_kind:
1049
                modified = True
1551.10.37 by Aaron Bentley
recommit of TreeTransform._iter_changes fix with missing files
1050
            elif to_kind in ('file', 'symlink') and (
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1051
                to_trans_id != from_trans_id or
1052
                to_trans_id in self._new_contents):
1053
                modified = True
1054
            if (not modified and from_versioned == to_versioned and
1055
                from_parent==to_parent and from_name == to_name and
1056
                from_executable == to_executable):
1057
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1058
            results.append((file_id, (from_path, to_path), modified,
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1059
                   (from_versioned, to_versioned),
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1060
                   (from_parent, to_parent),
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1061
                   (from_name, to_name),
1062
                   (from_kind, to_kind),
1551.11.4 by Aaron Bentley
Sort output of Transform.iter_changes by path
1063
                   (from_executable, to_executable)))
1064
        return iter(sorted(results, key=lambda x:x[1]))
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1065
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1066
    def get_preview_tree(self):
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1067
        """Return a tree representing the result of the transform.
1068
1069
        This tree only supports the subset of Tree functionality required
1070
        by show_diff_trees.  It must only be compared to tt._tree.
1071
        """
1072
        return _PreviewTree(self)
1073
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1074
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1075
class TreeTransform(TreeTransformBase):
1076
    """Represent a tree transformation.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1077
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1078
    This object is designed to support incremental generation of the transform,
1079
    in any order.
1080
1081
    However, it gives optimum performance when parent directories are created
1082
    before their contents.  The transform is then able to put child files
1083
    directly in their parent directory, avoiding later renames.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1084
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1085
    It is easy to produce malformed transforms, but they are generally
1086
    harmless.  Attempting to apply a malformed transform will cause an
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1087
    exception to be raised before any modifications are made to the tree.
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1088
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1089
    Many kinds of malformed transforms can be corrected with the
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1090
    resolve_conflicts function.  The remaining ones indicate programming error,
1091
    such as trying to create a file with no path.
1092
1093
    Two sets of file creation methods are supplied.  Convenience methods are:
1094
     * new_file
1095
     * new_directory
1096
     * new_symlink
1097
1098
    These are composed of the low-level methods:
1099
     * create_path
1100
     * create_file or create_directory or create_symlink
1101
     * version_file
1102
     * set_executability
3008.1.13 by Michael Hudson
merge bzr.dev
1103
1104
    Transform/Transaction ids
1105
    -------------------------
1106
    trans_ids are temporary ids assigned to all files involved in a transform.
1107
    It's possible, even common, that not all files in the Tree have trans_ids.
1108
1109
    trans_ids are used because filenames and file_ids are not good enough
1110
    identifiers; filenames change, and not all files have file_ids.  File-ids
1111
    are also associated with trans-ids, so that moving a file moves its
1112
    file-id.
1113
1114
    trans_ids are only valid for the TreeTransform that generated them.
1115
1116
    Limbo
1117
    -----
1118
    Limbo is a temporary directory use to hold new versions of files.
1119
    Files are added to limbo by create_file, create_directory, create_symlink,
1120
    and their convenience variants (new_*).  Files may be removed from limbo
1121
    using cancel_creation.  Files are renamed from limbo into their final
1122
    location as part of TreeTransform.apply
1123
1124
    Limbo must be cleaned up, by either calling TreeTransform.apply or
1125
    calling TreeTransform.finalize.
1126
1127
    Files are placed into limbo inside their parent directories, where
1128
    possible.  This reduces subsequent renames, and makes operations involving
1129
    lots of files faster.  This optimization is only possible if the parent
1130
    directory is created *before* creating any of its children, so avoid
1131
    creating children before parents, where possible.
1132
1133
    Pending-deletion
1134
    ----------------
1135
    This temporary directory is used by _FileMover for storing files that are
1136
    about to be deleted.  In case of rollback, the files will be restored.
1137
    FileMover does not delete files until it is sure that a rollback will not
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1138
    happen.
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1139
    """
1140
    def __init__(self, tree, pb=DummyProgress()):
1141
        """Note: a tree_write lock is taken on the tree.
1142
1143
        Use TreeTransform.finalize() to release the lock (can be omitted if
1144
        TreeTransform.apply() called).
1145
        """
1146
        tree.lock_tree_write()
3008.1.13 by Michael Hudson
merge bzr.dev
1147
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1148
        try:
1149
            control_files = tree._control_files
1150
            limbodir = urlutils.local_path_from_url(
1151
                control_files.controlfilename('limbo'))
1152
            try:
1153
                os.mkdir(limbodir)
1154
            except OSError, e:
1155
                if e.errno == errno.EEXIST:
1156
                    raise ExistingLimbo(limbodir)
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1157
            deletiondir = urlutils.local_path_from_url(
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1158
                control_files.controlfilename('pending-deletion'))
1159
            try:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1160
                os.mkdir(deletiondir)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1161
            except OSError, e:
1162
                if e.errno == errno.EEXIST:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1163
                    raise errors.ExistingPendingDeletion(deletiondir)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1164
        except:
1165
            tree.unlock()
1166
            raise
3008.1.13 by Michael Hudson
merge bzr.dev
1167
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1168
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1169
                                   tree.case_sensitive)
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1170
        self._deletiondir = deletiondir
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1171
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1172
    def apply(self, no_conflicts=False, _mover=None):
1173
        """Apply all changes to the inventory and filesystem.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1174
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1175
        If filesystem or inventory conflicts are present, MalformedTransform
1176
        will be thrown.
1177
1178
        If apply succeeds, finalize is not necessary.
1179
1180
        :param no_conflicts: if True, the caller guarantees there are no
1181
            conflicts, so no check is made.
1182
        :param _mover: Supply an alternate FileMover, for testing
1183
        """
1184
        if not no_conflicts:
1185
            conflicts = self.find_conflicts()
1186
            if len(conflicts) != 0:
1187
                raise MalformedTransform(conflicts=conflicts)
1188
        inventory_delta = []
1189
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1190
        try:
1191
            if _mover is None:
1192
                mover = _FileMover()
1193
            else:
1194
                mover = _mover
1195
            try:
1196
                child_pb.update('Apply phase', 0, 2)
3146.8.18 by Aaron Bentley
Merge with dev
1197
                self._apply_removals(inventory_delta, mover)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1198
                child_pb.update('Apply phase', 1, 2)
3146.8.18 by Aaron Bentley
Merge with dev
1199
                modified_paths = self._apply_insertions(inventory_delta, mover)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1200
            except:
1201
                mover.rollback()
1202
                raise
1203
            else:
1204
                mover.apply_deletions()
1205
        finally:
1206
            child_pb.finished()
1207
        self._tree.apply_inventory_delta(inventory_delta)
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1208
        self._done = True
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1209
        self.finalize()
1210
        return _TransformResults(modified_paths, self.rename_count)
1211
3146.8.18 by Aaron Bentley
Merge with dev
1212
    def _apply_removals(self, inventory_delta, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1213
        """Perform tree operations that remove directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1214
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1215
        That is, delete files that are to be deleted, and put any files that
1216
        need renaming into limbo.  This must be done in strict child-to-parent
1217
        order.
1218
        """
1219
        tree_paths = list(self._tree_path_ids.iteritems())
1220
        tree_paths.sort(reverse=True)
1221
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1222
        try:
1223
            for num, data in enumerate(tree_paths):
1224
                path, trans_id = data
1225
                child_pb.update('removing file', num, len(tree_paths))
1226
                full_path = self._tree.abspath(path)
1227
                if trans_id in self._removed_contents:
1228
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
1229
                                     trans_id))
1230
                elif trans_id in self._new_name or trans_id in \
1231
                    self._new_parent:
1232
                    try:
1233
                        mover.rename(full_path, self._limbo_name(trans_id))
1234
                    except OSError, e:
1235
                        if e.errno != errno.ENOENT:
1236
                            raise
1237
                    else:
1238
                        self.rename_count += 1
1239
                if trans_id in self._removed_id:
1240
                    if trans_id == self._new_root:
1241
                        file_id = self._tree.get_root_id()
1242
                    else:
1243
                        file_id = self.tree_file_id(trans_id)
3146.8.18 by Aaron Bentley
Merge with dev
1244
                    assert file_id is not None
1245
                    # File-id isn't really being deleted, just moved
1246
                    if file_id in self._r_new_id:
1247
                        continue
1248
                    inventory_delta.append((path, None, file_id, None))
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1249
        finally:
1250
            child_pb.finished()
1251
3146.8.18 by Aaron Bentley
Merge with dev
1252
    def _apply_insertions(self, inventory_delta, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1253
        """Perform tree operations that insert directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1254
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1255
        That is, create any files that need to be created, and restore from
1256
        limbo any files that needed renaming.  This must be done in strict
1257
        parent-to-child order.
1258
        """
1259
        new_paths = self.new_paths()
1260
        modified_paths = []
1261
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1262
        completed_new = []
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1263
        try:
1264
            for num, (path, trans_id) in enumerate(new_paths):
1265
                new_entry = None
1266
                child_pb.update('adding file', num, len(new_paths))
1267
                if trans_id in self._new_contents or \
1268
                    self.path_changed(trans_id):
1269
                    full_path = self._tree.abspath(path)
1270
                    if trans_id in self._needs_rename:
1271
                        try:
1272
                            mover.rename(self._limbo_name(trans_id), full_path)
1273
                        except OSError, e:
1274
                            # We may be renaming a dangling inventory id
1275
                            if e.errno != errno.ENOENT:
1276
                                raise
1277
                        else:
1278
                            self.rename_count += 1
1279
                    if trans_id in self._new_contents:
1280
                        modified_paths.append(full_path)
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1281
                        completed_new.append(trans_id)
3146.8.18 by Aaron Bentley
Merge with dev
1282
                file_id = self.final_file_id(trans_id)
1283
                if file_id is not None and (trans_id in self._new_id or
1284
                    trans_id in self._new_name or trans_id in self._new_parent
1285
                    or trans_id in self._new_executability):
1286
                    try:
1287
                        kind = self.final_kind(trans_id)
1288
                    except NoSuchFile:
1289
                        kind = self._tree.stored_kind(file_id)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1290
                    if trans_id in self._new_reference_revision:
1291
                        new_entry = inventory.TreeReference(
3146.8.18 by Aaron Bentley
Merge with dev
1292
                            self.final_file_id(trans_id),
3146.8.20 by Aaron Bentley
Fix trailing whitespace
1293
                            self._new_name[trans_id],
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1294
                            self.final_file_id(self._new_parent[trans_id]),
1295
                            None, self._new_reference_revision[trans_id])
1296
                    else:
1297
                        new_entry = inventory.make_entry(kind,
1298
                            self.final_name(trans_id),
1299
                            self.final_file_id(self.final_parent(trans_id)),
3146.8.18 by Aaron Bentley
Merge with dev
1300
                            self.final_file_id(trans_id))
1301
                    try:
1302
                        old_path = self._tree.id2path(new_entry.file_id)
1303
                    except errors.NoSuchId:
1304
                        old_path = None
1305
                    inventory_delta.append((old_path, path, new_entry.file_id,
1306
                                            new_entry))
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1307
1308
                if trans_id in self._new_executability:
1309
                    self._set_executability(path, new_entry, trans_id)
1310
        finally:
1311
            child_pb.finished()
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1312
        for trans_id in completed_new:
1313
            del self._new_contents[trans_id]
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1314
        return modified_paths
1315
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1316
1317
class TransformPreview(TreeTransformBase):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1318
    """A TreeTransform for generating preview trees.
1319
1320
    Unlike TreeTransform, this version works when the input tree is a
1321
    RevisionTree, rather than a WorkingTree.  As a result, it tends to ignore
1322
    unversioned files in the input tree.
1323
    """
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1324
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1325
    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.
1326
        tree.lock_read()
3199.1.4 by Vincent Ladeuil
Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview
1327
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1328
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1329
1330
    def canonical_path(self, path):
1331
        return path
1332
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1333
    def tree_kind(self, trans_id):
1334
        path = self._tree_id_paths.get(trans_id)
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1335
        if path is None:
1336
            raise NoSuchFile(None)
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1337
        file_id = self._tree.path2id(path)
1338
        return self._tree.kind(file_id)
1339
1340
    def _set_mode(self, trans_id, mode_id, typefunc):
1341
        """Set the mode of new file contents.
1342
        The mode_id is the existing file to get the mode from (often the same
1343
        as trans_id).  The operation is only performed if there's a mode match
1344
        according to typefunc.
1345
        """
1346
        # is it ok to ignore this?  probably
1347
        pass
1348
1349
    def iter_tree_children(self, parent_id):
1350
        """Iterate through the entry's tree children, if any"""
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1351
        try:
1352
            path = self._tree_id_paths[parent_id]
1353
        except KeyError:
1354
            return
1355
        file_id = self.tree_file_id(parent_id)
1356
        for child in self._tree.inventory[file_id].children.iterkeys():
1357
            childpath = joinpath(path, child)
1358
            yield self.trans_id_tree_path(childpath)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1359
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1360
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1361
class _PreviewTree(tree.Tree):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1362
    """Partial implementation of Tree to support show_diff_trees"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1363
1364
    def __init__(self, transform):
1365
        self._transform = transform
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1366
        self._final_paths = FinalPaths(transform)
1367
1368
    def _changes(self, file_id):
1369
        for changes in self._transform.iter_changes():
3363.2.9 by Aaron Bentley
Fix up some refactorings
1370
            if changes[0] == file_id:
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1371
                return changes
1372
1373
    def _content_change(self, file_id):
3363.3.3 by Aaron Bentley
Updates from review
1374
        """Return True if the content of this file changed"""
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1375
        changes = self._changes(file_id)
3363.3.3 by Aaron Bentley
Updates from review
1376
        # changes[2] is true if the file content changed.  See
1377
        # InterTree.iter_changes.
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1378
        return (changes is not None and changes[2])
1379
1380
    def _get_file_revision(self, file_id, vf, tree_revision):
1381
        return self._transform._tree._get_file_revision(file_id, vf,
1382
                                                        tree_revision)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1383
3363.2.9 by Aaron Bentley
Fix up some refactorings
1384
    def _stat_limbo_file(self, file_id):
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
1385
        trans_id = self._transform.trans_id_file_id(file_id)
1386
        name = self._transform._limbo_name(trans_id)
1387
        return os.lstat(name)
1388
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1389
    def lock_read(self):
3008.1.18 by Aaron Bentley
Get supported PreviewTree functionality under test
1390
        # Perhaps in theory, this should lock the TreeTransform?
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1391
        pass
1392
1393
    def unlock(self):
1394
        pass
1395
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
1396
    @property
1397
    def inventory(self):
1398
        """This Tree does not use inventory as its backing data."""
1399
        raise NotImplementedError(_PreviewTree.inventory)
1400
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1401
    def get_root_id(self):
1402
        return self._transform.final_file_id(self._transform.root)
1403
1404
    def all_file_ids(self):
1405
        return self._transform._tree.all_file_ids()
1406
1407
    def __iter__(self):
1408
        return iter(self.all_file_ids())
1409
1410
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
1411
        """See Tree.paths2ids"""
1412
        to_find = set(specific_files)
1413
        result = set()
1414
        for (file_id, paths, changed, versioned, parent, name, kind,
1415
             executable) in self._transform.iter_changes():
1416
            if paths[1] in to_find:
1417
                result.append(file_id)
1418
                to_find.remove(paths[1])
1419
        result.update(self._transform._tree.paths2ids(to_find,
1420
                      trees=[], require_versioned=require_versioned))
1421
        return result
1422
1423
    def path2id(self, path):
3363.2.8 by Aaron Bentley
All tests passing
1424
        return self._transform._tree.path2id(path)
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1425
1426
    def id2path(self, file_id):
1427
        trans_id = self._transform.trans_id_file_id(file_id)
1428
        try:
1429
            return self._final_paths._determine_path(trans_id)
1430
        except NoFinalPath:
1431
            raise errors.NoSuchId(self, file_id)
1432
1433
    def iter_entries_by_dir(self, specific_file_ids=None):
1434
        return self._transform._tree.iter_entries_by_dir(specific_file_ids)
1435
1436
    def kind(self, file_id):
1437
        trans_id = self._transform.trans_id_file_id(file_id)
1438
        return self._transform.final_kind(trans_id)
1439
1440
    def stored_kind(self, file_id):
1441
        return self._transform._tree.stored_kind(file_id)
1442
1443
    def get_file_mtime(self, file_id, path=None):
1444
        """See Tree.get_file_mtime"""
1445
        if not self._content_change(file_id):
1446
            return self._transform._tree.get_file_mtime(file_id, path)
3363.2.9 by Aaron Bentley
Fix up some refactorings
1447
        return self._stat_limbo_file(file_id).st_mtime
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
1448
1449
    def get_file_size(self, file_id):
3363.3.3 by Aaron Bentley
Updates from review
1450
        """See Tree.get_file_size"""
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
1451
        if self.kind(file_id) == 'file':
1452
            return self._transform._tree.get_file_size(file_id)
3363.3.3 by Aaron Bentley
Updates from review
1453
        else:
1454
            return None
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
1455
1456
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1457
        return self._transform._tree.get_file_sha1(file_id)
1458
1459
    def is_executable(self, file_id, path=None):
1460
        return self._transform._tree.is_executable(file_id, path)
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1461
1462
    def path_content_summary(self, path):
1463
        return self._transform._tree.path_content_summary(path)
1464
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1465
    def iter_changes(self, from_tree, include_unchanged=False,
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1466
                      specific_files=None, pb=None, extra_trees=None,
1467
                      require_versioned=True, want_unversioned=False):
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1468
        """See InterTree.iter_changes.
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1469
1470
        This implementation does not support include_unchanged, specific_files,
1471
        or want_unversioned.  extra_trees, require_versioned, and pb are
1472
        ignored.
1473
        """
1474
        if from_tree is not self._transform._tree:
1475
            raise ValueError('from_tree must be transform source tree.')
1476
        if include_unchanged:
1477
            raise ValueError('include_unchanged is not supported')
1478
        if specific_files is not None:
1479
            raise ValueError('specific_files is not supported')
1480
        if want_unversioned:
1481
            raise ValueError('want_unversioned is not supported')
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1482
        return self._transform.iter_changes()
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1483
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1484
    def get_file(self, file_id, path=None):
3008.1.20 by Aaron Bentley
Add some docstrings
1485
        """See Tree.get_file"""
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1486
        if not self._content_change(file_id):
1487
            return self._transform._tree.get_file(file_id, path)
3008.1.3 by Aaron Bentley
Support basic diff
1488
        trans_id = self._transform.trans_id_file_id(file_id)
1489
        name = self._transform._limbo_name(trans_id)
1490
        return open(name, 'rb')
1491
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1492
    def get_file_text(self, file_id):
1493
        text_file = self.get_file(file_id)
1494
        try:
1495
            return text_file.read()
1496
        finally:
1497
            text_file.close()
1498
1499
    def annotate_iter(self, file_id,
1500
                      default_revision=_mod_revision.CURRENT_REVISION):
1501
        return self._transform._tree.annotate_iter(file_id,
1502
            default_revision=default_revision)
1503
3228.1.1 by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so
1504
    def get_symlink_target(self, file_id):
1505
        """See Tree.get_symlink_target"""
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1506
        if not self._content_change(file_id):
1507
            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
1508
        trans_id = self._transform.trans_id_file_id(file_id)
1509
        name = self._transform._limbo_name(trans_id)
1510
        return os.readlink(name)
1511
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1512
    def list_files(self, include_root=False):
1513
        return self._transform._tree.list_files(include_root)
1514
1515
    def walkdirs(self, prefix=""):
1516
        return self._transform._tree.walkdirs(prefix)
1517
1518
    def get_parent_ids(self):
1519
        return self._transform._tree.get_parent_ids()
1520
1521
    def get_revision_tree(self, revision_id):
1522
        return self._transform._tree.get_revision_tree(revision_id)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1523
1524
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1525
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
1526
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1527
    if parent is None or parent == "":
1528
        return child
1529
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1530
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1531
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
1532
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1533
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1534
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
1535
1536
    The underlying tree must not be manipulated between calls, or else
1537
    the results will likely be incorrect.
1538
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1539
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1540
        object.__init__(self)
1541
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
1542
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1543
1544
    def _determine_path(self, trans_id):
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1545
        if trans_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1546
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
1547
        name = self.transform.final_name(trans_id)
1548
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1549
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1550
            return name
1551
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1552
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1553
1554
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1555
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1556
        if trans_id not in self._known_paths:
1557
            self._known_paths[trans_id] = self._determine_path(trans_id)
1558
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1559
3006.2.2 by Alexander Belchenko
tests added.
1560
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1561
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
1562
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1563
    file_ids = list(tree)
1564
    file_ids.sort(key=tree.id2path)
1565
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1566
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1567
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1568
def build_tree(tree, wt, accelerator_tree=None, hardlink=False):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1569
    """Create working tree for a branch, using a TreeTransform.
1570
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1571
    This function should be used on empty trees, having a tree root at most.
1572
    (see merge and revert functionality for working with existing trees)
1573
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1574
    Existing files are handled like so:
1575
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1576
    - Existing bzrdirs take precedence over creating new items.  They are
1577
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1578
    - Otherwise, if the content on disk matches the content we are building,
1579
      it is silently replaced.
1580
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
3123.5.17 by Aaron Bentley
Update docs
1581
1582
    :param tree: The tree to convert wt into a copy of
1583
    :param wt: The working tree that files will be placed into
1584
    :param accelerator_tree: A tree which can be used for retrieving file
1585
        contents more quickly than tree itself, i.e. a workingtree.  tree
1586
        will be used for cases where accelerator_tree's content is different.
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1587
    :param hardlink: If true, hard-link files to accelerator_tree, where
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
1588
        possible.  accelerator_tree must implement abspath, i.e. be a
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1589
        working tree.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1590
    """
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.
1591
    wt.lock_tree_write()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1592
    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.
1593
        tree.lock_read()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1594
        try:
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
1595
            if accelerator_tree is not None:
1596
                accelerator_tree.lock_read()
1597
            try:
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1598
                return _build_tree(tree, wt, accelerator_tree, hardlink)
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
1599
            finally:
1600
                if accelerator_tree is not None:
1601
                    accelerator_tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1602
        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.
1603
            tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1604
    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.
1605
        wt.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1606
3006.2.2 by Alexander Belchenko
tests added.
1607
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1608
def _build_tree(tree, wt, accelerator_tree, hardlink):
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1609
    """See build_tree."""
3146.8.17 by Aaron Bentley
Change to explicit file_id list
1610
    for num, _unused in enumerate(wt.all_file_ids()):
3146.8.16 by Aaron Bentley
Updates from review
1611
        if num > 0:  # more than just a root
1612
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1613
    file_trans_id = {}
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1614
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1615
    pp = ProgressPhase("Build phase", 2, top_pb)
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1616
    if tree.inventory.root is not None:
2502.1.6 by Aaron Bentley
Update from review comments
1617
        # This is kind of a hack: we should be altering the root
1618
        # as part of the regular tree shape diff logic.
1619
        # 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.
1620
        # expensive operation (flush) every time the root id
1621
        # is set within the tree, nor setting the root and thus
1622
        # marking the tree as dirty, because we use two different
1623
        # 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('')
1624
        if wt.get_root_id() != tree.get_root_id():
1625
            wt.set_root_id(tree.get_root_id())
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1626
            wt.flush()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1627
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1628
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1629
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1630
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1631
        file_trans_id[wt.get_root_id()] = \
1632
            tt.trans_id_tree_file_id(wt.get_root_id())
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1633
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1634
        try:
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1635
            deferred_contents = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1636
            num = 0
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1637
            for num, (tree_path, entry) in \
1638
                enumerate(tree.inventory.iter_entries_by_dir()):
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1639
                pb.update("Building tree", num - len(deferred_contents),
1640
                          len(tree.inventory))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1641
                if entry.parent_id is None:
1642
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1643
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1644
                file_id = entry.file_id
1645
                target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1646
                try:
1647
                    kind = file_kind(target_path)
1648
                except NoSuchFile:
1649
                    pass
1650
                else:
1651
                    if kind == "directory":
1652
                        try:
1653
                            bzrdir.BzrDir.open(target_path)
1654
                        except errors.NotBranchError:
1655
                            pass
1656
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1657
                            divert.add(file_id)
1658
                    if (file_id not in divert and
1659
                        _content_match(tree, entry, file_id, kind,
1660
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1661
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1662
                        if kind == 'directory':
1663
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1664
                if entry.parent_id not in file_trans_id:
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1665
                    raise AssertionError(
1666
                        'entry %s parent id %r is not in file_trans_id %r'
1667
                        % (entry, entry.parent_id, file_trans_id))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1668
                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
1669
                if entry.kind == 'file':
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1670
                    # We *almost* replicate new_by_entry, so that we can defer
1671
                    # getting the file text, and get them all at once.
1672
                    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
1673
                    file_trans_id[file_id] = trans_id
1674
                    tt.version_file(entry.file_id, trans_id)
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1675
                    executable = tree.is_executable(entry.file_id, tree_path)
1676
                    if executable is not None:
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1677
                        tt.set_executability(executable, trans_id)
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1678
                    deferred_contents.append((entry.file_id, trans_id))
1679
                else:
1680
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1681
                                                          tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1682
                if reparent:
1683
                    new_trans_id = file_trans_id[file_id]
1684
                    old_parent = tt.trans_id_tree_path(tree_path)
1685
                    _reparent_children(tt, old_parent, new_trans_id)
3136.1.11 by Aaron Bentley
Updates from review
1686
            offset = num + 1 - len(deferred_contents)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1687
            _create_files(tt, tree, deferred_contents, pb, offset,
1688
                          accelerator_tree, hardlink)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1689
        finally:
1690
            pb.finished()
1691
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1692
        divert_trans = set(file_trans_id[f] for f in divert)
1693
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1694
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1695
        conflicts = cook_conflicts(raw_conflicts, tt)
1696
        for conflict in conflicts:
1697
            warning(conflict)
1698
        try:
1699
            wt.add_conflicts(conflicts)
1700
        except errors.UnsupportedOperation:
1701
            pass
3123.5.7 by Aaron Bentley
Avoid redundant conflict check
1702
        result = tt.apply(no_conflicts=True)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1703
    finally:
1704
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1705
        top_pb.finished()
2502.1.5 by Aaron Bentley
Cleanup
1706
    return result
1534.7.47 by Aaron Bentley
Started work on 'revert'
1707
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1708
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1709
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
1710
                  hardlink):
1711
    total = len(desired_files) + offset
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1712
    if accelerator_tree is None:
1713
        new_desired_files = desired_files
1714
    else:
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1715
        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
1716
        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
1717
                         in iter if not (c or e[0] != e[1]))
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1718
        new_desired_files = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1719
        count = 0
1720
        for file_id, trans_id in desired_files:
3123.5.13 by Aaron Bentley
Accelerate further by using iter_changes
1721
            accelerator_path = unchanged.get(file_id)
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
1722
            if accelerator_path is None:
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1723
                new_desired_files.append((file_id, trans_id))
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
1724
                continue
3136.1.11 by Aaron Bentley
Updates from review
1725
            pb.update('Adding file contents', count + offset, total)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1726
            if hardlink:
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
1727
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1728
                                   trans_id)
1729
            else:
1730
                contents = accelerator_tree.get_file(file_id, accelerator_path)
1731
                try:
1732
                    tt.create_file(contents, trans_id)
1733
                finally:
1734
                    contents.close()
1735
            count += 1
1736
        offset += count
1737
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
1738
                                                 new_desired_files)):
1739
        tt.create_file(contents, trans_id)
3136.1.11 by Aaron Bentley
Updates from review
1740
        pb.update('Adding file contents', count + offset, total)
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1741
1742
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1743
def _reparent_children(tt, old_parent, new_parent):
1744
    for child in tt.iter_tree_children(old_parent):
1745
        tt.adjust_path(tt.final_name(child), new_parent, child)
1746
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
1747
def _reparent_transform_children(tt, old_parent, new_parent):
1748
    by_parent = tt.by_parent()
1749
    for child in by_parent[old_parent]:
1750
        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)
1751
    return by_parent[old_parent]
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1752
1753
def _content_match(tree, entry, file_id, kind, target_path):
1754
    if entry.kind != kind:
1755
        return False
1756
    if entry.kind == "directory":
1757
        return True
1758
    if entry.kind == "file":
1759
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
1760
            return True
1761
    elif entry.kind == "symlink":
1762
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
1763
            return True
1764
    return False
1765
1766
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1767
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1768
    new_conflicts = set()
1769
    for c_type, conflict in ((c[0], c) for c in conflicts):
1770
        # Anything but a 'duplicate' would indicate programmer error
1771
        assert c_type == 'duplicate', c_type
1772
        # 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
1773
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1774
            new_file = conflict[1]
1775
            old_file = conflict[2]
1776
        else:
1777
            new_file = conflict[2]
1778
            old_file = conflict[1]
1779
1780
        # We should only get here if the conflict wasn't completely
1781
        # resolved
1782
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1783
        if new_file in divert:
1784
            new_name = tt.final_name(old_file)+'.diverted'
1785
            tt.adjust_path(new_name, final_parent, new_file)
1786
            new_conflicts.add((c_type, 'Diverted to',
1787
                               new_file, old_file))
1788
        else:
1789
            new_name = tt.final_name(old_file)+'.moved'
1790
            tt.adjust_path(new_name, final_parent, old_file)
1791
            new_conflicts.add((c_type, 'Moved existing file to',
1792
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1793
    return new_conflicts
1794
1795
1534.7.47 by Aaron Bentley
Started work on 'revert'
1796
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
1797
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1798
    name = entry.name
1799
    kind = entry.kind
1800
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
1801
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1802
        executable = tree.is_executable(entry.file_id)
1803
        return tt.new_file(name, parent_id, contents, entry.file_id, 
1804
                           executable)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1805
    elif kind in ('directory', 'tree-reference'):
1806
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
1807
        if kind == 'tree-reference':
1808
            tt.set_tree_reference(entry.reference_revision, trans_id)
1809
        return trans_id 
1534.7.47 by Aaron Bentley
Started work on 'revert'
1810
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
1811
        target = tree.get_symlink_target(entry.file_id)
1812
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1813
    else:
1814
        raise errors.BadFileKindError(name, kind)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1815
3006.2.2 by Alexander Belchenko
tests added.
1816
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1817
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1534.7.157 by Aaron Bentley
Added more docs
1818
    """Create new file contents according to an inventory entry."""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1819
    if entry.kind == "file":
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1820
        if lines is None:
1534.7.97 by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict
1821
            lines = tree.get_file(entry.file_id).readlines()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1822
        tt.create_file(lines, trans_id, mode_id=mode_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1823
    elif entry.kind == "symlink":
1534.7.101 by Aaron Bentley
Got conflicts on symlinks working properly
1824
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1825
    elif entry.kind == "directory":
1534.7.51 by Aaron Bentley
New approach to revert
1826
        tt.create_directory(trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1827
3006.2.2 by Alexander Belchenko
tests added.
1828
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1829
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1830
    """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
1831
    if entry.kind == "file":
1832
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1833
1534.7.157 by Aaron Bentley
Added more docs
1834
1534.10.28 by Aaron Bentley
Use numbered backup files
1835
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1836
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1837
1838
1839
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1534.10.28 by Aaron Bentley
Use numbered backup files
1840
    """Produce a backup-style name that appears to be available"""
1841
    def name_gen():
1842
        counter = 1
1843
        while True:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1844
            yield "%s.~%d~" % (name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
1845
            counter += 1
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1846
    for new_name in name_gen():
1847
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
1848
            return new_name
1849
1534.10.28 by Aaron Bentley
Use numbered backup files
1850
1534.7.55 by Aaron Bentley
Fixed up the change detection
1851
def _entry_changes(file_id, entry, working_tree):
1534.7.156 by Aaron Bentley
PEP8 fixes
1852
    """Determine in which ways the inventory entry has changed.
1534.7.55 by Aaron Bentley
Fixed up the change detection
1853
1854
    Returns booleans: has_contents, content_mod, meta_mod
1855
    has_contents means there are currently contents, but they differ
1856
    contents_mod means contents need to be modified
1857
    meta_mod means the metadata needs to be modified
1858
    """
1859
    cur_entry = working_tree.inventory[file_id]
1860
    try:
1861
        working_kind = working_tree.kind(file_id)
1862
        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.
1863
    except NoSuchFile:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1864
        has_contents = False
1865
        contents_mod = True
1866
        meta_mod = False
1867
    if has_contents is True:
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1868
        if entry.kind != working_kind:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1869
            contents_mod, meta_mod = True, False
1870
        else:
1871
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1872
                                       working_tree)
1873
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
1874
            cur_entry._forget_tree_state()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1875
    return has_contents, contents_mod, meta_mod
1876
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1877
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1878
def revert(working_tree, target_tree, filenames, backups=False,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1879
           pb=DummyProgress(), change_reporter=None):
1534.7.157 by Aaron Bentley
Added more docs
1880
    """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.
1881
    target_tree.lock_read()
1534.9.7 by Aaron Bentley
Show progress bars in revert
1882
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1883
    try:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1884
        pp = ProgressPhase("Revert phase", 3, pb)
1885
        pp.next_phase()
1886
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1887
        try:
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1888
            merge_modified = _alter_files(working_tree, target_tree, tt,
1889
                                          child_pb, filenames, backups)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1890
        finally:
1891
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1892
        pp.next_phase()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1893
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1894
        try:
1551.19.5 by Aaron Bentley
Fix revert when parent dir is missing
1895
            raw_conflicts = resolve_conflicts(tt, child_pb,
1896
                lambda t, c: conflict_pass(t, c, target_tree))
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1897
        finally:
1898
            child_pb.finished()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1899
        conflicts = cook_conflicts(raw_conflicts, tt)
1551.11.5 by Aaron Bentley
cleanup
1900
        if change_reporter:
1551.10.25 by Aaron Bentley
Make ChangeReporter private
1901
            change_reporter = delta._ChangeReporter(
2255.7.98 by Robert Collins
Merge bzr.dev.
1902
                unversioned_filter=working_tree.is_ignored)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1903
            delta.report_changes(tt.iter_changes(), change_reporter)
1551.11.6 by Aaron Bentley
Emit change listings before conflict warnings
1904
        for conflict in conflicts:
1905
            warning(conflict)
1906
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1907
        tt.apply()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1908
        working_tree.set_merge_modified(merge_modified)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1909
    finally:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1910
        target_tree.unlock()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1911
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1912
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1913
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
1914
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1915
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1916
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
1917
                 backups):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1918
    merge_modified = working_tree.merge_modified()
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1919
    change_list = target_tree.iter_changes(working_tree,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1920
        specific_files=specific_files, pb=pb)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1921
    if target_tree.inventory.root is None:
1922
        skip_root = True
1923
    else:
1924
        skip_root = False
1925
    basis_tree = None
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1926
    try:
2708.1.5 by Aaron Bentley
Use Tree.extract_files_bytes in revert
1927
        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.
1928
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1929
                kind, executable) in enumerate(change_list):
1930
            if skip_root and file_id[0] is not None and parent[0] is None:
1931
                continue
1932
            trans_id = tt.trans_id_file_id(file_id)
1933
            mode_id = None
1934
            if changed_content:
1935
                keep_content = False
1936
                if kind[0] == 'file' and (backups or kind[1] is None):
1937
                    wt_sha1 = working_tree.get_file_sha1(file_id)
1938
                    if merge_modified.get(file_id) != wt_sha1:
2502.1.6 by Aaron Bentley
Update from review comments
1939
                        # acquire the basis tree lazily to prevent the
1940
                        # expense of accessing it when it's not needed ?
1941
                        # (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.
1942
                        if basis_tree is None:
1943
                            basis_tree = working_tree.basis_tree()
1944
                            basis_tree.lock_read()
1945
                        if file_id in basis_tree:
1946
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
1947
                                keep_content = True
1948
                        elif kind[1] is None and not versioned[1]:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1949
                            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.
1950
                if kind[0] is not None:
1951
                    if not keep_content:
1952
                        tt.delete_contents(trans_id)
1953
                    elif kind[1] is not None:
1954
                        parent_trans_id = tt.trans_id_file_id(parent[0])
1955
                        by_parent = tt.by_parent()
1956
                        backup_name = _get_backup_name(name[0], by_parent,
1957
                                                       parent_trans_id, tt)
1958
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
1959
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
1960
                        if versioned == (True, True):
1961
                            tt.unversion_file(trans_id)
1962
                            tt.version_file(file_id, new_trans_id)
1963
                        # New contents should have the same unix perms as old
1964
                        # contents
1965
                        mode_id = trans_id
1966
                        trans_id = new_trans_id
1967
                if kind[1] == 'directory':
1968
                    tt.create_directory(trans_id)
1969
                elif kind[1] == 'symlink':
1970
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1971
                                      trans_id)
1972
                elif kind[1] == 'file':
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1973
                    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
1974
                    if basis_tree is None:
1975
                        basis_tree = working_tree.basis_tree()
1976
                        basis_tree.lock_read()
1977
                    new_sha1 = target_tree.get_file_sha1(file_id)
1978
                    if (file_id in basis_tree and new_sha1 ==
1979
                        basis_tree.get_file_sha1(file_id)):
1980
                        if file_id in merge_modified:
1981
                            del merge_modified[file_id]
1982
                    else:
1983
                        merge_modified[file_id] = new_sha1
1984
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1985
                    # preserve the execute bit when backing up
1986
                    if keep_content and executable[0] == executable[1]:
1987
                        tt.set_executability(executable[1], trans_id)
1988
                else:
1989
                    assert kind[1] is None
1990
            if versioned == (False, True):
1991
                tt.version_file(file_id, trans_id)
1992
            if versioned == (True, False):
1993
                tt.unversion_file(trans_id)
1994
            if (name[1] is not None and 
1995
                (name[0] != name[1] or parent[0] != parent[1])):
1996
                tt.adjust_path(
1997
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
1998
            if executable[0] != executable[1] and kind[1] == "file":
1999
                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
2000
        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
2001
            deferred_files):
2002
            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.
2003
    finally:
2004
        if basis_tree is not None:
2005
            basis_tree.unlock()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
2006
    return merge_modified
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2007
2008
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2009
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2010
    """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
2011
    if pass_func is None:
2012
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2013
    new_conflicts = set()
1534.9.1 by Aaron Bentley
Added progress bars to merge
2014
    try:
2015
        for n in range(10):
2016
            pb.update('Resolution pass', n+1, 10)
2017
            conflicts = tt.find_conflicts()
2018
            if len(conflicts) == 0:
2019
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2020
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
2021
        raise MalformedTransform(conflicts=conflicts)
2022
    finally:
2023
        pb.clear()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2024
2025
2590.2.8 by Aaron Bentley
Restore conflict handling changes
2026
def conflict_pass(tt, conflicts, path_tree=None):
2027
    """Resolve some classes of conflicts.
2028
2029
    :param tt: The transform to resolve conflicts in
2030
    :param conflicts: The conflicts to resolve
2031
    :param path_tree: A Tree to get supplemental paths from
2032
    """
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2033
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2034
    for c_type, conflict in ((c[0], c) for c in conflicts):
2035
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
2036
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2037
            new_conflicts.add((c_type, 'Unversioned existing file',
2038
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2039
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2040
            # files that were renamed take precedence
2041
            final_parent = tt.final_parent(conflict[1])
2042
            if tt.path_changed(conflict[1]):
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
2043
                existing_file, new_file = conflict[2], conflict[1]
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2044
            else:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
2045
                existing_file, new_file = conflict[1], conflict[2]
2046
            new_name = tt.final_name(existing_file)+'.moved'
2047
            tt.adjust_path(new_name, final_parent, existing_file)
2048
            new_conflicts.add((c_type, 'Moved existing file to', 
2049
                               existing_file, new_file))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2050
        elif c_type == 'parent loop':
2051
            # break the loop by undoing one of the ops that caused the loop
2052
            cur = conflict[1]
2053
            while not tt.path_changed(cur):
2054
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2055
            new_conflicts.add((c_type, 'Cancelled move', cur,
2056
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2057
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2058
            
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2059
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
2060
            trans_id = conflict[1]
2061
            try:
2062
                tt.cancel_deletion(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
2063
                new_conflicts.add(('deleting parent', 'Not deleting', 
2064
                                   trans_id))
1534.7.128 by Aaron Bentley
Got missing contents test working
2065
            except KeyError:
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
2066
                create = True
2590.2.8 by Aaron Bentley
Restore conflict handling changes
2067
                try:
2068
                    tt.final_name(trans_id)
2069
                except NoFinalPath:
1551.19.6 by Aaron Bentley
Revert doesn't crash restoring a file from a deleted directory
2070
                    if path_tree is not None:
2071
                        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)
2072
                        if file_id is None:
2073
                            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
2074
                        entry = path_tree.inventory[file_id]
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
2075
                        # special-case the other tree root (move its
2076
                        # children to current root)
2077
                        if entry.parent_id is None:
2078
                            create=False
2079
                            moved = _reparent_transform_children(
2080
                                tt, trans_id, tt.root)
2081
                            for child in moved:
2082
                                new_conflicts.add((c_type, 'Moved to root',
2083
                                                   child))
2084
                        else:
2085
                            parent_trans_id = tt.trans_id_file_id(
2086
                                entry.parent_id)
2087
                            tt.adjust_path(entry.name, parent_trans_id,
2088
                                           trans_id)
2089
                if create:
2090
                    tt.create_directory(trans_id)
2091
                    new_conflicts.add((c_type, 'Created directory', trans_id))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2092
        elif c_type == 'unversioned parent':
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
2093
            file_id = tt.inactive_file_id(conflict[1])
2094
            # special-case the other tree root (move its children instead)
2095
            if path_tree and file_id in path_tree:
2096
                if path_tree.inventory[file_id].parent_id is None:
2097
                    continue
2098
            tt.version_file(file_id, conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
2099
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
2100
        elif c_type == 'non-directory parent':
2101
            parent_id = conflict[1]
2102
            parent_parent = tt.final_parent(parent_id)
2103
            parent_name = tt.final_name(parent_id)
2104
            parent_file_id = tt.final_file_id(parent_id)
2105
            new_parent_id = tt.new_directory(parent_name + '.new',
2106
                parent_parent, parent_file_id)
2107
            _reparent_transform_children(tt, parent_id, new_parent_id)
3146.8.19 by Aaron Bentley
Merge with bzr.dev
2108
            if parent_file_id is not None:
2109
                tt.unversion_file(parent_id)
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
2110
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2111
    return new_conflicts
2112
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
2113
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2114
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2115
    """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
2116
    from bzrlib.conflicts import Conflict
2117
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
2118
    return sorted(conflict_iter, key=Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2119
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2120
2121
def iter_cook_conflicts(raw_conflicts, tt):
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2122
    from bzrlib.conflicts import Conflict
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2123
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2124
    for conflict in raw_conflicts:
2125
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2126
        action = conflict[1]
2127
        modified_path = fp.get_path(conflict[2])
2128
        modified_id = tt.final_file_id(conflict[2])
2129
        if len(conflict) == 3:
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2130
            yield Conflict.factory(c_type, action=action, path=modified_path,
2131
                                     file_id=modified_id)
2132
             
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2133
        else:
2134
            conflicting_path = fp.get_path(conflict[3])
2135
            conflicting_id = tt.final_file_id(conflict[3])
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2136
            yield Conflict.factory(c_type, action=action, path=modified_path,
2137
                                   file_id=modified_id, 
2138
                                   conflict_path=conflicting_path,
2139
                                   conflict_file_id=conflicting_id)
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2140
2141
2142
class _FileMover(object):
2733.2.9 by Aaron Bentley
Update docstrings
2143
    """Moves and deletes files for TreeTransform, tracking operations"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2144
2145
    def __init__(self):
2146
        self.past_renames = []
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2147
        self.pending_deletions = []
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2148
2149
    def rename(self, from_, to):
2733.2.9 by Aaron Bentley
Update docstrings
2150
        """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).
2151
        try:
2152
            os.rename(from_, to)
2153
        except OSError, e:
3063.1.3 by Aaron Bentley
Update for Linux
2154
            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).
2155
                raise errors.FileExists(to, str(e))
2156
            raise
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2157
        self.past_renames.append((from_, to))
2158
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2159
    def pre_delete(self, from_, to):
2733.2.9 by Aaron Bentley
Update docstrings
2160
        """Rename a file out of the way and mark it for deletion.
2161
2162
        Unlike os.unlink, this works equally well for files and directories.
2163
        :param from_: The current file path
2164
        :param to: A temporary path for the file
2165
        """
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2166
        self.rename(from_, to)
2167
        self.pending_deletions.append(to)
2168
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2169
    def rollback(self):
2733.2.9 by Aaron Bentley
Update docstrings
2170
        """Reverse all renames that have been performed"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2171
        for from_, to in reversed(self.past_renames):
2172
            os.rename(to, from_)
2733.2.12 by Aaron Bentley
Updates from review
2173
        # after rollback, don't reuse _FileMover
2174
        past_renames = None
2175
        pending_deletions = None
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2176
2177
    def apply_deletions(self):
2733.2.9 by Aaron Bentley
Update docstrings
2178
        """Apply all marked deletions"""
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2179
        for path in self.pending_deletions:
2180
            delete_any(path)
2733.2.12 by Aaron Bentley
Updates from review
2181
        # after apply_deletions, don't reuse _FileMover
2182
        past_renames = None
2183
        pending_deletions = None