~bzr-pqm/bzr/bzr.dev

3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
17
import os
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
18
import errno
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
19
from stat import S_ISREG
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
20
import tempfile
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
21
1551.11.12 by Aaron Bentley
Changes from review
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
24
from bzrlib import (
25
    bzrdir,
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
26
    delta,
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
27
    errors,
28
    inventory
29
    )
1551.11.12 by Aaron Bentley
Changes from review
30
""")
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
31
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
32
                           ReusingTransform, NotVersionedError, CantMoveRoot,
3006.2.1 by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows)
33
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
34
                           UnableCreateSymlink)
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
35
from bzrlib.inventory import InventoryEntry
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
36
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
3006.2.1 by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows)
37
                            delete_any, has_symlinks)
1551.2.34 by Aaron Bentley
Refactored the revert phases
38
from bzrlib.progress import DummyProgress, ProgressPhase
2687.2.1 by Martin Pool
Rename upcoming release from 0.19 to 0.90
39
from bzrlib.symbol_versioning import (
40
        deprecated_function,
41
        zero_fifteen,
42
        zero_ninety,
43
        )
1534.7.173 by Aaron Bentley
Added conflict warnings to revert
44
from bzrlib.trace import mutter, warning
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
45
from bzrlib import tree
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
46
import bzrlib.ui
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
47
import bzrlib.urlutils as urlutils
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
48
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
49
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
50
ROOT_PARENT = "root-parent"
51
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
52
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
53
def unique_add(map, key, value):
54
    if key in map:
1534.7.5 by Aaron Bentley
Got unique_add under test
55
        raise DuplicateKey(key=key)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
56
    map[key] = value
57
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
58
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
59
class _TransformResults(object):
2502.1.5 by Aaron Bentley
Cleanup
60
    def __init__(self, modified_paths, rename_count):
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
61
        object.__init__(self)
62
        self.modified_paths = modified_paths
2502.1.5 by Aaron Bentley
Cleanup
63
        self.rename_count = rename_count
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
64
65
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
66
class TreeTransformBase(object):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
67
    """The base class for TreeTransform and TreeTransformBase"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
68
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
69
    def __init__(self, tree, limbodir, pb=DummyProgress(),
70
                 case_sensitive=True):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
71
        """Constructor.
72
73
        :param tree: The tree that will be transformed, but not necessarily
74
            the output tree.
75
        :param limbodir: A directory where new files can be stored until
76
            they are installed in their proper places
77
        :param pb: A ProgressBar indicating how much progress is being made
78
        :param case_sensitive: If True, the target of the transform is
79
            case sensitive, not just case preserving.
80
        """
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
81
        object.__init__(self)
82
        self._tree = tree
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
83
        self._limbodir = limbodir
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
        """
3146.8.1 by Aaron Bentley
Fix two tree.inventory uses in checkout
253
        path = self._tree.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))
3146.8.16 by Aaron Bentley
Updates from review
773
        all_ids = self._tree.all_file_ids()
774
        active_tree_ids = all_ids.difference(removed_tree_ids)
1534.7.50 by Aaron Bentley
Detect duplicate inventory 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
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1005
    def iter_changes(self):
1006
        """Produce output in the same format as Tree.iter_changes.
1551.11.12 by Aaron Bentley
Changes from review
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
        inventory_delta = []
1190
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1191
        try:
1192
            if _mover is None:
1193
                mover = _FileMover()
1194
            else:
1195
                mover = _mover
1196
            try:
1197
                child_pb.update('Apply phase', 0, 2)
3146.8.18 by Aaron Bentley
Merge with dev
1198
                self._apply_removals(inventory_delta, mover)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1199
                child_pb.update('Apply phase', 1, 2)
3146.8.18 by Aaron Bentley
Merge with dev
1200
                modified_paths = self._apply_insertions(inventory_delta, mover)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1201
            except:
1202
                mover.rollback()
1203
                raise
1204
            else:
1205
                mover.apply_deletions()
1206
        finally:
1207
            child_pb.finished()
1208
        self._tree.apply_inventory_delta(inventory_delta)
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1209
        self._done = True
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1210
        self.finalize()
1211
        return _TransformResults(modified_paths, self.rename_count)
1212
3146.8.18 by Aaron Bentley
Merge with dev
1213
    def _apply_removals(self, inventory_delta, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1214
        """Perform tree operations that remove directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1215
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1216
        That is, delete files that are to be deleted, and put any files that
1217
        need renaming into limbo.  This must be done in strict child-to-parent
1218
        order.
1219
        """
1220
        tree_paths = list(self._tree_path_ids.iteritems())
1221
        tree_paths.sort(reverse=True)
1222
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1223
        try:
1224
            for num, data in enumerate(tree_paths):
1225
                path, trans_id = data
1226
                child_pb.update('removing file', num, len(tree_paths))
1227
                full_path = self._tree.abspath(path)
1228
                if trans_id in self._removed_contents:
1229
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
1230
                                     trans_id))
1231
                elif trans_id in self._new_name or trans_id in \
1232
                    self._new_parent:
1233
                    try:
1234
                        mover.rename(full_path, self._limbo_name(trans_id))
1235
                    except OSError, e:
1236
                        if e.errno != errno.ENOENT:
1237
                            raise
1238
                    else:
1239
                        self.rename_count += 1
1240
                if trans_id in self._removed_id:
1241
                    if trans_id == self._new_root:
1242
                        file_id = self._tree.get_root_id()
1243
                    else:
1244
                        file_id = self.tree_file_id(trans_id)
3146.8.18 by Aaron Bentley
Merge with dev
1245
                    assert file_id is not None
1246
                    # File-id isn't really being deleted, just moved
1247
                    if file_id in self._r_new_id:
1248
                        continue
1249
                    inventory_delta.append((path, None, file_id, None))
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1250
        finally:
1251
            child_pb.finished()
1252
3146.8.18 by Aaron Bentley
Merge with dev
1253
    def _apply_insertions(self, inventory_delta, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1254
        """Perform tree operations that insert directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1255
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1256
        That is, create any files that need to be created, and restore from
1257
        limbo any files that needed renaming.  This must be done in strict
1258
        parent-to-child order.
1259
        """
1260
        new_paths = self.new_paths()
1261
        modified_paths = []
1262
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1263
        completed_new = []
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1264
        try:
1265
            for num, (path, trans_id) in enumerate(new_paths):
1266
                new_entry = None
1267
                child_pb.update('adding file', num, len(new_paths))
1268
                if trans_id in self._new_contents or \
1269
                    self.path_changed(trans_id):
1270
                    full_path = self._tree.abspath(path)
1271
                    if trans_id in self._needs_rename:
1272
                        try:
1273
                            mover.rename(self._limbo_name(trans_id), full_path)
1274
                        except OSError, e:
1275
                            # We may be renaming a dangling inventory id
1276
                            if e.errno != errno.ENOENT:
1277
                                raise
1278
                        else:
1279
                            self.rename_count += 1
1280
                    if trans_id in self._new_contents:
1281
                        modified_paths.append(full_path)
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1282
                        completed_new.append(trans_id)
3146.8.18 by Aaron Bentley
Merge with dev
1283
                file_id = self.final_file_id(trans_id)
1284
                if file_id is not None and (trans_id in self._new_id or
1285
                    trans_id in self._new_name or trans_id in self._new_parent
1286
                    or trans_id in self._new_executability):
1287
                    try:
1288
                        kind = self.final_kind(trans_id)
1289
                    except NoSuchFile:
1290
                        kind = self._tree.stored_kind(file_id)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1291
                    if trans_id in self._new_reference_revision:
1292
                        new_entry = inventory.TreeReference(
3146.8.18 by Aaron Bentley
Merge with dev
1293
                            self.final_file_id(trans_id),
3146.8.20 by Aaron Bentley
Fix trailing whitespace
1294
                            self._new_name[trans_id],
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1295
                            self.final_file_id(self._new_parent[trans_id]),
1296
                            None, self._new_reference_revision[trans_id])
1297
                    else:
1298
                        new_entry = inventory.make_entry(kind,
1299
                            self.final_name(trans_id),
1300
                            self.final_file_id(self.final_parent(trans_id)),
3146.8.18 by Aaron Bentley
Merge with dev
1301
                            self.final_file_id(trans_id))
1302
                    try:
1303
                        old_path = self._tree.id2path(new_entry.file_id)
1304
                    except errors.NoSuchId:
1305
                        old_path = None
1306
                    inventory_delta.append((old_path, path, new_entry.file_id,
1307
                                            new_entry))
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1308
1309
                if trans_id in self._new_executability:
1310
                    self._set_executability(path, new_entry, trans_id)
1311
        finally:
1312
            child_pb.finished()
3008.1.16 by Aaron Bentley
Merge with bzr.dev
1313
        for trans_id in completed_new:
1314
            del self._new_contents[trans_id]
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1315
        return modified_paths
1316
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1317
1318
class TransformPreview(TreeTransformBase):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1319
    """A TreeTransform for generating preview trees.
1320
1321
    Unlike TreeTransform, this version works when the input tree is a
1322
    RevisionTree, rather than a WorkingTree.  As a result, it tends to ignore
1323
    unversioned files in the input tree.
1324
    """
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1325
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1326
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1327
        tree.lock_read()
3199.1.4 by Vincent Ladeuil
Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview
1328
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1329
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1330
1331
    def canonical_path(self, path):
1332
        return path
1333
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1334
    def tree_kind(self, trans_id):
1335
        path = self._tree_id_paths.get(trans_id)
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1336
        if path is None:
1337
            raise NoSuchFile(None)
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1338
        file_id = self._tree.path2id(path)
1339
        return self._tree.kind(file_id)
1340
1341
    def _set_mode(self, trans_id, mode_id, typefunc):
1342
        """Set the mode of new file contents.
1343
        The mode_id is the existing file to get the mode from (often the same
1344
        as trans_id).  The operation is only performed if there's a mode match
1345
        according to typefunc.
1346
        """
1347
        # is it ok to ignore this?  probably
1348
        pass
1349
1350
    def iter_tree_children(self, parent_id):
1351
        """Iterate through the entry's tree children, if any"""
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1352
        try:
1353
            path = self._tree_id_paths[parent_id]
1354
        except KeyError:
1355
            return
1356
        file_id = self.tree_file_id(parent_id)
1357
        for child in self._tree.inventory[file_id].children.iterkeys():
1358
            childpath = joinpath(path, child)
1359
            yield self.trans_id_tree_path(childpath)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1360
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1361
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1362
class _PreviewTree(object):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1363
    """Partial implementation of Tree to support show_diff_trees"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1364
1365
    def __init__(self, transform):
1366
        self._transform = transform
1367
1368
    def lock_read(self):
3008.1.18 by Aaron Bentley
Get supported PreviewTree functionality under test
1369
        # Perhaps in theory, this should lock the TreeTransform?
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1370
        pass
1371
1372
    def unlock(self):
1373
        pass
1374
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1375
    def iter_changes(self, from_tree, include_unchanged=False,
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1376
                      specific_files=None, pb=None, extra_trees=None,
1377
                      require_versioned=True, want_unversioned=False):
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1378
        """See InterTree.iter_changes.
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1379
1380
        This implementation does not support include_unchanged, specific_files,
1381
        or want_unversioned.  extra_trees, require_versioned, and pb are
1382
        ignored.
1383
        """
1384
        if from_tree is not self._transform._tree:
1385
            raise ValueError('from_tree must be transform source tree.')
1386
        if include_unchanged:
1387
            raise ValueError('include_unchanged is not supported')
1388
        if specific_files is not None:
1389
            raise ValueError('specific_files is not supported')
1390
        if want_unversioned:
1391
            raise ValueError('want_unversioned is not supported')
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1392
        return self._transform.iter_changes()
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1393
3008.1.3 by Aaron Bentley
Support basic diff
1394
    def kind(self, file_id):
1395
        trans_id = self._transform.trans_id_file_id(file_id)
1396
        return self._transform.final_kind(trans_id)
1397
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1398
    def get_file_mtime(self, file_id, path=None):
3008.1.20 by Aaron Bentley
Add some docstrings
1399
        """See Tree.get_file_mtime"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1400
        trans_id = self._transform.trans_id_file_id(file_id)
1401
        name = self._transform._limbo_name(trans_id)
1402
        return os.stat(name).st_mtime
1403
3008.1.3 by Aaron Bentley
Support basic diff
1404
    def get_file(self, file_id):
3008.1.20 by Aaron Bentley
Add some docstrings
1405
        """See Tree.get_file"""
3008.1.3 by Aaron Bentley
Support basic diff
1406
        trans_id = self._transform.trans_id_file_id(file_id)
1407
        name = self._transform._limbo_name(trans_id)
1408
        return open(name, 'rb')
1409
3228.1.1 by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so
1410
    def get_symlink_target(self, file_id):
1411
        """See Tree.get_symlink_target"""
1412
        trans_id = self._transform.trans_id_file_id(file_id)
1413
        name = self._transform._limbo_name(trans_id)
1414
        return os.readlink(name)
1415
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1416
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1417
        """See Tree.paths2ids"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1418
        return 'not_empty'
1419
1420
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1421
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
1422
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1423
    if parent is None or parent == "":
1424
        return child
1425
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1426
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1427
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
1428
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1429
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1430
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
1431
1432
    The underlying tree must not be manipulated between calls, or else
1433
    the results will likely be incorrect.
1434
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1435
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1436
        object.__init__(self)
1437
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
1438
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1439
1440
    def _determine_path(self, trans_id):
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1441
        if trans_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1442
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
1443
        name = self.transform.final_name(trans_id)
1444
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1445
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1446
            return name
1447
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1448
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1449
1450
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1451
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1452
        if trans_id not in self._known_paths:
1453
            self._known_paths[trans_id] = self._determine_path(trans_id)
1454
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1455
3006.2.2 by Alexander Belchenko
tests added.
1456
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1457
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
1458
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1459
    file_ids = list(tree)
1460
    file_ids.sort(key=tree.id2path)
1461
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1462
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1463
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1464
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
1465
    """Create working tree for a branch, using a TreeTransform.
1466
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1467
    This function should be used on empty trees, having a tree root at most.
1468
    (see merge and revert functionality for working with existing trees)
1469
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1470
    Existing files are handled like so:
1471
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1472
    - Existing bzrdirs take precedence over creating new items.  They are
1473
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1474
    - Otherwise, if the content on disk matches the content we are building,
1475
      it is silently replaced.
1476
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
3123.5.17 by Aaron Bentley
Update docs
1477
1478
    :param tree: The tree to convert wt into a copy of
1479
    :param wt: The working tree that files will be placed into
1480
    :param accelerator_tree: A tree which can be used for retrieving file
1481
        contents more quickly than tree itself, i.e. a workingtree.  tree
1482
        will be used for cases where accelerator_tree's content is different.
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1483
    :param hardlink: If true, hard-link files to accelerator_tree, where
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
1484
        possible.  accelerator_tree must implement abspath, i.e. be a
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1485
        working tree.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1486
    """
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.
1487
    wt.lock_tree_write()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1488
    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.
1489
        tree.lock_read()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1490
        try:
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
1491
            if accelerator_tree is not None:
1492
                accelerator_tree.lock_read()
1493
            try:
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1494
                return _build_tree(tree, wt, accelerator_tree, hardlink)
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
1495
            finally:
1496
                if accelerator_tree is not None:
1497
                    accelerator_tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1498
        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.
1499
            tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1500
    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.
1501
        wt.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1502
3006.2.2 by Alexander Belchenko
tests added.
1503
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1504
def _build_tree(tree, wt, accelerator_tree, hardlink):
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1505
    """See build_tree."""
3146.8.17 by Aaron Bentley
Change to explicit file_id list
1506
    for num, _unused in enumerate(wt.all_file_ids()):
3146.8.16 by Aaron Bentley
Updates from review
1507
        if num > 0:  # more than just a root
1508
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1509
    file_trans_id = {}
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1510
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1511
    pp = ProgressPhase("Build phase", 2, top_pb)
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1512
    if tree.inventory.root is not None:
2502.1.6 by Aaron Bentley
Update from review comments
1513
        # This is kind of a hack: we should be altering the root
1514
        # as part of the regular tree shape diff logic.
1515
        # 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.
1516
        # expensive operation (flush) every time the root id
1517
        # is set within the tree, nor setting the root and thus
1518
        # marking the tree as dirty, because we use two different
1519
        # 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('')
1520
        if wt.get_root_id() != tree.get_root_id():
1521
            wt.set_root_id(tree.get_root_id())
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1522
            wt.flush()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1523
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1524
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1525
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1526
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1527
        file_trans_id[wt.get_root_id()] = \
1528
            tt.trans_id_tree_file_id(wt.get_root_id())
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1529
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1530
        try:
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1531
            deferred_contents = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1532
            num = 0
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1533
            for num, (tree_path, entry) in \
1534
                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
1535
                pb.update("Building tree", num - len(deferred_contents),
1536
                          len(tree.inventory))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1537
                if entry.parent_id is None:
1538
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1539
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1540
                file_id = entry.file_id
1541
                target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1542
                try:
1543
                    kind = file_kind(target_path)
1544
                except NoSuchFile:
1545
                    pass
1546
                else:
1547
                    if kind == "directory":
1548
                        try:
1549
                            bzrdir.BzrDir.open(target_path)
1550
                        except errors.NotBranchError:
1551
                            pass
1552
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1553
                            divert.add(file_id)
1554
                    if (file_id not in divert and
1555
                        _content_match(tree, entry, file_id, kind,
1556
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1557
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1558
                        if kind == 'directory':
1559
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1560
                if entry.parent_id not in file_trans_id:
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1561
                    raise AssertionError(
1562
                        'entry %s parent id %r is not in file_trans_id %r'
1563
                        % (entry, entry.parent_id, file_trans_id))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1564
                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
1565
                if entry.kind == 'file':
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1566
                    # We *almost* replicate new_by_entry, so that we can defer
1567
                    # getting the file text, and get them all at once.
1568
                    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
1569
                    file_trans_id[file_id] = trans_id
1570
                    tt.version_file(entry.file_id, trans_id)
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1571
                    executable = tree.is_executable(entry.file_id, tree_path)
1572
                    if executable is not None:
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
1573
                        tt.set_executability(executable, trans_id)
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
1574
                    deferred_contents.append((entry.file_id, trans_id))
1575
                else:
1576
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1577
                                                          tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1578
                if reparent:
1579
                    new_trans_id = file_trans_id[file_id]
1580
                    old_parent = tt.trans_id_tree_path(tree_path)
1581
                    _reparent_children(tt, old_parent, new_trans_id)
3136.1.11 by Aaron Bentley
Updates from review
1582
            offset = num + 1 - len(deferred_contents)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1583
            _create_files(tt, tree, deferred_contents, pb, offset,
1584
                          accelerator_tree, hardlink)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1585
        finally:
1586
            pb.finished()
1587
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1588
        divert_trans = set(file_trans_id[f] for f in divert)
1589
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1590
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1591
        conflicts = cook_conflicts(raw_conflicts, tt)
1592
        for conflict in conflicts:
1593
            warning(conflict)
1594
        try:
1595
            wt.add_conflicts(conflicts)
1596
        except errors.UnsupportedOperation:
1597
            pass
3123.5.7 by Aaron Bentley
Avoid redundant conflict check
1598
        result = tt.apply(no_conflicts=True)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1599
    finally:
1600
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1601
        top_pb.finished()
2502.1.5 by Aaron Bentley
Cleanup
1602
    return result
1534.7.47 by Aaron Bentley
Started work on 'revert'
1603
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1604
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1605
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
1606
                  hardlink):
1607
    total = len(desired_files) + offset
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1608
    if accelerator_tree is None:
1609
        new_desired_files = desired_files
1610
    else:
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1611
        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
1612
        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
1613
                         in iter if not (c or e[0] != e[1]))
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1614
        new_desired_files = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1615
        count = 0
1616
        for file_id, trans_id in desired_files:
3123.5.13 by Aaron Bentley
Accelerate further by using iter_changes
1617
            accelerator_path = unchanged.get(file_id)
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
1618
            if accelerator_path is None:
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1619
                new_desired_files.append((file_id, trans_id))
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
1620
                continue
3136.1.11 by Aaron Bentley
Updates from review
1621
            pb.update('Adding file contents', count + offset, total)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1622
            if hardlink:
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
1623
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
1624
                                   trans_id)
1625
            else:
1626
                contents = accelerator_tree.get_file(file_id, accelerator_path)
1627
                try:
1628
                    tt.create_file(contents, trans_id)
1629
                finally:
1630
                    contents.close()
1631
            count += 1
1632
        offset += count
1633
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
1634
                                                 new_desired_files)):
1635
        tt.create_file(contents, trans_id)
3136.1.11 by Aaron Bentley
Updates from review
1636
        pb.update('Adding file contents', count + offset, total)
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
1637
1638
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1639
def _reparent_children(tt, old_parent, new_parent):
1640
    for child in tt.iter_tree_children(old_parent):
1641
        tt.adjust_path(tt.final_name(child), new_parent, child)
1642
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
1643
def _reparent_transform_children(tt, old_parent, new_parent):
1644
    by_parent = tt.by_parent()
1645
    for child in by_parent[old_parent]:
1646
        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
1647
1648
def _content_match(tree, entry, file_id, kind, target_path):
1649
    if entry.kind != kind:
1650
        return False
1651
    if entry.kind == "directory":
1652
        return True
1653
    if entry.kind == "file":
1654
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
1655
            return True
1656
    elif entry.kind == "symlink":
1657
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
1658
            return True
1659
    return False
1660
1661
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1662
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1663
    new_conflicts = set()
1664
    for c_type, conflict in ((c[0], c) for c in conflicts):
1665
        # Anything but a 'duplicate' would indicate programmer error
1666
        assert c_type == 'duplicate', c_type
1667
        # 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
1668
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1669
            new_file = conflict[1]
1670
            old_file = conflict[2]
1671
        else:
1672
            new_file = conflict[2]
1673
            old_file = conflict[1]
1674
1675
        # We should only get here if the conflict wasn't completely
1676
        # resolved
1677
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1678
        if new_file in divert:
1679
            new_name = tt.final_name(old_file)+'.diverted'
1680
            tt.adjust_path(new_name, final_parent, new_file)
1681
            new_conflicts.add((c_type, 'Diverted to',
1682
                               new_file, old_file))
1683
        else:
1684
            new_name = tt.final_name(old_file)+'.moved'
1685
            tt.adjust_path(new_name, final_parent, old_file)
1686
            new_conflicts.add((c_type, 'Moved existing file to',
1687
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1688
    return new_conflicts
1689
1690
1534.7.47 by Aaron Bentley
Started work on 'revert'
1691
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
1692
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1693
    name = entry.name
1694
    kind = entry.kind
1695
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
1696
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1697
        executable = tree.is_executable(entry.file_id)
1698
        return tt.new_file(name, parent_id, contents, entry.file_id, 
1699
                           executable)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1700
    elif kind in ('directory', 'tree-reference'):
1701
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
1702
        if kind == 'tree-reference':
1703
            tt.set_tree_reference(entry.reference_revision, trans_id)
1704
        return trans_id 
1534.7.47 by Aaron Bentley
Started work on 'revert'
1705
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
1706
        target = tree.get_symlink_target(entry.file_id)
1707
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1708
    else:
1709
        raise errors.BadFileKindError(name, kind)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1710
3006.2.2 by Alexander Belchenko
tests added.
1711
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1712
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1534.7.157 by Aaron Bentley
Added more docs
1713
    """Create new file contents according to an inventory entry."""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1714
    if entry.kind == "file":
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1715
        if lines is None:
1534.7.97 by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict
1716
            lines = tree.get_file(entry.file_id).readlines()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1717
        tt.create_file(lines, trans_id, mode_id=mode_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1718
    elif entry.kind == "symlink":
1534.7.101 by Aaron Bentley
Got conflicts on symlinks working properly
1719
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1720
    elif entry.kind == "directory":
1534.7.51 by Aaron Bentley
New approach to revert
1721
        tt.create_directory(trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1722
3006.2.2 by Alexander Belchenko
tests added.
1723
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1724
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1725
    """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
1726
    if entry.kind == "file":
1727
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1728
1534.7.157 by Aaron Bentley
Added more docs
1729
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1730
@deprecated_function(zero_fifteen)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1731
def find_interesting(working_tree, target_tree, filenames):
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1732
    """Find the ids corresponding to specified filenames.
1733
    
1734
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1735
    """
1736
    working_tree.lock_read()
1737
    try:
1738
        target_tree.lock_read()
1739
        try:
1740
            return working_tree.paths2ids(filenames, [target_tree])
1741
        finally:
1742
            target_tree.unlock()
1743
    finally:
1744
        working_tree.unlock()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1745
1746
2687.2.1 by Martin Pool
Rename upcoming release from 0.19 to 0.90
1747
@deprecated_function(zero_ninety)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1748
def change_entry(tt, file_id, working_tree, target_tree, 
1534.10.28 by Aaron Bentley
Use numbered backup files
1749
                 trans_id_file_id, backups, trans_id, by_parent):
1534.7.157 by Aaron Bentley
Added more docs
1750
    """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.
1751
    if file_id is None and target_tree is None:
1752
        # skip the logic altogether in the deprecation test
1753
        return
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1754
    e_trans_id = trans_id_file_id(file_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1755
    entry = target_tree.inventory[file_id]
1756
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1757
                                                           working_tree)
1758
    if contents_mod:
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1759
        mode_id = e_trans_id
1534.7.55 by Aaron Bentley
Fixed up the change detection
1760
        if has_contents:
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1761
            if not backups:
1762
                tt.delete_contents(e_trans_id)
1763
            else:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1764
                parent_trans_id = trans_id_file_id(entry.parent_id)
1534.10.28 by Aaron Bentley
Use numbered backup files
1765
                backup_name = get_backup_name(entry, by_parent,
1766
                                              parent_trans_id, tt)
1767
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1768
                tt.unversion_file(e_trans_id)
1769
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1770
                tt.version_file(file_id, e_trans_id)
1771
                trans_id[file_id] = e_trans_id
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1772
        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
1773
        create_entry_executability(tt, entry, e_trans_id)
1774
1711.4.26 by John Arbash Meinel
Fix #45010 correctly. Don't forget the execute bit.
1775
    elif meta_mod:
1776
        tt.set_executability(entry.executable, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1777
    if tt.final_name(e_trans_id) != entry.name:
1778
        adjust_path  = True
1779
    else:
1780
        parent_id = tt.final_parent(e_trans_id)
1781
        parent_file_id = tt.final_file_id(parent_id)
1782
        if parent_file_id != entry.parent_id:
1783
            adjust_path = True
1784
        else:
1785
            adjust_path = False
1786
    if adjust_path:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1787
        parent_trans_id = trans_id_file_id(entry.parent_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1788
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1789
1790
1534.10.28 by Aaron Bentley
Use numbered backup files
1791
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1792
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1793
1794
1795
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1534.10.28 by Aaron Bentley
Use numbered backup files
1796
    """Produce a backup-style name that appears to be available"""
1797
    def name_gen():
1798
        counter = 1
1799
        while True:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1800
            yield "%s.~%d~" % (name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
1801
            counter += 1
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1802
    for new_name in name_gen():
1803
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
1804
            return new_name
1805
1534.10.28 by Aaron Bentley
Use numbered backup files
1806
1534.7.55 by Aaron Bentley
Fixed up the change detection
1807
def _entry_changes(file_id, entry, working_tree):
1534.7.156 by Aaron Bentley
PEP8 fixes
1808
    """Determine in which ways the inventory entry has changed.
1534.7.55 by Aaron Bentley
Fixed up the change detection
1809
1810
    Returns booleans: has_contents, content_mod, meta_mod
1811
    has_contents means there are currently contents, but they differ
1812
    contents_mod means contents need to be modified
1813
    meta_mod means the metadata needs to be modified
1814
    """
1815
    cur_entry = working_tree.inventory[file_id]
1816
    try:
1817
        working_kind = working_tree.kind(file_id)
1818
        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.
1819
    except NoSuchFile:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1820
        has_contents = False
1821
        contents_mod = True
1822
        meta_mod = False
1823
    if has_contents is True:
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1824
        if entry.kind != working_kind:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1825
            contents_mod, meta_mod = True, False
1826
        else:
1827
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1828
                                       working_tree)
1829
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
1830
            cur_entry._forget_tree_state()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1831
    return has_contents, contents_mod, meta_mod
1832
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1833
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1834
def revert(working_tree, target_tree, filenames, backups=False,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1835
           pb=DummyProgress(), change_reporter=None):
1534.7.157 by Aaron Bentley
Added more docs
1836
    """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.
1837
    target_tree.lock_read()
1534.9.7 by Aaron Bentley
Show progress bars in revert
1838
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1839
    try:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1840
        pp = ProgressPhase("Revert phase", 3, pb)
1841
        pp.next_phase()
1842
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1843
        try:
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1844
            merge_modified = _alter_files(working_tree, target_tree, tt,
1845
                                          child_pb, filenames, backups)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1846
        finally:
1847
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1848
        pp.next_phase()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1849
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1850
        try:
1551.19.5 by Aaron Bentley
Fix revert when parent dir is missing
1851
            raw_conflicts = resolve_conflicts(tt, child_pb,
1852
                lambda t, c: conflict_pass(t, c, target_tree))
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1853
        finally:
1854
            child_pb.finished()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1855
        conflicts = cook_conflicts(raw_conflicts, tt)
1551.11.5 by Aaron Bentley
cleanup
1856
        if change_reporter:
1551.10.25 by Aaron Bentley
Make ChangeReporter private
1857
            change_reporter = delta._ChangeReporter(
2255.7.98 by Robert Collins
Merge bzr.dev.
1858
                unversioned_filter=working_tree.is_ignored)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1859
            delta.report_changes(tt.iter_changes(), change_reporter)
1551.11.6 by Aaron Bentley
Emit change listings before conflict warnings
1860
        for conflict in conflicts:
1861
            warning(conflict)
1862
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1863
        tt.apply()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1864
        working_tree.set_merge_modified(merge_modified)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1865
    finally:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1866
        target_tree.unlock()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1867
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1868
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1869
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
1870
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1871
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1872
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
1873
                 backups):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1874
    merge_modified = working_tree.merge_modified()
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1875
    change_list = target_tree.iter_changes(working_tree,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1876
        specific_files=specific_files, pb=pb)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1877
    if target_tree.inventory.root is None:
1878
        skip_root = True
1879
    else:
1880
        skip_root = False
1881
    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.
1882
    try:
2708.1.5 by Aaron Bentley
Use Tree.extract_files_bytes in revert
1883
        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.
1884
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1885
                kind, executable) in enumerate(change_list):
1886
            if skip_root and file_id[0] is not None and parent[0] is None:
1887
                continue
1888
            trans_id = tt.trans_id_file_id(file_id)
1889
            mode_id = None
1890
            if changed_content:
1891
                keep_content = False
1892
                if kind[0] == 'file' and (backups or kind[1] is None):
1893
                    wt_sha1 = working_tree.get_file_sha1(file_id)
1894
                    if merge_modified.get(file_id) != wt_sha1:
2502.1.6 by Aaron Bentley
Update from review comments
1895
                        # acquire the basis tree lazily to prevent the
1896
                        # expense of accessing it when it's not needed ?
1897
                        # (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.
1898
                        if basis_tree is None:
1899
                            basis_tree = working_tree.basis_tree()
1900
                            basis_tree.lock_read()
1901
                        if file_id in basis_tree:
1902
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
1903
                                keep_content = True
1904
                        elif kind[1] is None and not versioned[1]:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1905
                            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.
1906
                if kind[0] is not None:
1907
                    if not keep_content:
1908
                        tt.delete_contents(trans_id)
1909
                    elif kind[1] is not None:
1910
                        parent_trans_id = tt.trans_id_file_id(parent[0])
1911
                        by_parent = tt.by_parent()
1912
                        backup_name = _get_backup_name(name[0], by_parent,
1913
                                                       parent_trans_id, tt)
1914
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
1915
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
1916
                        if versioned == (True, True):
1917
                            tt.unversion_file(trans_id)
1918
                            tt.version_file(file_id, new_trans_id)
1919
                        # New contents should have the same unix perms as old
1920
                        # contents
1921
                        mode_id = trans_id
1922
                        trans_id = new_trans_id
1923
                if kind[1] == 'directory':
1924
                    tt.create_directory(trans_id)
1925
                elif kind[1] == 'symlink':
1926
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1927
                                      trans_id)
1928
                elif kind[1] == 'file':
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1929
                    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
1930
                    if basis_tree is None:
1931
                        basis_tree = working_tree.basis_tree()
1932
                        basis_tree.lock_read()
1933
                    new_sha1 = target_tree.get_file_sha1(file_id)
1934
                    if (file_id in basis_tree and new_sha1 ==
1935
                        basis_tree.get_file_sha1(file_id)):
1936
                        if file_id in merge_modified:
1937
                            del merge_modified[file_id]
1938
                    else:
1939
                        merge_modified[file_id] = new_sha1
1940
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1941
                    # preserve the execute bit when backing up
1942
                    if keep_content and executable[0] == executable[1]:
1943
                        tt.set_executability(executable[1], trans_id)
1944
                else:
1945
                    assert kind[1] is None
1946
            if versioned == (False, True):
1947
                tt.version_file(file_id, trans_id)
1948
            if versioned == (True, False):
1949
                tt.unversion_file(trans_id)
1950
            if (name[1] is not None and 
1951
                (name[0] != name[1] or parent[0] != parent[1])):
1952
                tt.adjust_path(
1953
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
1954
            if executable[0] != executable[1] and kind[1] == "file":
1955
                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
1956
        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
1957
            deferred_files):
1958
            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.
1959
    finally:
1960
        if basis_tree is not None:
1961
            basis_tree.unlock()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
1962
    return merge_modified
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1963
1964
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1965
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1966
    """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
1967
    if pass_func is None:
1968
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1969
    new_conflicts = set()
1534.9.1 by Aaron Bentley
Added progress bars to merge
1970
    try:
1971
        for n in range(10):
1972
            pb.update('Resolution pass', n+1, 10)
1973
            conflicts = tt.find_conflicts()
1974
            if len(conflicts) == 0:
1975
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1976
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
1977
        raise MalformedTransform(conflicts=conflicts)
1978
    finally:
1979
        pb.clear()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1980
1981
2590.2.8 by Aaron Bentley
Restore conflict handling changes
1982
def conflict_pass(tt, conflicts, path_tree=None):
1983
    """Resolve some classes of conflicts.
1984
1985
    :param tt: The transform to resolve conflicts in
1986
    :param conflicts: The conflicts to resolve
1987
    :param path_tree: A Tree to get supplemental paths from
1988
    """
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1989
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1990
    for c_type, conflict in ((c[0], c) for c in conflicts):
1991
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
1992
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1993
            new_conflicts.add((c_type, 'Unversioned existing file',
1994
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1995
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1996
            # files that were renamed take precedence
1997
            final_parent = tt.final_parent(conflict[1])
1998
            if tt.path_changed(conflict[1]):
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
1999
                existing_file, new_file = conflict[2], conflict[1]
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2000
            else:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
2001
                existing_file, new_file = conflict[1], conflict[2]
2002
            new_name = tt.final_name(existing_file)+'.moved'
2003
            tt.adjust_path(new_name, final_parent, existing_file)
2004
            new_conflicts.add((c_type, 'Moved existing file to', 
2005
                               existing_file, new_file))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2006
        elif c_type == 'parent loop':
2007
            # break the loop by undoing one of the ops that caused the loop
2008
            cur = conflict[1]
2009
            while not tt.path_changed(cur):
2010
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2011
            new_conflicts.add((c_type, 'Cancelled move', cur,
2012
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2013
            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
2014
            
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2015
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
2016
            trans_id = conflict[1]
2017
            try:
2018
                tt.cancel_deletion(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
2019
                new_conflicts.add(('deleting parent', 'Not deleting', 
2020
                                   trans_id))
1534.7.128 by Aaron Bentley
Got missing contents test working
2021
            except KeyError:
2022
                tt.create_directory(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
2023
                new_conflicts.add((c_type, 'Created directory', trans_id))
2590.2.8 by Aaron Bentley
Restore conflict handling changes
2024
                try:
2025
                    tt.final_name(trans_id)
2026
                except NoFinalPath:
1551.19.6 by Aaron Bentley
Revert doesn't crash restoring a file from a deleted directory
2027
                    if path_tree is not None:
2028
                        file_id = tt.final_file_id(trans_id)
2029
                        entry = path_tree.inventory[file_id]
2030
                        parent_trans_id = tt.trans_id_file_id(entry.parent_id)
2031
                        tt.adjust_path(entry.name, parent_trans_id, trans_id)
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
2032
        elif c_type == 'unversioned parent':
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
2033
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
2034
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
2035
        elif c_type == 'non-directory parent':
2036
            parent_id = conflict[1]
2037
            parent_parent = tt.final_parent(parent_id)
2038
            parent_name = tt.final_name(parent_id)
2039
            parent_file_id = tt.final_file_id(parent_id)
2040
            new_parent_id = tt.new_directory(parent_name + '.new',
2041
                parent_parent, parent_file_id)
2042
            _reparent_transform_children(tt, parent_id, new_parent_id)
3146.8.19 by Aaron Bentley
Merge with bzr.dev
2043
            if parent_file_id is not None:
2044
                tt.unversion_file(parent_id)
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
2045
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2046
    return new_conflicts
2047
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
2048
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2049
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2050
    """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
2051
    from bzrlib.conflicts import Conflict
2052
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
2053
    return sorted(conflict_iter, key=Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2054
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2055
2056
def iter_cook_conflicts(raw_conflicts, tt):
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2057
    from bzrlib.conflicts import Conflict
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2058
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
2059
    for conflict in raw_conflicts:
2060
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2061
        action = conflict[1]
2062
        modified_path = fp.get_path(conflict[2])
2063
        modified_id = tt.final_file_id(conflict[2])
2064
        if len(conflict) == 3:
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2065
            yield Conflict.factory(c_type, action=action, path=modified_path,
2066
                                     file_id=modified_id)
2067
             
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
2068
        else:
2069
            conflicting_path = fp.get_path(conflict[3])
2070
            conflicting_id = tt.final_file_id(conflict[3])
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
2071
            yield Conflict.factory(c_type, action=action, path=modified_path,
2072
                                   file_id=modified_id, 
2073
                                   conflict_path=conflicting_path,
2074
                                   conflict_file_id=conflicting_id)
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2075
2076
2077
class _FileMover(object):
2733.2.9 by Aaron Bentley
Update docstrings
2078
    """Moves and deletes files for TreeTransform, tracking operations"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2079
2080
    def __init__(self):
2081
        self.past_renames = []
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2082
        self.pending_deletions = []
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2083
2084
    def rename(self, from_, to):
2733.2.9 by Aaron Bentley
Update docstrings
2085
        """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).
2086
        try:
2087
            os.rename(from_, to)
2088
        except OSError, e:
3063.1.3 by Aaron Bentley
Update for Linux
2089
            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).
2090
                raise errors.FileExists(to, str(e))
2091
            raise
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2092
        self.past_renames.append((from_, to))
2093
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2094
    def pre_delete(self, from_, to):
2733.2.9 by Aaron Bentley
Update docstrings
2095
        """Rename a file out of the way and mark it for deletion.
2096
2097
        Unlike os.unlink, this works equally well for files and directories.
2098
        :param from_: The current file path
2099
        :param to: A temporary path for the file
2100
        """
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2101
        self.rename(from_, to)
2102
        self.pending_deletions.append(to)
2103
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2104
    def rollback(self):
2733.2.9 by Aaron Bentley
Update docstrings
2105
        """Reverse all renames that have been performed"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
2106
        for from_, to in reversed(self.past_renames):
2107
            os.rename(to, from_)
2733.2.12 by Aaron Bentley
Updates from review
2108
        # after rollback, don't reuse _FileMover
2109
        past_renames = None
2110
        pending_deletions = None
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2111
2112
    def apply_deletions(self):
2733.2.9 by Aaron Bentley
Update docstrings
2113
        """Apply all marked deletions"""
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
2114
        for path in self.pending_deletions:
2115
            delete_any(path)
2733.2.12 by Aaron Bentley
Updates from review
2116
        # after apply_deletions, don't reuse _FileMover
2117
        past_renames = None
2118
        pending_deletions = None