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