/brz/remove-bazaar

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