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