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