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