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