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