/brz/remove-bazaar

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