~bzr-pqm/bzr/bzr.dev

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