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