~bzr-pqm/bzr/bzr.dev

5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2006-2011 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
4934.1.1 by John Arbash Meinel
Basic implementation for windows and bug #488724.
20
import time
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
21
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
22
from bzrlib import (
23
    errors,
24
    lazy_import,
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
25
    registry,
5753.2.3 by Jelmer Vernooij
Fix transform tests.
26
    trace,
5579.3.1 by Jelmer Vernooij
Remove unused imports.
27
    tree,
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
28
    )
29
lazy_import.lazy_import(globals(), """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
30
from bzrlib import (
3363.2.33 by Aaron Bentley
Implement PreviewTree.annotate_iter
31
    annotate,
2694.5.4 by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py.
32
    bencode,
6207.3.3 by jelmer at samba
Fix tests and the like.
33
    controldir,
5162.4.1 by Aaron Bentley
TreeTransform supports normal commit parameters and includes branch nick.
34
    commit,
5988.2.1 by Vincent Ladeuil
Do not generate path conflicts if a corresponding content conflict exists
35
    conflicts,
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
36
    delta,
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
37
    inventory,
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
38
    multiparent,
3596.2.6 by John Arbash Meinel
Turns out that osutils wasn't imported directly into transform
39
    osutils,
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
40
    revision as _mod_revision,
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
41
    ui,
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
42
    urlutils,
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
43
    )
6138.4.2 by Jonathan Riddell
add import gettext
44
from bzrlib.i18n import gettext
1551.11.12 by Aaron Bentley
Changes from review
45
""")
6220.4.1 by Jelmer Vernooij
Some cleanups in bzrlib.transform.
46
from bzrlib.errors import (DuplicateKey, MalformedTransform,
5121.2.4 by Jelmer Vernooij
Remove more unused imports.
47
                           ReusingTransform, 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)
48
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
                           UnableCreateSymlink)
3368.2.19 by Ian Clatworthy
first round of changes from abentley's review
50
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
3363.2.19 by Aaron Bentley
Make PreviewTree.path2id correct
51
from bzrlib.osutils import (
52
    delete_any,
53
    file_kind,
54
    has_symlinks,
55
    pathjoin,
3363.15.4 by Aaron Bentley
Implement PreviewTree.get_file_sha1 properly
56
    sha_file,
3363.2.19 by Aaron Bentley
Make PreviewTree.path2id correct
57
    splitpath,
58
    supports_executable,
5579.3.1 by Jelmer Vernooij
Remove unused imports.
59
    )
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
60
from bzrlib.progress import ProgressPhase
2687.2.1 by Martin Pool
Rename upcoming release from 0.19 to 0.90
61
from bzrlib.symbol_versioning import (
5579.3.1 by Jelmer Vernooij
Remove unused imports.
62
    deprecated_function,
63
    deprecated_in,
64
    deprecated_method,
65
    )
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
66
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
67
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
68
ROOT_PARENT = "root-parent"
69
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
70
def unique_add(map, key, value):
71
    if key in map:
1534.7.5 by Aaron Bentley
Got unique_add under test
72
        raise DuplicateKey(key=key)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
73
    map[key] = value
74
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
75
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
76
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
77
class _TransformResults(object):
2502.1.5 by Aaron Bentley
Cleanup
78
    def __init__(self, modified_paths, rename_count):
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
79
        object.__init__(self)
80
        self.modified_paths = modified_paths
2502.1.5 by Aaron Bentley
Cleanup
81
        self.rename_count = rename_count
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
82
83
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
84
class TreeTransformBase(object):
4354.5.4 by Aaron Bentley
Update docs
85
    """The base class for TreeTransform and its kin."""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
86
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
87
    def __init__(self, tree, pb=None,
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
88
                 case_sensitive=True):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
89
        """Constructor.
90
91
        :param tree: The tree that will be transformed, but not necessarily
92
            the output tree.
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
93
        :param pb: ignored
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
94
        :param case_sensitive: If True, the target of the transform is
95
            case sensitive, not just case preserving.
96
        """
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
97
        object.__init__(self)
98
        self._tree = tree
99
        self._id_number = 0
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
100
        # mapping of trans_id -> new basename
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
101
        self._new_name = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
102
        # mapping of trans_id -> new parent trans_id
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
103
        self._new_parent = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
104
        # mapping of trans_id with new contents -> new file_kind
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
105
        self._new_contents = {}
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
106
        # mapping of trans_id => (sha1 of content, stat_value)
107
        self._observed_sha1s = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
108
        # Set of trans_ids whose contents will be removed
1534.7.34 by Aaron Bentley
Proper conflicts for removals
109
        self._removed_contents = set()
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
110
        # Mapping of trans_id -> new execute-bit value
1534.7.25 by Aaron Bentley
Added set_executability
111
        self._new_executability = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
112
        # Mapping of trans_id -> new tree-reference value
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
113
        self._new_reference_revision = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
114
        # Mapping of trans_id -> new file_id
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
115
        self._new_id = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
116
        # Mapping of old file-id -> trans_id
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
117
        self._non_present_ids = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
118
        # Mapping of new file_id -> trans_id
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
119
        self._r_new_id = {}
3981.1.1 by Robert Collins
Fix bug 319790 - unshelve of deleted paths failing.
120
        # Set of trans_ids that will be removed
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
121
        self._removed_id = set()
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
122
        # Mapping of path in old tree -> trans_id
1534.7.7 by Aaron Bentley
Added support for all-file path ids
123
        self._tree_path_ids = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
124
        # Mapping trans_id -> path in old tree
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
125
        self._tree_id_paths = {}
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
126
        # The trans_id that will be used as the tree root
3363.2.16 by Aaron Bentley
Fix root directory creation
127
        root_id = tree.get_root_id()
128
        if root_id is not None:
129
            self._new_root = self.trans_id_tree_file_id(root_id)
130
        else:
131
            self._new_root = None
4597.14.2 by Vincent Ladeuil
Implements --take-this and --take-other when resolving text conflicts
132
        # Indicator of whether the transform has been applied
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
133
        self._done = False
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
134
        # A progress bar
1534.9.1 by Aaron Bentley
Added progress bars to merge
135
        self._pb = pb
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
136
        # Whether the target is case sensitive
137
        self._case_sensitive_target = case_sensitive
1551.19.1 by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson
138
        # A counter of how many files have been renamed
2502.1.1 by Aaron Bentley
Ensure renames only root children are renamed when building trees
139
        self.rename_count = 0
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
140
5954.2.1 by Aaron Bentley
Make Transform a Context Manager.
141
    def __enter__(self):
142
        """Support Context Manager API."""
143
        return self
144
145
    def __exit__(self, exc_type, exc_val, exc_tb):
146
        """Support Context Manager API."""
147
        self.finalize()
148
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
149
    def finalize(self):
150
        """Release the working tree lock, if held.
151
152
        This is required if apply has not been invoked, but can be invoked
153
        even after apply.
154
        """
155
        if self._tree is None:
156
            return
157
        self._tree.unlock()
158
        self._tree = None
159
1534.7.132 by Aaron Bentley
Got cooked conflicts working
160
    def __get_root(self):
161
        return self._new_root
162
163
    root = property(__get_root)
164
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
165
    def _assign_id(self):
166
        """Produce a new tranform id"""
167
        new_id = "new-%s" % self._id_number
168
        self._id_number +=1
169
        return new_id
170
171
    def create_path(self, name, parent):
172
        """Assign a transaction id to a new path"""
173
        trans_id = self._assign_id()
174
        unique_add(self._new_name, trans_id, name)
175
        unique_add(self._new_parent, trans_id, parent)
176
        return trans_id
177
1534.7.6 by Aaron Bentley
Added conflict handling
178
    def adjust_path(self, name, parent, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
179
        """Change the path that is assigned to a transaction id."""
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
180
        if parent is None:
181
            raise ValueError("Parent trans-id may not be None")
1534.7.66 by Aaron Bentley
Ensured we don't accidentally move the root directory
182
        if trans_id == self._new_root:
183
            raise CantMoveRoot
1534.7.6 by Aaron Bentley
Added conflict handling
184
        self._new_name[trans_id] = name
185
        self._new_parent[trans_id] = parent
186
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
187
    def adjust_root_path(self, name, parent):
188
        """Emulate moving the root by moving all children, instead.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
189
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
190
        We do this by undoing the association of root's transaction id with the
191
        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
192
        transaction id.  We unversion the root directory and version the
1534.7.69 by Aaron Bentley
Got real root moves working
193
        physically new directory, and hope someone versions the tree root
194
        later.
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
195
        """
196
        old_root = self._new_root
197
        old_root_file_id = self.final_file_id(old_root)
198
        # force moving all children of root
199
        for child_id in self.iter_tree_children(old_root):
200
            if child_id != parent:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
201
                self.adjust_path(self.final_name(child_id),
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
202
                                 self.final_parent(child_id), child_id)
1534.7.69 by Aaron Bentley
Got real root moves working
203
            file_id = self.final_file_id(child_id)
204
            if file_id is not None:
205
                self.unversion_file(child_id)
206
            self.version_file(file_id, child_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
207
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
208
        # the physical root needs a new transaction id
209
        self._tree_path_ids.pop("")
210
        self._tree_id_paths.pop(old_root)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
211
        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
212
        if parent == old_root:
213
            parent = self._new_root
214
        self.adjust_path(name, parent, old_root)
215
        self.create_directory(old_root)
1534.7.69 by Aaron Bentley
Got real root moves working
216
        self.version_file(old_root_file_id, old_root)
217
        self.unversion_file(self._new_root)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
218
5993.2.4 by Jelmer Vernooij
Remove feature flag.
219
    def fixup_new_roots(self):
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
220
        """Reinterpret requests to change the root directory
221
222
        Instead of creating a root directory, or moving an existing directory,
223
        all the attributes and children of the new root are applied to the
224
        existing root directory.
225
226
        This means that the old root trans-id becomes obsolete, so it is
227
        recommended only to invoke this after the root trans-id has become
228
        irrelevant.
5993.2.3 by Jelmer Vernooij
Update NEWS, consistently use require_tree_root as argument everywhere.
229
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
230
        """
231
        new_roots = [k for k, v in self._new_parent.iteritems() if v is
232
                     ROOT_PARENT]
233
        if len(new_roots) < 1:
234
            return
235
        if len(new_roots) != 1:
236
            raise ValueError('A tree cannot have two roots!')
237
        if self._new_root is None:
238
            self._new_root = new_roots[0]
239
            return
240
        old_new_root = new_roots[0]
241
        # unversion the new root's directory.
6011.1.1 by Aaron Bentley
Merging an unrelated tree retains root.
242
        if self.final_kind(self._new_root) is None:
243
            file_id = self.final_file_id(old_new_root)
244
        else:
245
            file_id = self.final_file_id(self._new_root)
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
246
        if old_new_root in self._new_id:
247
            self.cancel_versioning(old_new_root)
248
        else:
249
            self.unversion_file(old_new_root)
250
        # if, at this stage, root still has an old file_id, zap it so we can
251
        # stick a new one in.
252
        if (self.tree_file_id(self._new_root) is not None and
253
            self._new_root not in self._removed_id):
254
            self.unversion_file(self._new_root)
5954.4.2 by Aaron Bentley
Support merging into null tree.
255
        if file_id is not None:
256
            self.version_file(file_id, self._new_root)
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
257
258
        # Now move children of new root into old root directory.
259
        # Ensure all children are registered with the transaction, but don't
260
        # use directly-- some tree children have new parents
261
        list(self.iter_tree_children(old_new_root))
262
        # Move all children of new root into old root directory.
263
        for child in self.by_parent().get(old_new_root, []):
264
            self.adjust_path(self.final_name(child), self._new_root, child)
265
266
        # Ensure old_new_root has no directory.
267
        if old_new_root in self._new_contents:
268
            self.cancel_creation(old_new_root)
269
        else:
270
            self.delete_contents(old_new_root)
271
272
        # prevent deletion of root directory.
273
        if self._new_root in self._removed_contents:
274
            self.cancel_deletion(self._new_root)
275
276
        # destroy path info for old_new_root.
277
        del self._new_parent[old_new_root]
278
        del self._new_name[old_new_root]
279
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
280
    def trans_id_tree_file_id(self, inventory_id):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
281
        """Determine the transaction id of a working tree file.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
282
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
283
        This reflects only files that already exist, not ones that will be
284
        added by transactions.
285
        """
3363.2.16 by Aaron Bentley
Fix root directory creation
286
        if inventory_id is None:
287
            raise ValueError('None is not a valid file id')
3146.8.1 by Aaron Bentley
Fix two tree.inventory uses in checkout
288
        path = self._tree.id2path(inventory_id)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
289
        return self.trans_id_tree_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
290
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
291
    def trans_id_file_id(self, file_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
292
        """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
293
        A new id is only created for file_ids that were never present.  If
294
        a transaction has been unversioned, it is deliberately still returned.
295
        (this will likely lead to an unversioned parent conflict.)
296
        """
3363.2.16 by Aaron Bentley
Fix root directory creation
297
        if file_id is None:
298
            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
299
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
300
            return self._r_new_id[file_id]
301
        else:
3363.17.1 by Aaron Bentley
Avoid inventory for merge and transform code
302
            try:
303
                self._tree.iter_entries_by_dir([file_id]).next()
304
            except StopIteration:
305
                if file_id in self._non_present_ids:
306
                    return self._non_present_ids[file_id]
307
                else:
308
                    trans_id = self._assign_id()
309
                    self._non_present_ids[file_id] = trans_id
310
                    return trans_id
311
            else:
312
                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
313
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
314
    def trans_id_tree_path(self, path):
1534.7.7 by Aaron Bentley
Added support for all-file path ids
315
        """Determine (and maybe set) the transaction ID for a tree path."""
1534.7.12 by Aaron Bentley
Added canonical_path function
316
        path = self.canonical_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
317
        if path not in self._tree_path_ids:
318
            self._tree_path_ids[path] = self._assign_id()
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
319
            self._tree_id_paths[self._tree_path_ids[path]] = path
1534.7.7 by Aaron Bentley
Added support for all-file path ids
320
        return self._tree_path_ids[path]
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
321
1534.7.16 by Aaron Bentley
Added get_tree_parent
322
    def get_tree_parent(self, trans_id):
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
323
        """Determine id of the parent in the tree."""
1534.7.16 by Aaron Bentley
Added get_tree_parent
324
        path = self._tree_id_paths[trans_id]
325
        if path == "":
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
326
            return ROOT_PARENT
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
327
        return self.trans_id_tree_path(os.path.dirname(path))
1534.7.16 by Aaron Bentley
Added get_tree_parent
328
1534.7.34 by Aaron Bentley
Proper conflicts for removals
329
    def delete_contents(self, trans_id):
330
        """Schedule the contents of a path entry for deletion"""
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
331
        kind = self.tree_kind(trans_id)
332
        if kind is not None:
333
            self._removed_contents.add(trans_id)
1534.7.34 by Aaron Bentley
Proper conflicts for removals
334
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
335
    def cancel_deletion(self, trans_id):
336
        """Cancel a scheduled deletion"""
337
        self._removed_contents.remove(trans_id)
338
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
339
    def unversion_file(self, trans_id):
340
        """Schedule a path entry to become unversioned"""
341
        self._removed_id.add(trans_id)
342
343
    def delete_versioned(self, trans_id):
344
        """Delete and unversion a versioned file"""
345
        self.delete_contents(trans_id)
346
        self.unversion_file(trans_id)
347
1534.7.25 by Aaron Bentley
Added set_executability
348
    def set_executability(self, executability, trans_id):
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
349
        """Schedule setting of the 'execute' bit
350
        To unschedule, set to None
351
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
352
        if executability is None:
353
            del self._new_executability[trans_id]
354
        else:
355
            unique_add(self._new_executability, trans_id, executability)
1534.7.25 by Aaron Bentley
Added set_executability
356
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
357
    def set_tree_reference(self, revision_id, trans_id):
358
        """Set the reference associated with a directory"""
359
        unique_add(self._new_reference_revision, trans_id, revision_id)
360
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
361
    def version_file(self, file_id, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
362
        """Schedule a file to become versioned."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
363
        if file_id is None:
364
            raise ValueError()
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
365
        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
366
        unique_add(self._r_new_id, file_id, trans_id)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
367
1534.7.105 by Aaron Bentley
Got merge with rename working
368
    def cancel_versioning(self, trans_id):
369
        """Undo a previous versioning of a file"""
370
        file_id = self._new_id[trans_id]
371
        del self._new_id[trans_id]
372
        del self._r_new_id[file_id]
373
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
374
    def new_paths(self, filesystem_only=False):
375
        """Determine the paths of all new and changed files.
376
3453.2.11 by Aaron Bentley
Updates from review
377
        :param filesystem_only: if True, only calculate values for files
378
            that require renames or execute bit changes.
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
379
        """
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
380
        new_ids = set()
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
381
        if filesystem_only:
3619.2.11 by Aaron Bentley
Tweak new_paths logic
382
            stale_ids = self._needs_rename.difference(self._new_name)
383
            stale_ids.difference_update(self._new_parent)
384
            stale_ids.difference_update(self._new_contents)
385
            stale_ids.difference_update(self._new_id)
386
            needs_rename = self._needs_rename.difference(stale_ids)
3619.2.10 by Aaron Bentley
Compensate for stale entries in TT._needs_rename
387
            id_sets = (needs_rename, self._new_executability)
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
388
        else:
389
            id_sets = (self._new_name, self._new_parent, self._new_contents,
390
                       self._new_id, self._new_executability)
391
        for id_set in id_sets:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
392
            new_ids.update(id_set)
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
393
        return sorted(FinalPaths(self).get_paths(new_ids))
1534.7.6 by Aaron Bentley
Added conflict handling
394
3619.2.6 by Aaron Bentley
More tweaking
395
    def _inventory_altered(self):
5954.2.6 by Aaron Bentley
Updates from discussion.
396
        """Determine which trans_ids need new Inventory entries.
397
398
        An new entry is needed when anything that would be reflected by an
399
        inventory entry changes, including file name, file_id, parent file_id,
400
        file kind, and the execute bit.
401
402
        Some care is taken to return entries with real changes, not cases
403
        where the value is deleted and then restored to its original value,
404
        but some actually unchanged values may be returned.
5954.3.1 by Vincent Ladeuil
Try to document _inventory_altered.
405
406
        :returns: A list of (path, trans_id) for all items requiring an
407
            inventory change. Ordered by path.
408
        """
5954.2.6 by Aaron Bentley
Updates from discussion.
409
        changed_ids = set()
410
        # Find entries whose file_ids are new (or changed).
411
        new_file_id = set(t for t in self._new_id
412
                          if self._new_id[t] != self.tree_file_id(t))
413
        for id_set in [self._new_name, self._new_parent, new_file_id,
3619.2.6 by Aaron Bentley
More tweaking
414
                       self._new_executability]:
5954.2.6 by Aaron Bentley
Updates from discussion.
415
            changed_ids.update(id_set)
5954.3.1 by Vincent Ladeuil
Try to document _inventory_altered.
416
        # removing implies a kind change
3619.2.5 by Aaron Bentley
Reduce set tests
417
        changed_kind = set(self._removed_contents)
5954.3.1 by Vincent Ladeuil
Try to document _inventory_altered.
418
        # so does adding
3619.2.5 by Aaron Bentley
Reduce set tests
419
        changed_kind.intersection_update(self._new_contents)
5954.2.6 by Aaron Bentley
Updates from discussion.
420
        # Ignore entries that are already known to have changed.
421
        changed_kind.difference_update(changed_ids)
422
        #  to keep only the truly changed ones
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
423
        changed_kind = (t for t in changed_kind
424
                        if self.tree_kind(t) != self.final_kind(t))
5954.3.1 by Vincent Ladeuil
Try to document _inventory_altered.
425
        # all kind changes will alter the inventory
5954.2.6 by Aaron Bentley
Updates from discussion.
426
        changed_ids.update(changed_kind)
427
        # To find entries with changed parent_ids, find parents which existed,
428
        # but changed file_id.
429
        changed_file_id = set(t for t in new_file_id if t in self._removed_id)
430
        # Now add all their children to the set.
431
        for parent_trans_id in new_file_id:
432
            changed_ids.update(self.iter_tree_children(parent_trans_id))
433
        return sorted(FinalPaths(self).get_paths(changed_ids))
3619.2.5 by Aaron Bentley
Reduce set tests
434
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
435
    def final_kind(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
436
        """Determine the final file kind, after any changes applied.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
437
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
438
        :return: None if the file does not exist/has no contents.  (It is
439
            conceivable that a path would be created without the corresponding
440
            contents insertion command)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
441
        """
442
        if trans_id in self._new_contents:
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
443
            return self._new_contents[trans_id]
1534.7.34 by Aaron Bentley
Proper conflicts for removals
444
        elif trans_id in self._removed_contents:
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
445
            return None
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
446
        else:
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
447
            return self.tree_kind(trans_id)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
448
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
449
    def tree_file_id(self, trans_id):
1534.7.41 by Aaron Bentley
Got inventory ID movement working
450
        """Determine the file id associated with the trans_id in the tree"""
451
        try:
452
            path = self._tree_id_paths[trans_id]
453
        except KeyError:
454
            # the file is a new, unversioned file, or invalid trans_id
455
            return None
456
        # the file is old; the old id is still valid
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
457
        if self._new_root == trans_id:
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
458
            return self._tree.get_root_id()
3363.17.5 by Aaron Bentley
Update merge to not use inventory
459
        return self._tree.path2id(path)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
460
1534.7.13 by Aaron Bentley
Implemented final_file_id
461
    def final_file_id(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
462
        """Determine the file id after any changes are applied, or None.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
463
1534.7.21 by Aaron Bentley
Updated docstrings
464
        None indicates that the file will not be versioned after changes are
465
        applied.
466
        """
1534.7.13 by Aaron Bentley
Implemented final_file_id
467
        try:
468
            return self._new_id[trans_id]
469
        except KeyError:
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
470
            if trans_id in self._removed_id:
471
                return None
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
472
        return self.tree_file_id(trans_id)
1534.7.13 by Aaron Bentley
Implemented final_file_id
473
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
474
    def inactive_file_id(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
475
        """Return the inactive file_id associated with a transaction id.
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
476
        That is, the one in the tree or in non_present_ids.
477
        The file_id may actually be active, too.
478
        """
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
479
        file_id = self.tree_file_id(trans_id)
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
480
        if file_id is not None:
481
            return file_id
482
        for key, value in self._non_present_ids.iteritems():
483
            if value == trans_id:
484
                return key
485
1534.7.17 by Aaron Bentley
Added final_parent function
486
    def final_parent(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
487
        """Determine the parent file_id, after any changes are applied.
1534.7.21 by Aaron Bentley
Updated docstrings
488
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
489
        ROOT_PARENT is returned for the tree root.
1534.7.21 by Aaron Bentley
Updated docstrings
490
        """
1534.7.17 by Aaron Bentley
Added final_parent function
491
        try:
492
            return self._new_parent[trans_id]
493
        except KeyError:
494
            return self.get_tree_parent(trans_id)
495
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
496
    def final_name(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
497
        """Determine the final filename, after all changes are applied."""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
498
        try:
499
            return self._new_name[trans_id]
500
        except KeyError:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
501
            try:
502
                return os.path.basename(self._tree_id_paths[trans_id])
503
            except KeyError:
504
                raise NoFinalPath(trans_id, self)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
505
1534.10.28 by Aaron Bentley
Use numbered backup files
506
    def by_parent(self):
1534.7.40 by Aaron Bentley
Updated docs
507
        """Return a map of parent: children for known parents.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
508
1534.7.40 by Aaron Bentley
Updated docs
509
        Only new paths and parents of tree files with assigned ids are used.
510
        """
1534.7.6 by Aaron Bentley
Added conflict handling
511
        by_parent = {}
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
512
        items = list(self._new_parent.iteritems())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
513
        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.
514
                      self._tree_id_paths.keys())
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
515
        for trans_id, parent_id in items:
1534.7.6 by Aaron Bentley
Added conflict handling
516
            if parent_id not in by_parent:
517
                by_parent[parent_id] = set()
518
            by_parent[parent_id].add(trans_id)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
519
        return by_parent
1534.7.11 by Aaron Bentley
Refactored conflict handling
520
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
521
    def path_changed(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
522
        """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)
523
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
524
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
525
    def new_contents(self, trans_id):
526
        return (trans_id in self._new_contents)
527
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
528
    def find_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
529
        """Find any violations of inventory or filesystem invariants"""
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
530
        if self._done is True:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
531
            raise ReusingTransform()
532
        conflicts = []
533
        # ensure all children of all existent parents are known
534
        # all children of non-existent parents are known, by definition.
535
        self._add_tree_children()
1534.10.28 by Aaron Bentley
Use numbered backup files
536
        by_parent = self.by_parent()
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
537
        conflicts.extend(self._unversioned_parents(by_parent))
1534.7.19 by Aaron Bentley
Added tests for parent loops
538
        conflicts.extend(self._parent_loops())
1534.7.11 by Aaron Bentley
Refactored conflict handling
539
        conflicts.extend(self._duplicate_entries(by_parent))
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
540
        conflicts.extend(self._duplicate_ids())
1534.7.11 by Aaron Bentley
Refactored conflict handling
541
        conflicts.extend(self._parent_type_conflicts(by_parent))
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
542
        conflicts.extend(self._improper_versioning())
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
543
        conflicts.extend(self._executability_conflicts())
1534.7.152 by Aaron Bentley
Fixed overwrites
544
        conflicts.extend(self._overwrite_conflicts())
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
545
        return conflicts
546
4526.8.6 by Aaron Bentley
Check for malformed transforms before committing.
547
    def _check_malformed(self):
548
        conflicts = self.find_conflicts()
549
        if len(conflicts) != 0:
550
            raise MalformedTransform(conflicts=conflicts)
551
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
552
    def _add_tree_children(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
553
        """Add all the children of all active parents to the known paths.
1534.7.40 by Aaron Bentley
Updated docs
554
555
        Active parents are those which gain children, and those which are
556
        removed.  This is a necessary first step in detecting conflicts.
557
        """
1534.10.28 by Aaron Bentley
Use numbered backup files
558
        parents = self.by_parent().keys()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
559
        parents.extend([t for t in self._removed_contents if
1534.7.34 by Aaron Bentley
Proper conflicts for removals
560
                        self.tree_kind(t) == 'directory'])
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
561
        for trans_id in self._removed_id:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
562
            file_id = self.tree_file_id(trans_id)
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
563
            if file_id is not None:
6220.4.1 by Jelmer Vernooij
Some cleanups in bzrlib.transform.
564
                if self._tree.stored_kind(file_id) == 'directory':
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
565
                    parents.append(trans_id)
566
            elif self.tree_kind(trans_id) == 'directory':
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
567
                parents.append(trans_id)
568
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
569
        for parent_id in parents:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
570
            # ensure that all children are registered with the transaction
571
            list(self.iter_tree_children(parent_id))
572
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
573
    @deprecated_method(deprecated_in((2, 3, 0)))
1534.10.28 by Aaron Bentley
Use numbered backup files
574
    def has_named_child(self, by_parent, parent_id, name):
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
575
        return self._has_named_child(
576
            name, parent_id, known_children=by_parent.get(parent_id, []))
577
578
    def _has_named_child(self, name, parent_id, known_children):
579
        """Does a parent already have a name child.
580
581
        :param name: The searched for name.
582
583
        :param parent_id: The parent for which the check is made.
584
585
        :param known_children: The already known children. This should have
586
            been recently obtained from `self.by_parent.get(parent_id)`
587
            (or will be if None is passed).
588
        """
589
        if known_children is None:
590
            known_children = self.by_parent().get(parent_id, [])
591
        for child in known_children:
1534.10.28 by Aaron Bentley
Use numbered backup files
592
            if self.final_name(child) == name:
593
                return True
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
594
        parent_path = self._tree_id_paths.get(parent_id, None)
595
        if parent_path is None:
596
            # No parent... no children
1534.10.28 by Aaron Bentley
Use numbered backup files
597
            return False
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
598
        child_path = joinpath(parent_path, name)
599
        child_id = self._tree_path_ids.get(child_path, None)
1534.10.28 by Aaron Bentley
Use numbered backup files
600
        if child_id is None:
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
601
            # Not known by the tree transform yet, check the filesystem
602
            return osutils.lexists(self._tree.abspath(child_path))
1534.10.28 by Aaron Bentley
Use numbered backup files
603
        else:
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
604
            raise AssertionError('child_id is missing: %s, %s, %s'
605
                                 % (name, parent_id, child_id))
606
607
    def _available_backup_name(self, name, target_id):
608
        """Find an available backup name.
609
610
        :param name: The basename of the file.
611
612
        :param target_id: The directory trans_id where the backup should 
613
            be placed.
614
        """
615
        known_children = self.by_parent().get(target_id, [])
616
        return osutils.available_backup_name(
617
            name,
618
            lambda base: self._has_named_child(
619
                base, target_id, known_children))
1534.10.28 by Aaron Bentley
Use numbered backup files
620
1534.7.19 by Aaron Bentley
Added tests for parent loops
621
    def _parent_loops(self):
622
        """No entry should be its own ancestor"""
623
        conflicts = []
624
        for trans_id in self._new_parent:
625
            seen = set()
626
            parent_id = trans_id
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
627
            while parent_id is not ROOT_PARENT:
1534.7.19 by Aaron Bentley
Added tests for parent loops
628
                seen.add(parent_id)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
629
                try:
630
                    parent_id = self.final_parent(parent_id)
631
                except KeyError:
632
                    break
1534.7.19 by Aaron Bentley
Added tests for parent loops
633
                if parent_id == trans_id:
634
                    conflicts.append(('parent loop', trans_id))
635
                if parent_id in seen:
636
                    break
637
        return conflicts
638
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
639
    def _unversioned_parents(self, by_parent):
640
        """If parent directories are versioned, children must be versioned."""
641
        conflicts = []
642
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
643
            if parent_id is ROOT_PARENT:
644
                continue
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
645
            if self.final_file_id(parent_id) is not None:
646
                continue
647
            for child_id in children:
648
                if self.final_file_id(child_id) is not None:
649
                    conflicts.append(('unversioned parent', parent_id))
650
                    break;
651
        return conflicts
652
653
    def _improper_versioning(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
654
        """Cannot version a file with no contents, or a bad type.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
655
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
656
        However, existing entries with no contents are okay.
657
        """
658
        conflicts = []
659
        for trans_id in self._new_id.iterkeys():
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
660
            kind = self.final_kind(trans_id)
661
            if kind is None:
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
662
                conflicts.append(('versioning no contents', trans_id))
663
                continue
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
664
            if not inventory.InventoryEntry.versionable_kind(kind):
1534.7.20 by Aaron Bentley
Added directory handling
665
                conflicts.append(('versioning bad kind', trans_id, kind))
1534.7.11 by Aaron Bentley
Refactored conflict handling
666
        return conflicts
667
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
668
    def _executability_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
669
        """Check for bad executability changes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
670
1534.7.40 by Aaron Bentley
Updated docs
671
        Only versioned files may have their executability set, because
672
        1. only versioned entries can have executability under windows
673
        2. only files can be executable.  (The execute bit on a directory
674
           does not indicate searchability)
675
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
676
        conflicts = []
677
        for trans_id in self._new_executability:
678
            if self.final_file_id(trans_id) is None:
679
                conflicts.append(('unversioned executability', trans_id))
1534.7.34 by Aaron Bentley
Proper conflicts for removals
680
            else:
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
681
                if self.final_kind(trans_id) != "file":
1534.7.34 by Aaron Bentley
Proper conflicts for removals
682
                    conflicts.append(('non-file executability', trans_id))
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
683
        return conflicts
684
1534.7.152 by Aaron Bentley
Fixed overwrites
685
    def _overwrite_conflicts(self):
686
        """Check for overwrites (not permitted on Win32)"""
687
        conflicts = []
688
        for trans_id in self._new_contents:
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
689
            if self.tree_kind(trans_id) is None:
1534.7.152 by Aaron Bentley
Fixed overwrites
690
                continue
691
            if trans_id not in self._removed_contents:
692
                conflicts.append(('overwrite', trans_id,
693
                                 self.final_name(trans_id)))
694
        return conflicts
695
1534.7.11 by Aaron Bentley
Refactored conflict handling
696
    def _duplicate_entries(self, by_parent):
697
        """No directory may have two entries with the same name."""
698
        conflicts = []
2590.2.16 by Aaron Bentley
Shortcut duplicate_entries conflict check if no new names introduced
699
        if (self._new_name, self._new_parent) == ({}, {}):
700
            return conflicts
1534.7.6 by Aaron Bentley
Added conflict handling
701
        for children in by_parent.itervalues():
5050.51.1 by Vincent Ladeuil
Don't crash when --take-other (or --take-this) is called for a text conflict
702
            name_ids = []
703
            for child_tid in children:
704
                name = self.final_name(child_tid)
705
                if name is not None:
706
                    # Keep children only if they still exist in the end
707
                    if not self._case_sensitive_target:
708
                        name = name.lower()
709
                    name_ids.append((name, child_tid))
1534.7.6 by Aaron Bentley
Added conflict handling
710
            name_ids.sort()
711
            last_name = None
712
            last_trans_id = None
713
            for name, trans_id in name_ids:
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
714
                kind = self.final_kind(trans_id)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
715
                file_id = self.final_file_id(trans_id)
716
                if kind is None and file_id is None:
717
                    continue
1534.7.6 by Aaron Bentley
Added conflict handling
718
                if name == last_name:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
719
                    conflicts.append(('duplicate', last_trans_id, trans_id,
720
                    name))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
721
                last_name = name
722
                last_trans_id = trans_id
1534.7.11 by Aaron Bentley
Refactored conflict handling
723
        return conflicts
724
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
725
    def _duplicate_ids(self):
726
        """Each inventory id may only be used once"""
727
        conflicts = []
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
728
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
729
                                self._removed_id))
3146.8.16 by Aaron Bentley
Updates from review
730
        all_ids = self._tree.all_file_ids()
731
        active_tree_ids = all_ids.difference(removed_tree_ids)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
732
        for trans_id, file_id in self._new_id.iteritems():
733
            if file_id in active_tree_ids:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
734
                old_trans_id = self.trans_id_tree_file_id(file_id)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
735
                conflicts.append(('duplicate id', old_trans_id, trans_id))
736
        return conflicts
737
1534.7.11 by Aaron Bentley
Refactored conflict handling
738
    def _parent_type_conflicts(self, by_parent):
5540.3.1 by Vincent Ladeuil
Fix spurious orphan reports.
739
        """Children must have a directory parent"""
1534.7.11 by Aaron Bentley
Refactored conflict handling
740
        conflicts = []
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
741
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
742
            if parent_id is ROOT_PARENT:
743
                continue
5540.3.2 by Vincent Ladeuil
Better name for the local variable/
744
            no_children = True
5540.3.1 by Vincent Ladeuil
Fix spurious orphan reports.
745
            for child_id in children:
746
                if self.final_kind(child_id) is not None:
5540.3.2 by Vincent Ladeuil
Better name for the local variable/
747
                    no_children = False
5540.3.1 by Vincent Ladeuil
Fix spurious orphan reports.
748
                    break
5540.3.2 by Vincent Ladeuil
Better name for the local variable/
749
            if no_children:
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
750
                continue
5540.3.1 by Vincent Ladeuil
Fix spurious orphan reports.
751
            # There is at least a child, so we need an existing directory to
752
            # contain it.
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
753
            kind = self.final_kind(parent_id)
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
754
            if kind is None:
5540.3.1 by Vincent Ladeuil
Fix spurious orphan reports.
755
                # The directory will be deleted
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
756
                conflicts.append(('missing parent', parent_id))
757
            elif kind != "directory":
5540.3.1 by Vincent Ladeuil
Fix spurious orphan reports.
758
                # Meh, we need a *directory* to put something in it
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
759
                conflicts.append(('non-directory parent', parent_id))
1534.7.6 by Aaron Bentley
Added conflict handling
760
        return conflicts
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
761
3619.2.8 by Aaron Bentley
Reorganize execute-bit handling
762
    def _set_executability(self, path, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
763
        """Set the executability of versioned files """
1534.7.25 by Aaron Bentley
Added set_executability
764
        if supports_executable():
3619.2.8 by Aaron Bentley
Reorganize execute-bit handling
765
            new_executability = self._new_executability[trans_id]
1534.7.25 by Aaron Bentley
Added set_executability
766
            abspath = self._tree.abspath(path)
767
            current_mode = os.stat(abspath).st_mode
768
            if new_executability:
769
                umask = os.umask(0)
770
                os.umask(umask)
771
                to_mode = current_mode | (0100 & ~umask)
772
                # Enable x-bit for others only if they can read it.
773
                if current_mode & 0004:
774
                    to_mode |= 0001 & ~umask
775
                if current_mode & 0040:
776
                    to_mode |= 0010 & ~umask
777
            else:
778
                to_mode = current_mode & ~0111
779
            os.chmod(abspath, to_mode)
780
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
781
    def _new_entry(self, name, parent_id, file_id):
1534.7.21 by Aaron Bentley
Updated docstrings
782
        """Helper function to create a new filesystem entry."""
1534.7.2 by Aaron Bentley
Added convenience function
783
        trans_id = self.create_path(name, parent_id)
784
        if file_id is not None:
785
            self.version_file(file_id, trans_id)
786
        return trans_id
787
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
788
    def new_file(self, name, parent_id, contents, file_id=None,
5752.3.4 by John Arbash Meinel
Add new_file(sha1=XXX) and pass that down to create_file.
789
                 executable=None, sha1=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
790
        """Convenience method to create files.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
791
1534.7.21 by Aaron Bentley
Updated docstrings
792
        name is the name of the file to create.
793
        parent_id is the transaction id of the parent directory of the file.
794
        contents is an iterator of bytestrings, which will be used to produce
795
        the file.
1740.2.4 by Aaron Bentley
Update transform tests and docs
796
        :param file_id: The inventory ID of the file, if it is to be versioned.
797
        :param executable: Only valid when a file_id has been supplied.
1534.7.21 by Aaron Bentley
Updated docstrings
798
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
799
        trans_id = self._new_entry(name, parent_id, file_id)
1740.2.4 by Aaron Bentley
Update transform tests and docs
800
        # TODO: rather than scheduling a set_executable call,
801
        # have create_file create the file with the right mode.
5752.3.4 by John Arbash Meinel
Add new_file(sha1=XXX) and pass that down to create_file.
802
        self.create_file(contents, trans_id, sha1=sha1)
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
803
        if executable is not None:
804
            self.set_executability(executable, trans_id)
1534.7.20 by Aaron Bentley
Added directory handling
805
        return trans_id
806
807
    def new_directory(self, name, parent_id, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
808
        """Convenience method to create directories.
1534.7.21 by Aaron Bentley
Updated docstrings
809
810
        name is the name of the directory to create.
811
        parent_id is the transaction id of the parent directory of the
812
        directory.
813
        file_id is the inventory ID of the directory, if it is to be versioned.
814
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
815
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.20 by Aaron Bentley
Added directory handling
816
        self.create_directory(trans_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
817
        return trans_id
1534.7.20 by Aaron Bentley
Added directory handling
818
1534.7.22 by Aaron Bentley
Added symlink support
819
    def new_symlink(self, name, parent_id, target, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
820
        """Convenience method to create symbolic link.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
821
1534.7.22 by Aaron Bentley
Added symlink support
822
        name is the name of the symlink to create.
823
        parent_id is the transaction id of the parent directory of the symlink.
824
        target is a bytestring of the target of the symlink.
825
        file_id is the inventory ID of the file, if it is to be versioned.
826
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
827
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.22 by Aaron Bentley
Added symlink support
828
        self.create_symlink(target, trans_id)
829
        return trans_id
830
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
831
    def new_orphan(self, trans_id, parent_id):
832
        """Schedule an item to be orphaned.
833
834
        When a directory is about to be removed, its children, if they are not
835
        versioned are moved out of the way: they don't have a parent anymore.
836
837
        :param trans_id: The trans_id of the existing item.
838
        :param parent_id: The parent trans_id of the item.
839
        """
840
        raise NotImplementedError(self.new_orphan)
841
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
842
    def _get_potential_orphans(self, dir_id):
843
        """Find the potential orphans in a directory.
844
845
        A directory can't be safely deleted if there are versioned files in it.
846
        If all the contained files are unversioned then they can be orphaned.
847
848
        The 'None' return value means that the directory contains at least one
849
        versioned file and should not be deleted.
850
851
        :param dir_id: The directory trans id.
852
853
        :return: A list of the orphan trans ids or None if at least one
854
             versioned file is present.
855
        """
856
        orphans = []
857
        # Find the potential orphans, stop if one item should be kept
5540.3.1 by Vincent Ladeuil
Fix spurious orphan reports.
858
        for child_tid in self.by_parent()[dir_id]:
859
            if child_tid in self._removed_contents:
860
                # The child is removed as part of the transform. Since it was
861
                # versioned before, it's not an orphan
862
                continue
863
            elif self.final_file_id(child_tid) is None:
864
                # The child is not versioned
865
                orphans.append(child_tid)
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
866
            else:
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
867
                # We have a versioned file here, searching for orphans is
868
                # meaningless.
869
                orphans = None
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
870
                break
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
871
        return orphans
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
872
1551.11.12 by Aaron Bentley
Changes from review
873
    def _affected_ids(self):
874
        """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
875
        trans_ids = set(self._removed_id)
876
        trans_ids.update(self._new_id.keys())
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
877
        trans_ids.update(self._removed_contents)
878
        trans_ids.update(self._new_contents.keys())
879
        trans_ids.update(self._new_executability.keys())
880
        trans_ids.update(self._new_name.keys())
881
        trans_ids.update(self._new_parent.keys())
1551.11.12 by Aaron Bentley
Changes from review
882
        return trans_ids
883
884
    def _get_file_id_maps(self):
885
        """Return mapping of file_ids to trans_ids in the to and from states"""
886
        trans_ids = self._affected_ids()
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
887
        from_trans_ids = {}
888
        to_trans_ids = {}
889
        # Build up two dicts: trans_ids associated with file ids in the
890
        # FROM state, vs the TO state.
891
        for trans_id in trans_ids:
892
            from_file_id = self.tree_file_id(trans_id)
893
            if from_file_id is not None:
894
                from_trans_ids[from_file_id] = trans_id
895
            to_file_id = self.final_file_id(trans_id)
896
            if to_file_id is not None:
897
                to_trans_ids[to_file_id] = trans_id
1551.11.12 by Aaron Bentley
Changes from review
898
        return from_trans_ids, to_trans_ids
899
900
    def _from_file_data(self, from_trans_id, from_versioned, file_id):
901
        """Get data about a file in the from (tree) state
902
903
        Return a (name, parent, kind, executable) tuple
904
        """
905
        from_path = self._tree_id_paths.get(from_trans_id)
906
        if from_versioned:
907
            # get data from working tree if versioned
3363.17.5 by Aaron Bentley
Update merge to not use inventory
908
            from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1551.11.12 by Aaron Bentley
Changes from review
909
            from_name = from_entry.name
910
            from_parent = from_entry.parent_id
911
        else:
912
            from_entry = None
913
            if from_path is None:
914
                # File does not exist in FROM state
915
                from_name = None
916
                from_parent = None
917
            else:
918
                # File exists, but is not versioned.  Have to use path-
919
                # splitting stuff
920
                from_name = os.path.basename(from_path)
921
                tree_parent = self.get_tree_parent(from_trans_id)
922
                from_parent = self.tree_file_id(tree_parent)
923
        if from_path is not None:
924
            from_kind, from_executable, from_stats = \
925
                self._tree._comparison_data(from_entry, from_path)
926
        else:
927
            from_kind = None
928
            from_executable = False
929
        return from_name, from_parent, from_kind, from_executable
930
931
    def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
932
        """Get data about a file in the to (target) state
933
934
        Return a (name, parent, kind, executable) tuple
935
        """
936
        to_name = self.final_name(to_trans_id)
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
937
        to_kind = self.final_kind(to_trans_id)
1551.11.12 by Aaron Bentley
Changes from review
938
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
939
        if to_trans_id in self._new_executability:
940
            to_executable = self._new_executability[to_trans_id]
941
        elif to_trans_id == from_trans_id:
942
            to_executable = from_executable
943
        else:
944
            to_executable = False
945
        return to_name, to_parent, to_kind, to_executable
946
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
947
    def iter_changes(self):
948
        """Produce output in the same format as Tree.iter_changes.
1551.11.12 by Aaron Bentley
Changes from review
949
950
        Will produce nonsensical results if invoked while inventory/filesystem
951
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
952
953
        This reads the Transform, but only reproduces changes involving a
954
        file_id.  Files that are not versioned in either of the FROM or TO
955
        states are not reflected.
956
        """
957
        final_paths = FinalPaths(self)
958
        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
959
        results = []
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
960
        # Now iterate through all active file_ids
961
        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
962
            modified = False
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
963
            from_trans_id = from_trans_ids.get(file_id)
964
            # find file ids, and determine versioning state
965
            if from_trans_id is None:
966
                from_versioned = False
967
                from_trans_id = to_trans_ids[file_id]
968
            else:
969
                from_versioned = True
970
            to_trans_id = to_trans_ids.get(file_id)
971
            if to_trans_id is None:
972
                to_versioned = False
973
                to_trans_id = from_trans_id
974
            else:
975
                to_versioned = True
1551.11.12 by Aaron Bentley
Changes from review
976
977
            from_name, from_parent, from_kind, from_executable = \
978
                self._from_file_data(from_trans_id, from_versioned, file_id)
979
980
            to_name, to_parent, to_kind, to_executable = \
981
                self._to_file_data(to_trans_id, from_trans_id, from_executable)
982
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
983
            if not from_versioned:
984
                from_path = None
985
            else:
986
                from_path = self._tree_id_paths.get(from_trans_id)
987
            if not to_versioned:
988
                to_path = None
989
            else:
990
                to_path = final_paths.get_path(to_trans_id)
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
991
            if from_kind != to_kind:
992
                modified = True
1551.10.37 by Aaron Bentley
recommit of TreeTransform._iter_changes fix with missing files
993
            elif to_kind in ('file', 'symlink') and (
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
994
                to_trans_id != from_trans_id or
995
                to_trans_id in self._new_contents):
996
                modified = True
997
            if (not modified and from_versioned == to_versioned and
998
                from_parent==to_parent and from_name == to_name and
999
                from_executable == to_executable):
1000
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1001
            results.append((file_id, (from_path, to_path), modified,
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1002
                   (from_versioned, to_versioned),
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1003
                   (from_parent, to_parent),
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1004
                   (from_name, to_name),
1005
                   (from_kind, to_kind),
1551.11.4 by Aaron Bentley
Sort output of Transform.iter_changes by path
1006
                   (from_executable, to_executable)))
1007
        return iter(sorted(results, key=lambda x:x[1]))
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1008
4354.4.4 by Aaron Bentley
Simplify by using CommitBuilder directly
1009
    def get_preview_tree(self):
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1010
        """Return a tree representing the result of the transform.
1011
4634.57.4 by Aaron Bentley
Update docs
1012
        The tree is a snapshot, and altering the TreeTransform will invalidate
1013
        it.
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1014
        """
4354.4.4 by Aaron Bentley
Simplify by using CommitBuilder directly
1015
        return _PreviewTree(self)
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
1016
5162.4.1 by Aaron Bentley
TreeTransform supports normal commit parameters and includes branch nick.
1017
    def commit(self, branch, message, merge_parents=None, strict=False,
1018
               timestamp=None, timezone=None, committer=None, authors=None,
1019
               revprops=None, revision_id=None):
4526.8.1 by Aaron Bentley
Support committing a TreeTransform to a branch.
1020
        """Commit the result of this TreeTransform to a branch.
1021
1022
        :param branch: The branch to commit to.
1023
        :param message: The message to attach to the commit.
5162.4.1 by Aaron Bentley
TreeTransform supports normal commit parameters and includes branch nick.
1024
        :param merge_parents: Additional parent revision-ids specified by
1025
            pending merges.
1026
        :param strict: If True, abort the commit if there are unversioned
1027
            files.
1028
        :param timestamp: if not None, seconds-since-epoch for the time and
1029
            date.  (May be a float.)
1030
        :param timezone: Optional timezone for timestamp, as an offset in
1031
            seconds.
1032
        :param committer: Optional committer in email-id format.
1033
            (e.g. "J Random Hacker <jrandom@example.com>")
1034
        :param authors: Optional list of authors in email-id format.
1035
        :param revprops: Optional dictionary of revision properties.
1036
        :param revision_id: Optional revision id.  (Specifying a revision-id
1037
            may reduce performance for some non-native formats.)
4526.8.1 by Aaron Bentley
Support committing a TreeTransform to a branch.
1038
        :return: The revision_id of the revision committed.
1039
        """
4526.8.6 by Aaron Bentley
Check for malformed transforms before committing.
1040
        self._check_malformed()
4526.8.2 by Aaron Bentley
Proved strict commit handling.
1041
        if strict:
1042
            unversioned = set(self._new_contents).difference(set(self._new_id))
1043
            for trans_id in unversioned:
1044
                if self.final_file_id(trans_id) is None:
1045
                    raise errors.StrictCommitFailed()
4526.8.3 by Aaron Bentley
Clean up merge parent handling.
1046
1047
        revno, last_rev_id = branch.last_revision_info()
1048
        if last_rev_id == _mod_revision.NULL_REVISION:
1049
            if merge_parents is not None:
4526.8.5 by Aaron Bentley
Updates from review.
1050
                raise ValueError('Cannot supply merge parents for first'
1051
                                 ' commit.')
4526.8.3 by Aaron Bentley
Clean up merge parent handling.
1052
            parent_ids = []
1053
        else:
1054
            parent_ids = [last_rev_id]
1055
            if merge_parents is not None:
1056
                parent_ids.extend(merge_parents)
4526.8.1 by Aaron Bentley
Support committing a TreeTransform to a branch.
1057
        if self._tree.get_revision_id() != last_rev_id:
4526.8.5 by Aaron Bentley
Updates from review.
1058
            raise ValueError('TreeTransform not based on branch basis: %s' %
1059
                             self._tree.get_revision_id())
5162.4.1 by Aaron Bentley
TreeTransform supports normal commit parameters and includes branch nick.
1060
        revprops = commit.Commit.update_revprops(revprops, branch, authors)
1061
        builder = branch.get_commit_builder(parent_ids,
1062
                                            timestamp=timestamp,
5162.4.3 by Aaron Bentley
Fix failing test.
1063
                                            timezone=timezone,
5162.4.1 by Aaron Bentley
TreeTransform supports normal commit parameters and includes branch nick.
1064
                                            committer=committer,
1065
                                            revprops=revprops,
1066
                                            revision_id=revision_id)
4526.8.1 by Aaron Bentley
Support committing a TreeTransform to a branch.
1067
        preview = self.get_preview_tree()
1068
        list(builder.record_iter_changes(preview, last_rev_id,
1069
                                         self.iter_changes()))
1070
        builder.finish_inventory()
1071
        revision_id = builder.commit(message)
1072
        branch.set_last_revision_info(revno + 1, revision_id)
1073
        return revision_id
1074
0.13.24 by Aaron Bentley
Update to use Tree.readlines, if possible.
1075
    def _text_parent(self, trans_id):
1076
        file_id = self.tree_file_id(trans_id)
1077
        try:
1078
            if file_id is None or self._tree.kind(file_id) != 'file':
1079
                return None
1080
        except errors.NoSuchFile:
1081
            return None
1082
        return file_id
1083
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1084
    def _get_parents_texts(self, trans_id):
0.13.9 by Aaron Bentley
Update docs
1085
        """Get texts for compression parents of this file."""
0.13.24 by Aaron Bentley
Update to use Tree.readlines, if possible.
1086
        file_id = self._text_parent(trans_id)
1087
        if file_id is None:
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1088
            return ()
1089
        return (self._tree.get_file_text(file_id),)
1090
1091
    def _get_parents_lines(self, trans_id):
0.13.9 by Aaron Bentley
Update docs
1092
        """Get lines for compression parents of this file."""
0.13.24 by Aaron Bentley
Update to use Tree.readlines, if possible.
1093
        file_id = self._text_parent(trans_id)
1094
        if file_id is None:
1095
            return ()
1096
        return (self._tree.get_file_lines(file_id),)
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1097
1098
    def serialize(self, serializer):
0.13.9 by Aaron Bentley
Update docs
1099
        """Serialize this TreeTransform.
1100
1101
        :param serializer: A Serialiser like pack.ContainerSerializer.
1102
        """
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1103
        new_name = dict((k, v.encode('utf-8')) for k, v in
1104
                        self._new_name.items())
1105
        new_executability = dict((k, int(v)) for k, v in
1106
                                 self._new_executability.items())
1107
        tree_path_ids = dict((k.encode('utf-8'), v)
1108
                             for k, v in self._tree_path_ids.items())
1109
        attribs = {
1110
            '_id_number': self._id_number,
1111
            '_new_name': new_name,
1112
            '_new_parent': self._new_parent,
1113
            '_new_executability': new_executability,
1114
            '_new_id': self._new_id,
1115
            '_tree_path_ids': tree_path_ids,
1116
            '_removed_id': list(self._removed_id),
1117
            '_removed_contents': list(self._removed_contents),
1118
            '_non_present_ids': self._non_present_ids,
1119
            }
1120
        yield serializer.bytes_record(bencode.bencode(attribs),
1121
                                      (('attribs',),))
1122
        for trans_id, kind in self._new_contents.items():
1123
            if kind == 'file':
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1124
                lines = osutils.chunks_to_lines(
1125
                    self._read_file_chunks(trans_id))
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1126
                parents = self._get_parents_lines(trans_id)
1127
                mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1128
                content = ''.join(mpdiff.to_patch())
1129
            if kind == 'directory':
1130
                content = ''
1131
            if kind == 'symlink':
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1132
                content = self._read_symlink_target(trans_id)
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1133
            yield serializer.bytes_record(content, ((trans_id, kind),))
1134
1135
    def deserialize(self, records):
0.13.9 by Aaron Bentley
Update docs
1136
        """Deserialize a stored TreeTransform.
1137
1138
        :param records: An iterable of (names, content) tuples, as per
1139
            pack.ContainerPushParser.
1140
        """
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1141
        names, content = records.next()
1142
        attribs = bencode.bdecode(content)
1143
        self._id_number = attribs['_id_number']
1144
        self._new_name = dict((k, v.decode('utf-8'))
1145
                            for k, v in attribs['_new_name'].items())
1146
        self._new_parent = attribs['_new_parent']
1147
        self._new_executability = dict((k, bool(v)) for k, v in
1148
            attribs['_new_executability'].items())
1149
        self._new_id = attribs['_new_id']
1150
        self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1151
        self._tree_path_ids = {}
1152
        self._tree_id_paths = {}
1153
        for bytepath, trans_id in attribs['_tree_path_ids'].items():
1154
            path = bytepath.decode('utf-8')
1155
            self._tree_path_ids[path] = trans_id
1156
            self._tree_id_paths[trans_id] = path
1157
        self._removed_id = set(attribs['_removed_id'])
1158
        self._removed_contents = set(attribs['_removed_contents'])
1159
        self._non_present_ids = attribs['_non_present_ids']
1160
        for ((trans_id, kind),), content in records:
1161
            if kind == 'file':
1162
                mpdiff = multiparent.MultiParent.from_patch(content)
1163
                lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1164
                self.create_file(lines, trans_id)
1165
            if kind == 'directory':
1166
                self.create_directory(trans_id)
1167
            if kind == 'symlink':
0.13.16 by Aaron Bentley
Add unicode symlink targets to tests
1168
                self.create_symlink(content.decode('utf-8'), trans_id)
0.13.8 by Aaron Bentley
Integrate serialization into TreeTransforms
1169
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1170
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1171
class DiskTreeTransform(TreeTransformBase):
1172
    """Tree transform storing its contents on disk."""
1173
4961.2.4 by Martin Pool
Delete deprecated ProgressBar constructor
1174
    def __init__(self, tree, limbodir, pb=None,
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1175
                 case_sensitive=True):
1176
        """Constructor.
1177
        :param tree: The tree that will be transformed, but not necessarily
1178
            the output tree.
1179
        :param limbodir: A directory where new files can be stored until
1180
            they are installed in their proper places
4961.2.4 by Martin Pool
Delete deprecated ProgressBar constructor
1181
        :param pb: ignored
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1182
        :param case_sensitive: If True, the target of the transform is
1183
            case sensitive, not just case preserving.
1184
        """
1185
        TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1186
        self._limbodir = limbodir
1187
        self._deletiondir = None
1188
        # A mapping of transform ids to their limbo filename
1189
        self._limbo_files = {}
5876.4.4 by Andrew Bennetts
Fix edge cases in handling interrupts during _rename_in_limbo, with messy tests
1190
        self._possibly_stale_limbo_files = set()
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1191
        # A mapping of transform ids to a set of the transform ids of children
1192
        # that their limbo directory has
1193
        self._limbo_children = {}
1194
        # Map transform ids to maps of child filename to child transform id
1195
        self._limbo_children_names = {}
1196
        # List of transform ids that need to be renamed from limbo into place
1197
        self._needs_rename = set()
4934.1.2 by John Arbash Meinel
Move the functionality into osutils / extensions.
1198
        self._creation_mtime = None
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1199
1200
    def finalize(self):
1201
        """Release the working tree lock, if held, clean up limbo dir.
1202
1203
        This is required if apply has not been invoked, but can be invoked
1204
        even after apply.
1205
        """
1206
        if self._tree is None:
1207
            return
1208
        try:
5876.4.4 by Andrew Bennetts
Fix edge cases in handling interrupts during _rename_in_limbo, with messy tests
1209
            limbo_paths = self._limbo_files.values() + list(
1210
                self._possibly_stale_limbo_files)
1211
            limbo_paths = sorted(limbo_paths, reverse=True)
5876.4.1 by Andrew Bennetts
Experimental changes to fix 597686.
1212
            for path in limbo_paths:
1213
                try:
1214
                    delete_any(path)
1215
                except OSError, e:
1216
                    if e.errno != errno.ENOENT:
1217
                        raise
1218
                    # XXX: warn? perhaps we just got interrupted at an
1219
                    # inconvenient moment, but perhaps files are disappearing
1220
                    # from under us?
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1221
            try:
4440.1.1 by Craig Hewetson
bug fixes for:
1222
                delete_any(self._limbodir)
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1223
            except OSError:
1224
                # We don't especially care *why* the dir is immortal.
1225
                raise ImmortalLimbo(self._limbodir)
1226
            try:
1227
                if self._deletiondir is not None:
4440.1.1 by Craig Hewetson
bug fixes for:
1228
                    delete_any(self._deletiondir)
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1229
            except OSError:
1230
                raise errors.ImmortalPendingDeletion(self._deletiondir)
1231
        finally:
1232
            TreeTransformBase.finalize(self)
1233
1234
    def _limbo_name(self, trans_id):
1235
        """Generate the limbo name of a file"""
1236
        limbo_name = self._limbo_files.get(trans_id)
4634.79.1 by Aaron Bentley
TransformPreview uses ascii-only filenames.
1237
        if limbo_name is None:
1238
            limbo_name = self._generate_limbo_path(trans_id)
1239
            self._limbo_files[trans_id] = limbo_name
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1240
        return limbo_name
1241
4634.79.1 by Aaron Bentley
TransformPreview uses ascii-only filenames.
1242
    def _generate_limbo_path(self, trans_id):
1243
        """Generate a limbo path using the trans_id as the relative path.
1244
1245
        This is suitable as a fallback, and when the transform should not be
1246
        sensitive to the path encoding of the limbo directory.
1247
        """
1248
        self._needs_rename.add(trans_id)
1249
        return pathjoin(self._limbodir, trans_id)
1250
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1251
    def adjust_path(self, name, parent, trans_id):
1252
        previous_parent = self._new_parent.get(trans_id)
1253
        previous_name = self._new_name.get(trans_id)
1254
        TreeTransformBase.adjust_path(self, name, parent, trans_id)
1255
        if (trans_id in self._limbo_files and
1256
            trans_id not in self._needs_rename):
1257
            self._rename_in_limbo([trans_id])
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
1258
            if previous_parent != parent:
1259
                self._limbo_children[previous_parent].remove(trans_id)
1260
            if previous_parent != parent or previous_name != name:
1261
                del self._limbo_children_names[previous_parent][previous_name]
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1262
4634.78.3 by Aaron Bentley
Remove spurious change.
1263
    def _rename_in_limbo(self, trans_ids):
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1264
        """Fix limbo names so that the right final path is produced.
1265
1266
        This means we outsmarted ourselves-- we tried to avoid renaming
1267
        these files later by creating them with their final names in their
1268
        final parents.  But now the previous name or parent is no longer
1269
        suitable, so we have to rename them.
1270
1271
        Even for trans_ids that have no new contents, we must remove their
1272
        entries from _limbo_files, because they are now stale.
1273
        """
1274
        for trans_id in trans_ids:
5876.4.4 by Andrew Bennetts
Fix edge cases in handling interrupts during _rename_in_limbo, with messy tests
1275
            old_path = self._limbo_files[trans_id]
1276
            self._possibly_stale_limbo_files.add(old_path)
1277
            del self._limbo_files[trans_id]
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1278
            if trans_id not in self._new_contents:
1279
                continue
1280
            new_path = self._limbo_name(trans_id)
5050.15.1 by Martin
Revert change of rename function in transform from r5192 to fix failures on Windows
1281
            os.rename(old_path, new_path)
5876.4.4 by Andrew Bennetts
Fix edge cases in handling interrupts during _rename_in_limbo, with messy tests
1282
            self._possibly_stale_limbo_files.remove(old_path)
4634.78.1 by Aaron Bentley
adjust_path updatest limbo paths.
1283
            for descendant in self._limbo_descendants(trans_id):
1284
                desc_path = self._limbo_files[descendant]
1285
                desc_path = new_path + desc_path[len(old_path):]
1286
                self._limbo_files[descendant] = desc_path
1287
1288
    def _limbo_descendants(self, trans_id):
1289
        """Return the set of trans_ids whose limbo paths descend from this."""
1290
        descendants = set(self._limbo_children.get(trans_id, []))
1291
        for descendant in list(descendants):
1292
            descendants.update(self._limbo_descendants(descendant))
1293
        return descendants
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1294
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1295
    def create_file(self, contents, trans_id, mode_id=None, sha1=None):
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1296
        """Schedule creation of a new file.
1297
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1298
        :seealso: new_file.
1299
1300
        :param contents: an iterator of strings, all of which will be written
1301
            to the target destination.
1302
        :param trans_id: TreeTransform handle
1303
        :param mode_id: If not None, force the mode of the target file to match
1304
            the mode of the object referenced by mode_id.
1305
            Otherwise, we will try to preserve mode bits of an existing file.
1306
        :param sha1: If the sha1 of this content is already known, pass it in.
1307
            We can use it to prevent future sha1 computations.
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1308
        """
1309
        name = self._limbo_name(trans_id)
1310
        f = open(name, 'wb')
1311
        try:
5876.4.3 by Andrew Bennetts
Simplify create_file now that finalize will always take care of cleaning up its limbo file.
1312
            unique_add(self._new_contents, trans_id, 'file')
5752.2.3 by John Arbash Meinel
Change the create_file api to allow it to take a sha1 of the content.
1313
            f.writelines(contents)
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1314
        finally:
1315
            f.close()
4934.1.12 by John Arbash Meinel
Revert all of the extension code.
1316
        self._set_mtime(name)
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1317
        self._set_mode(trans_id, mode_id, S_ISREG)
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1318
        # It is unfortunate we have to use lstat instead of fstat, but we just
1319
        # used utime and chmod on the file, so we need the accurate final
1320
        # details.
1321
        if sha1 is not None:
1322
            self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1323
1324
    def _read_file_chunks(self, trans_id):
1325
        cur_file = open(self._limbo_name(trans_id), 'rb')
1326
        try:
1327
            return cur_file.readlines()
1328
        finally:
1329
            cur_file.close()
1330
1331
    def _read_symlink_target(self, trans_id):
1332
        return os.readlink(self._limbo_name(trans_id))
1333
4934.1.12 by John Arbash Meinel
Revert all of the extension code.
1334
    def _set_mtime(self, path):
4934.1.2 by John Arbash Meinel
Move the functionality into osutils / extensions.
1335
        """All files that are created get the same mtime.
1336
1337
        This time is set by the first object to be created.
1338
        """
1339
        if self._creation_mtime is None:
1340
            self._creation_mtime = time.time()
4934.1.12 by John Arbash Meinel
Revert all of the extension code.
1341
        os.utime(path, (self._creation_mtime, self._creation_mtime))
4934.1.2 by John Arbash Meinel
Move the functionality into osutils / extensions.
1342
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1343
    def create_hardlink(self, path, trans_id):
1344
        """Schedule creation of a hard link"""
1345
        name = self._limbo_name(trans_id)
1346
        try:
1347
            os.link(path, name)
1348
        except OSError, e:
1349
            if e.errno != errno.EPERM:
1350
                raise
1351
            raise errors.HardLinkNotSupported(path)
1352
        try:
1353
            unique_add(self._new_contents, trans_id, 'file')
1354
        except:
1355
            # Clean up the file, it never got registered so
1356
            # TreeTransform.finalize() won't clean it up.
1357
            os.unlink(name)
1358
            raise
1359
1360
    def create_directory(self, trans_id):
1361
        """Schedule creation of a new directory.
1362
1363
        See also new_directory.
1364
        """
1365
        os.mkdir(self._limbo_name(trans_id))
1366
        unique_add(self._new_contents, trans_id, 'directory')
1367
1368
    def create_symlink(self, target, trans_id):
1369
        """Schedule creation of a new symbolic link.
1370
1371
        target is a bytestring.
1372
        See also new_symlink.
1373
        """
1374
        if has_symlinks():
1375
            os.symlink(target, self._limbo_name(trans_id))
1376
            unique_add(self._new_contents, trans_id, 'symlink')
1377
        else:
1378
            try:
1379
                path = FinalPaths(self).get_path(trans_id)
1380
            except KeyError:
1381
                path = None
1382
            raise UnableCreateSymlink(path=path)
1383
1384
    def cancel_creation(self, trans_id):
1385
        """Cancel the creation of new file contents."""
1386
        del self._new_contents[trans_id]
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1387
        if trans_id in self._observed_sha1s:
1388
            del self._observed_sha1s[trans_id]
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1389
        children = self._limbo_children.get(trans_id)
1390
        # if this is a limbo directory with children, move them before removing
1391
        # the directory
1392
        if children is not None:
1393
            self._rename_in_limbo(children)
1394
            del self._limbo_children[trans_id]
1395
            del self._limbo_children_names[trans_id]
1396
        delete_any(self._limbo_name(trans_id))
1397
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
1398
    def new_orphan(self, trans_id, parent_id):
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
1399
        # FIXME: There is no tree config, so we use the branch one (it's weird
1400
        # to define it this way as orphaning can only occur in a working tree,
1401
        # but that's all we have (for now). It will find the option in
5409.1.23 by Vincent Ladeuil
Add more doc and fix rst typos
1402
        # locations.conf or bazaar.conf though) -- vila 20100916
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
1403
        conf = self._tree.branch.get_config()
5409.1.24 by Vincent Ladeuil
Rename bzrlib.transform.orphan_policy to bzr.transform.orphan_policy.
1404
        conf_var_name = 'bzr.transform.orphan_policy'
5409.1.17 by Vincent Ladeuil
Ensures we fallback to the default policy if a bogus one is specified.
1405
        orphan_policy = conf.get_user_option(conf_var_name)
1406
        default_policy = orphaning_registry.default_key
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
1407
        if orphan_policy is None:
5409.1.17 by Vincent Ladeuil
Ensures we fallback to the default policy if a bogus one is specified.
1408
            orphan_policy = default_policy
1409
        if orphan_policy not in orphaning_registry:
5753.2.4 by Jelmer Vernooij
Review feedback from John.
1410
            trace.warning('%s (from %s) is not a known policy, defaulting '
1411
                'to %s' % (orphan_policy, conf_var_name, default_policy))
5409.1.17 by Vincent Ladeuil
Ensures we fallback to the default policy if a bogus one is specified.
1412
            orphan_policy = default_policy
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
1413
        handle_orphan = orphaning_registry.get(orphan_policy)
1414
        handle_orphan(self, trans_id, parent_id)
1415
1416
1417
class OrphaningError(errors.BzrError):
1418
1419
    # Only bugs could lead to such exception being seen by the user
1420
    internal_error = True
1421
    _fmt = "Error while orphaning %s in %s directory"
1422
1423
    def __init__(self, orphan, parent):
1424
        errors.BzrError.__init__(self)
1425
        self.orphan = orphan
1426
        self.parent = parent
1427
1428
1429
class OrphaningForbidden(OrphaningError):
1430
1431
    _fmt = "Policy: %s doesn't allow creating orphans."
1432
1433
    def __init__(self, policy):
1434
        errors.BzrError.__init__(self)
1435
        self.policy = policy
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
1436
1437
1438
def move_orphan(tt, orphan_id, parent_id):
1439
    """See TreeTransformBase.new_orphan.
1440
1441
    This creates a new orphan in the `bzr-orphans` dir at the root of the
1442
    `TreeTransform`.
1443
1444
    :param tt: The TreeTransform orphaning `trans_id`.
1445
1446
    :param orphan_id: The trans id that should be orphaned.
1447
1448
    :param parent_id: The orphan parent trans id.
1449
    """
1450
    # Add the orphan dir if it doesn't exist
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
1451
    orphan_dir_basename = 'bzr-orphans'
1452
    od_id = tt.trans_id_tree_path(orphan_dir_basename)
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
1453
    if tt.final_kind(od_id) is None:
1454
        tt.create_directory(od_id)
1455
    parent_path = tt._tree_id_paths[parent_id]
1456
    # Find a name that doesn't exist yet in the orphan dir
1457
    actual_name = tt.final_name(orphan_id)
1458
    new_name = tt._available_backup_name(actual_name, od_id)
1459
    tt.adjust_path(new_name, od_id, orphan_id)
5753.2.3 by Jelmer Vernooij
Fix transform tests.
1460
    trace.warning('%s has been orphaned in %s'
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
1461
                  % (joinpath(parent_path, actual_name), orphan_dir_basename))
1462
1463
1464
def refuse_orphan(tt, orphan_id, parent_id):
1465
    """See TreeTransformBase.new_orphan.
1466
5409.1.23 by Vincent Ladeuil
Add more doc and fix rst typos
1467
    This refuses to create orphan, letting the caller handle the conflict.
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
1468
    """
1469
    raise OrphaningForbidden('never')
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
1470
1471
1472
orphaning_registry = registry.Registry()
5409.1.25 by Vincent Ladeuil
Better docs.
1473
orphaning_registry.register(
1474
    'conflict', refuse_orphan,
1475
    'Leave orphans in place and create a conflict on the directory.')
1476
orphaning_registry.register(
1477
    'move', move_orphan,
1478
    'Move orphans into the bzr-orphans directory.')
5409.1.20 by Vincent Ladeuil
Revert to 'conflict' being the default orphaning policy and fix fallouts.
1479
orphaning_registry._set_default_key('conflict')
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
1480
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1481
1482
class TreeTransform(DiskTreeTransform):
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1483
    """Represent a tree transformation.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1484
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1485
    This object is designed to support incremental generation of the transform,
1486
    in any order.
1487
1488
    However, it gives optimum performance when parent directories are created
1489
    before their contents.  The transform is then able to put child files
1490
    directly in their parent directory, avoiding later renames.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1491
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1492
    It is easy to produce malformed transforms, but they are generally
1493
    harmless.  Attempting to apply a malformed transform will cause an
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1494
    exception to be raised before any modifications are made to the tree.
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1495
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1496
    Many kinds of malformed transforms can be corrected with the
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1497
    resolve_conflicts function.  The remaining ones indicate programming error,
1498
    such as trying to create a file with no path.
1499
1500
    Two sets of file creation methods are supplied.  Convenience methods are:
1501
     * new_file
1502
     * new_directory
1503
     * new_symlink
1504
1505
    These are composed of the low-level methods:
1506
     * create_path
1507
     * create_file or create_directory or create_symlink
1508
     * version_file
1509
     * set_executability
3008.1.13 by Michael Hudson
merge bzr.dev
1510
1511
    Transform/Transaction ids
1512
    -------------------------
1513
    trans_ids are temporary ids assigned to all files involved in a transform.
1514
    It's possible, even common, that not all files in the Tree have trans_ids.
1515
1516
    trans_ids are used because filenames and file_ids are not good enough
1517
    identifiers; filenames change, and not all files have file_ids.  File-ids
1518
    are also associated with trans-ids, so that moving a file moves its
1519
    file-id.
1520
1521
    trans_ids are only valid for the TreeTransform that generated them.
1522
1523
    Limbo
1524
    -----
1525
    Limbo is a temporary directory use to hold new versions of files.
1526
    Files are added to limbo by create_file, create_directory, create_symlink,
1527
    and their convenience variants (new_*).  Files may be removed from limbo
1528
    using cancel_creation.  Files are renamed from limbo into their final
1529
    location as part of TreeTransform.apply
1530
1531
    Limbo must be cleaned up, by either calling TreeTransform.apply or
1532
    calling TreeTransform.finalize.
1533
1534
    Files are placed into limbo inside their parent directories, where
1535
    possible.  This reduces subsequent renames, and makes operations involving
1536
    lots of files faster.  This optimization is only possible if the parent
1537
    directory is created *before* creating any of its children, so avoid
1538
    creating children before parents, where possible.
1539
1540
    Pending-deletion
1541
    ----------------
1542
    This temporary directory is used by _FileMover for storing files that are
1543
    about to be deleted.  In case of rollback, the files will be restored.
1544
    FileMover does not delete files until it is sure that a rollback will not
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1545
    happen.
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1546
    """
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
1547
    def __init__(self, tree, pb=None):
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1548
        """Note: a tree_write lock is taken on the tree.
1549
1550
        Use TreeTransform.finalize() to release the lock (can be omitted if
1551
        TreeTransform.apply() called).
1552
        """
1553
        tree.lock_tree_write()
3008.1.13 by Michael Hudson
merge bzr.dev
1554
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1555
        try:
1556
            limbodir = urlutils.local_path_from_url(
3407.2.8 by Martin Pool
Deprecate LockableFiles.controlfilename
1557
                tree._transport.abspath('limbo'))
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1558
            try:
1559
                os.mkdir(limbodir)
1560
            except OSError, e:
1561
                if e.errno == errno.EEXIST:
1562
                    raise ExistingLimbo(limbodir)
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1563
            deletiondir = urlutils.local_path_from_url(
3407.2.8 by Martin Pool
Deprecate LockableFiles.controlfilename
1564
                tree._transport.abspath('pending-deletion'))
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1565
            try:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1566
                os.mkdir(deletiondir)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1567
            except OSError, e:
1568
                if e.errno == errno.EEXIST:
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1569
                    raise errors.ExistingPendingDeletion(deletiondir)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1570
        except:
1571
            tree.unlock()
1572
            raise
3008.1.13 by Michael Hudson
merge bzr.dev
1573
4354.5.2 by Aaron Bentley
Move WorkingTree-specific code out of BaseTreeTransform
1574
        # Cache of realpath results, to speed up canonical_path
1575
        self._realpaths = {}
1576
        # Cache of relpath results, to speed up canonical_path
1577
        self._relpaths = {}
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1578
        DiskTreeTransform.__init__(self, tree, limbodir, pb,
3008.1.15 by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree
1579
                                   tree.case_sensitive)
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1580
        self._deletiondir = deletiondir
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1581
4354.5.2 by Aaron Bentley
Move WorkingTree-specific code out of BaseTreeTransform
1582
    def canonical_path(self, path):
1583
        """Get the canonical tree-relative path"""
1584
        # don't follow final symlinks
1585
        abs = self._tree.abspath(path)
1586
        if abs in self._relpaths:
1587
            return self._relpaths[abs]
1588
        dirname, basename = os.path.split(abs)
1589
        if dirname not in self._realpaths:
1590
            self._realpaths[dirname] = os.path.realpath(dirname)
1591
        dirname = self._realpaths[dirname]
1592
        abs = pathjoin(dirname, basename)
1593
        if dirname in self._relpaths:
1594
            relpath = pathjoin(self._relpaths[dirname], basename)
1595
            relpath = relpath.rstrip('/\\')
1596
        else:
1597
            relpath = self._tree.relpath(abs)
1598
        self._relpaths[abs] = relpath
1599
        return relpath
1600
1601
    def tree_kind(self, trans_id):
1602
        """Determine the file kind in the working tree.
1603
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
1604
        :returns: The file kind or None if the file does not exist
4354.5.2 by Aaron Bentley
Move WorkingTree-specific code out of BaseTreeTransform
1605
        """
1606
        path = self._tree_id_paths.get(trans_id)
1607
        if path is None:
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
1608
            return None
4354.5.2 by Aaron Bentley
Move WorkingTree-specific code out of BaseTreeTransform
1609
        try:
1610
            return file_kind(self._tree.abspath(path))
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
1611
        except errors.NoSuchFile:
1612
            return None
4354.5.2 by Aaron Bentley
Move WorkingTree-specific code out of BaseTreeTransform
1613
1614
    def _set_mode(self, trans_id, mode_id, typefunc):
1615
        """Set the mode of new file contents.
1616
        The mode_id is the existing file to get the mode from (often the same
1617
        as trans_id).  The operation is only performed if there's a mode match
1618
        according to typefunc.
1619
        """
1620
        if mode_id is None:
1621
            mode_id = trans_id
1622
        try:
1623
            old_path = self._tree_id_paths[mode_id]
1624
        except KeyError:
1625
            return
1626
        try:
1627
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1628
        except OSError, e:
1629
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
1630
                # Either old_path doesn't exist, or the parent of the
1631
                # target is not a directory (but will be one eventually)
1632
                # Either way, we know it doesn't exist *right now*
1633
                # See also bug #248448
1634
                return
1635
            else:
1636
                raise
1637
        if typefunc(mode):
1638
            os.chmod(self._limbo_name(trans_id), mode)
1639
1640
    def iter_tree_children(self, parent_id):
1641
        """Iterate through the entry's tree children, if any"""
1642
        try:
1643
            path = self._tree_id_paths[parent_id]
1644
        except KeyError:
1645
            return
1646
        try:
1647
            children = os.listdir(self._tree.abspath(path))
1648
        except OSError, e:
1649
            if not (osutils._is_error_enotdir(e)
1650
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
1651
                raise
1652
            return
1653
1654
        for child in children:
1655
            childpath = joinpath(path, child)
1656
            if self._tree.is_control_filename(childpath):
1657
                continue
1658
            yield self.trans_id_tree_path(childpath)
1659
4634.79.1 by Aaron Bentley
TransformPreview uses ascii-only filenames.
1660
    def _generate_limbo_path(self, trans_id):
1661
        """Generate a limbo path using the final path if possible.
1662
1663
        This optimizes the performance of applying the tree transform by
1664
        avoiding renames.  These renames can be avoided only when the parent
1665
        directory is already scheduled for creation.
1666
1667
        If the final path cannot be used, falls back to using the trans_id as
1668
        the relpath.
1669
        """
1670
        parent = self._new_parent.get(trans_id)
1671
        # if the parent directory is already in limbo (e.g. when building a
1672
        # tree), choose a limbo name inside the parent, to reduce further
1673
        # renames.
1674
        use_direct_path = False
1675
        if self._new_contents.get(parent) == 'directory':
1676
            filename = self._new_name.get(trans_id)
1677
            if filename is not None:
1678
                if parent not in self._limbo_children:
1679
                    self._limbo_children[parent] = set()
1680
                    self._limbo_children_names[parent] = {}
1681
                    use_direct_path = True
1682
                # the direct path can only be used if no other file has
1683
                # already taken this pathname, i.e. if the name is unused, or
1684
                # if it is already associated with this trans_id.
1685
                elif self._case_sensitive_target:
1686
                    if (self._limbo_children_names[parent].get(filename)
1687
                        in (trans_id, None)):
1688
                        use_direct_path = True
1689
                else:
1690
                    for l_filename, l_trans_id in\
1691
                        self._limbo_children_names[parent].iteritems():
1692
                        if l_trans_id == trans_id:
1693
                            continue
1694
                        if l_filename.lower() == filename.lower():
1695
                            break
1696
                    else:
1697
                        use_direct_path = True
1698
1699
        if not use_direct_path:
1700
            return DiskTreeTransform._generate_limbo_path(self, trans_id)
1701
1702
        limbo_name = pathjoin(self._limbo_files[parent], filename)
1703
        self._limbo_children[parent].add(trans_id)
1704
        self._limbo_children_names[parent][filename] = trans_id
1705
        return limbo_name
1706
1707
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
1708
    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
1709
        """Apply all changes to the inventory and filesystem.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1710
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1711
        If filesystem or inventory conflicts are present, MalformedTransform
1712
        will be thrown.
1713
1714
        If apply succeeds, finalize is not necessary.
1715
1716
        :param no_conflicts: if True, the caller guarantees there are no
1717
            conflicts, so no check is made.
3453.2.11 by Aaron Bentley
Updates from review
1718
        :param precomputed_delta: An inventory delta to use instead of
1719
            calculating one.
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1720
        :param _mover: Supply an alternate FileMover, for testing
1721
        """
1722
        if not no_conflicts:
4526.8.6 by Aaron Bentley
Check for malformed transforms before committing.
1723
            self._check_malformed()
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
1724
        child_pb = ui.ui_factory.nested_progress_bar()
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1725
        try:
3619.2.7 by Aaron Bentley
Fix progress handling
1726
            if precomputed_delta is None:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1727
                child_pb.update(gettext('Apply phase'), 0, 2)
3619.2.7 by Aaron Bentley
Fix progress handling
1728
                inventory_delta = self._generate_inventory_delta()
1729
                offset = 1
1730
            else:
1731
                inventory_delta = precomputed_delta
1732
                offset = 0
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1733
            if _mover is None:
1734
                mover = _FileMover()
1735
            else:
1736
                mover = _mover
1737
            try:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1738
                child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1739
                self._apply_removals(mover)
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1740
                child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1741
                modified_paths = self._apply_insertions(mover)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1742
            except:
1743
                mover.rollback()
1744
                raise
1745
            else:
1746
                mover.apply_deletions()
1747
        finally:
1748
            child_pb.finished()
6024.1.1 by Aaron Bentley
Move empty-tree prevention into TreeTransform.apply.
1749
        if self.final_file_id(self.root) is None:
1750
            inventory_delta = [e for e in inventory_delta if e[0] != '']
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1751
        self._tree.apply_inventory_delta(inventory_delta)
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1752
        self._apply_observed_sha1s()
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1753
        self._done = True
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1754
        self.finalize()
1755
        return _TransformResults(modified_paths, self.rename_count)
1756
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1757
    def _generate_inventory_delta(self):
3619.2.9 by Aaron Bentley
Update docs
1758
        """Generate an inventory delta for the current transform."""
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1759
        inventory_delta = []
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
1760
        child_pb = ui.ui_factory.nested_progress_bar()
3619.2.7 by Aaron Bentley
Fix progress handling
1761
        new_paths = self._inventory_altered()
1762
        total_entries = len(new_paths) + len(self._removed_id)
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1763
        try:
3619.2.2 by Aaron Bentley
Further cleanup
1764
            for num, trans_id in enumerate(self._removed_id):
3619.2.7 by Aaron Bentley
Fix progress handling
1765
                if (num % 10) == 0:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1766
                    child_pb.update(gettext('removing file'), num, total_entries)
3619.2.2 by Aaron Bentley
Further cleanup
1767
                if trans_id == self._new_root:
1768
                    file_id = self._tree.get_root_id()
1769
                else:
1770
                    file_id = self.tree_file_id(trans_id)
1771
                # File-id isn't really being deleted, just moved
1772
                if file_id in self._r_new_id:
1773
                    continue
1774
                path = self._tree_id_paths[trans_id]
1775
                inventory_delta.append((path, None, file_id, None))
3619.2.7 by Aaron Bentley
Fix progress handling
1776
            new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1777
                                     new_paths)
1778
            entries = self._tree.iter_entries_by_dir(
1779
                new_path_file_ids.values())
1780
            old_paths = dict((e.file_id, p) for p, e in entries)
1781
            final_kinds = {}
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1782
            for num, (path, trans_id) in enumerate(new_paths):
1783
                if (num % 10) == 0:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1784
                    child_pb.update(gettext('adding file'),
3619.2.7 by Aaron Bentley
Fix progress handling
1785
                                    num + len(self._removed_id), total_entries)
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1786
                file_id = new_path_file_ids[trans_id]
3619.2.2 by Aaron Bentley
Further cleanup
1787
                if file_id is None:
1788
                    continue
1789
                needs_entry = False
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
1790
                kind = self.final_kind(trans_id)
1791
                if kind is None:
3619.2.5 by Aaron Bentley
Reduce set tests
1792
                    kind = self._tree.stored_kind(file_id)
3619.2.4 by Aaron Bentley
Further restructuring
1793
                parent_trans_id = self.final_parent(trans_id)
1794
                parent_file_id = new_path_file_ids.get(parent_trans_id)
1795
                if parent_file_id is None:
1796
                    parent_file_id = self.final_file_id(parent_trans_id)
1797
                if trans_id in self._new_reference_revision:
1798
                    new_entry = inventory.TreeReference(
1799
                        file_id,
1800
                        self._new_name[trans_id],
1801
                        self.final_file_id(self._new_parent[trans_id]),
1802
                        None, self._new_reference_revision[trans_id])
1803
                else:
1804
                    new_entry = inventory.make_entry(kind,
1805
                        self.final_name(trans_id),
1806
                        parent_file_id, file_id)
1807
                old_path = old_paths.get(new_entry.file_id)
3619.2.8 by Aaron Bentley
Reorganize execute-bit handling
1808
                new_executability = self._new_executability.get(trans_id)
1809
                if new_executability is not None:
1810
                    new_entry.executable = new_executability
3619.2.4 by Aaron Bentley
Further restructuring
1811
                inventory_delta.append(
1812
                    (old_path, path, new_entry.file_id, new_entry))
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1813
        finally:
1814
            child_pb.finished()
1815
        return inventory_delta
1816
1817
    def _apply_removals(self, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1818
        """Perform tree operations that remove directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1819
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1820
        That is, delete files that are to be deleted, and put any files that
1821
        need renaming into limbo.  This must be done in strict child-to-parent
1822
        order.
3453.2.11 by Aaron Bentley
Updates from review
1823
1824
        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
1825
        """
1826
        tree_paths = list(self._tree_path_ids.iteritems())
1827
        tree_paths.sort(reverse=True)
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
1828
        child_pb = ui.ui_factory.nested_progress_bar()
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1829
        try:
5954.4.1 by Aaron Bentley
Never attempt to delete the tree root.
1830
            for num, (path, trans_id) in enumerate(tree_paths):
1831
                # do not attempt to move root into a subdirectory of itself.
1832
                if path == '':
1833
                    continue
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1834
                child_pb.update(gettext('removing file'), num, len(tree_paths))
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1835
                full_path = self._tree.abspath(path)
1836
                if trans_id in self._removed_contents:
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
1837
                    delete_path = os.path.join(self._deletiondir, trans_id)
1838
                    mover.pre_delete(full_path, delete_path)
1839
                elif (trans_id in self._new_name
1840
                      or trans_id in self._new_parent):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1841
                    try:
1842
                        mover.rename(full_path, self._limbo_name(trans_id))
5186.2.7 by Martin Pool
Update other cases where transform detects failure to rename
1843
                    except errors.TransformRenameFailed, e:
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1844
                        if e.errno != errno.ENOENT:
1845
                            raise
1846
                    else:
1847
                        self.rename_count += 1
1848
        finally:
1849
            child_pb.finished()
1850
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1851
    def _apply_insertions(self, mover):
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1852
        """Perform tree operations that insert directory/inventory names.
3008.1.19 by Aaron Bentley
Remove trailing whitespace
1853
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1854
        That is, create any files that need to be created, and restore from
1855
        limbo any files that needed renaming.  This must be done in strict
1856
        parent-to-child order.
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
1857
1858
        If inventory_delta is None, no inventory delta is calculated, and
1859
        no list of modified paths is returned.
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1860
        """
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1861
        new_paths = self.new_paths(filesystem_only=True)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1862
        modified_paths = []
3453.2.2 by Aaron Bentley
Avoid unnecessary file_id lookups
1863
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1864
                                 new_paths)
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
1865
        child_pb = ui.ui_factory.nested_progress_bar()
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1866
        try:
1867
            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
1868
                if (num % 10) == 0:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1869
                    child_pb.update(gettext('adding file'), num, len(new_paths))
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
1870
                full_path = self._tree.abspath(path)
1871
                if trans_id in self._needs_rename:
1872
                    try:
1873
                        mover.rename(self._limbo_name(trans_id), full_path)
5186.2.7 by Martin Pool
Update other cases where transform detects failure to rename
1874
                    except errors.TransformRenameFailed, e:
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
1875
                        # We may be renaming a dangling inventory id
1876
                        if e.errno != errno.ENOENT:
1877
                            raise
1878
                    else:
1879
                        self.rename_count += 1
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1880
                    # TODO: if trans_id in self._observed_sha1s, we should
1881
                    #       re-stat the final target, since ctime will be
1882
                    #       updated by the change.
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1883
                if (trans_id in self._new_contents or
1884
                    self.path_changed(trans_id)):
1885
                    if trans_id in self._new_contents:
1886
                        modified_paths.append(full_path)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1887
                if trans_id in self._new_executability:
3619.2.8 by Aaron Bentley
Reorganize execute-bit handling
1888
                    self._set_executability(path, trans_id)
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1889
                if trans_id in self._observed_sha1s:
1890
                    o_sha1, o_st_val = self._observed_sha1s[trans_id]
1891
                    st = osutils.lstat(full_path)
1892
                    self._observed_sha1s[trans_id] = (o_sha1, st)
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1893
        finally:
1894
            child_pb.finished()
5946.1.2 by John Arbash Meinel
Can't just delete trans_id in new_paths because some don't come from limbo.
1895
        for path, trans_id in new_paths:
1896
            # new_paths includes stuff like workingtree conflicts. Only the
1897
            # stuff in new_contents actually comes from limbo.
1898
            if trans_id in self._limbo_files:
1899
                del self._limbo_files[trans_id]
3619.2.1 by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals
1900
        self._new_contents.clear()
3008.1.7 by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase
1901
        return modified_paths
1902
5752.3.1 by John Arbash Meinel
Merge up from 2.4-windows-lfstat
1903
    def _apply_observed_sha1s(self):
1904
        """After we have finished renaming everything, update observed sha1s
1905
1906
        This has to be done after self._tree.apply_inventory_delta, otherwise
1907
        it doesn't know anything about the files we are updating. Also, we want
1908
        to do this as late as possible, so that most entries end up cached.
1909
        """
1910
        # TODO: this doesn't update the stat information for directories. So
1911
        #       the first 'bzr status' will still need to rewrite
1912
        #       .bzr/checkout/dirstate. However, we at least don't need to
1913
        #       re-read all of the files.
1914
        # TODO: If the operation took a while, we could do a time.sleep(3) here
1915
        #       to allow the clock to tick over and ensure we won't have any
1916
        #       problems. (we could observe start time, and finish time, and if
1917
        #       it is less than eg 10% overhead, add a sleep call.)
1918
        paths = FinalPaths(self)
1919
        for trans_id, observed in self._observed_sha1s.iteritems():
1920
            path = paths.get_path(trans_id)
1921
            # We could get the file_id, but dirstate prefers to use the path
1922
            # anyway, and it is 'cheaper' to determine.
1923
            # file_id = self._new_id[trans_id]
1924
            self._tree._observed_sha1(None, path, observed)
1925
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1926
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1927
class TransformPreview(DiskTreeTransform):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1928
    """A TreeTransform for generating preview trees.
1929
1930
    Unlike TreeTransform, this version works when the input tree is a
1931
    RevisionTree, rather than a WorkingTree.  As a result, it tends to ignore
1932
    unversioned files in the input tree.
1933
    """
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1934
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
1935
    def __init__(self, tree, pb=None, case_sensitive=True):
3199.1.5 by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
1936
        tree.lock_read()
3638.3.2 by Vincent Ladeuil
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.
1937
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
4354.5.1 by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo.
1938
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1939
1940
    def canonical_path(self, path):
1941
        return path
1942
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1943
    def tree_kind(self, trans_id):
1944
        path = self._tree_id_paths.get(trans_id)
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1945
        if path is None:
4597.9.13 by Vincent Ladeuil
bzrlib.transform.TreeTransform.tree_kind and
1946
            return None
5809.3.7 by Aaron Bentley
Fix behaviour of missing entries.
1947
        kind = self._tree.path_content_summary(path)[0]
1948
        if kind == 'missing':
1949
            kind = None
1950
        return kind
3008.1.9 by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged
1951
1952
    def _set_mode(self, trans_id, mode_id, typefunc):
1953
        """Set the mode of new file contents.
1954
        The mode_id is the existing file to get the mode from (often the same
1955
        as trans_id).  The operation is only performed if there's a mode match
1956
        according to typefunc.
1957
        """
1958
        # is it ok to ignore this?  probably
1959
        pass
1960
1961
    def iter_tree_children(self, parent_id):
1962
        """Iterate through the entry's tree children, if any"""
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1963
        try:
1964
            path = self._tree_id_paths[parent_id]
1965
        except KeyError:
1966
            return
1967
        file_id = self.tree_file_id(parent_id)
3363.5.2 by Aaron Bentley
Massive simplification of path2id
1968
        if file_id is None:
1969
            return
3363.17.5 by Aaron Bentley
Update merge to not use inventory
1970
        entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1971
        children = getattr(entry, 'children', {})
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
1972
        for child in children:
3008.2.1 by Aaron Bentley
Ensure conflict resolution works
1973
            childpath = joinpath(path, child)
1974
            yield self.trans_id_tree_path(childpath)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1975
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
1976
    def new_orphan(self, trans_id, parent_id):
1977
        raise NotImplementedError(self.new_orphan)
1978
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1979
5777.3.2 by Jelmer Vernooij
Fix PreviewTree.
1980
class _PreviewTree(tree.InventoryTree):
3008.1.29 by Aaron Bentley
Add docstrings, rename TT.__doc
1981
    """Partial implementation of Tree to support show_diff_trees"""
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1982
4354.4.4 by Aaron Bentley
Simplify by using CommitBuilder directly
1983
    def __init__(self, transform):
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
1984
        self._transform = transform
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1985
        self._final_paths = FinalPaths(transform)
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
1986
        self.__by_parent = None
3571.1.1 by Aaron Bentley
Allow set/get of parent_ids in PreviewTree
1987
        self._parent_ids = []
3363.17.22 by Aaron Bentley
Cache expensive operations
1988
        self._all_children_cache = {}
1989
        self._path2trans_id_cache = {}
1990
        self._final_name_cache = {}
4634.57.1 by Aaron Bentley
Cache iter_changes values instead of re-running.
1991
        self._iter_changes_cache = dict((c[0], c) for c in
1992
                                        self._transform.iter_changes())
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1993
1994
    def _content_change(self, file_id):
3363.3.3 by Aaron Bentley
Updates from review
1995
        """Return True if the content of this file changed"""
4634.57.1 by Aaron Bentley
Cache iter_changes values instead of re-running.
1996
        changes = self._iter_changes_cache.get(file_id)
3363.3.3 by Aaron Bentley
Updates from review
1997
        # changes[2] is true if the file content changed.  See
1998
        # InterTree.iter_changes.
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
1999
        return (changes is not None and changes[2])
2000
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
2001
    def _get_repository(self):
2002
        repo = getattr(self._transform._tree, '_repository', None)
2003
        if repo is None:
2004
            repo = self._transform._tree.branch.repository
2005
        return repo
2006
2007
    def _iter_parent_trees(self):
2008
        for revision_id in self.get_parent_ids():
2009
            try:
2010
                yield self.revision_tree(revision_id)
2011
            except errors.NoSuchRevisionInTree:
2012
                yield self._get_repository().revision_tree(revision_id)
2013
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2014
    def _get_file_revision(self, file_id, vf, tree_revision):
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
2015
        parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
2016
                       self._iter_parent_trees()]
2017
        vf.add_lines((file_id, tree_revision), parent_keys,
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
2018
                     self.get_file_lines(file_id))
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
2019
        repo = self._get_repository()
2020
        base_vf = repo.texts
2021
        if base_vf not in vf.fallback_versionedfiles:
2022
            vf.fallback_versionedfiles.append(base_vf)
2023
        return tree_revision
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
2024
5809.3.6 by Aaron Bentley
Fix PreviewTree.get_file_size.
2025
    def _stat_limbo_file(self, file_id=None, trans_id=None):
2026
        if trans_id is None:
2027
            trans_id = self._transform.trans_id_file_id(file_id)
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2028
        name = self._transform._limbo_name(trans_id)
2029
        return os.lstat(name)
2030
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2031
    @property
2032
    def _by_parent(self):
2033
        if self.__by_parent is None:
2034
            self.__by_parent = self._transform.by_parent()
2035
        return self.__by_parent
2036
3363.14.1 by Aaron Bentley
Update to support comparison
2037
    def _comparison_data(self, entry, path):
4595.11.13 by Martin Pool
Remove get_kind_and_executable_by_path; go back to using plain path_content_summary
2038
        kind, size, executable, link_or_sha1 = self.path_content_summary(path)
3363.14.3 by Aaron Bentley
Handle missing files better
2039
        if kind == 'missing':
2040
            kind = None
2041
            executable = False
2042
        else:
2043
            file_id = self._transform.final_file_id(self._path2trans_id(path))
2044
            executable = self.is_executable(file_id, path)
3363.14.1 by Aaron Bentley
Update to support comparison
2045
        return kind, executable, None
2046
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2047
    def is_locked(self):
2048
        return False
2049
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
2050
    def lock_read(self):
3008.1.18 by Aaron Bentley
Get supported PreviewTree functionality under test
2051
        # Perhaps in theory, this should lock the TreeTransform?
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2052
        return self
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
2053
2054
    def unlock(self):
2055
        pass
2056
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2057
    @property
2058
    def inventory(self):
2059
        """This Tree does not use inventory as its backing data."""
2060
        raise NotImplementedError(_PreviewTree.inventory)
2061
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2062
    def get_root_id(self):
2063
        return self._transform.final_file_id(self._transform.root)
2064
2065
    def all_file_ids(self):
3363.2.18 by Aaron Bentley
Implement correct all_file_ids for PreviewTree
2066
        tree_ids = set(self._transform._tree.all_file_ids())
2067
        tree_ids.difference_update(self._transform.tree_file_id(t)
2068
                                   for t in self._transform._removed_id)
2069
        tree_ids.update(self._transform._new_id.values())
2070
        return tree_ids
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2071
2072
    def __iter__(self):
2073
        return iter(self.all_file_ids())
2074
4544.2.1 by Robert Collins
Add interface enforcement for the behaviour of iter_changes with missing subtrees with explicit paths - the whole subtree is returned.
2075
    def _has_id(self, file_id, fallback_check):
3363.12.1 by Aaron Bentley
Remove new implementation of paths2ids, implement has_id
2076
        if file_id in self._transform._r_new_id:
2077
            return True
3981.1.1 by Robert Collins
Fix bug 319790 - unshelve of deleted paths failing.
2078
        elif file_id in set([self._transform.tree_file_id(trans_id) for
2079
            trans_id in self._transform._removed_id]):
3363.12.1 by Aaron Bentley
Remove new implementation of paths2ids, implement has_id
2080
            return False
2081
        else:
4544.2.1 by Robert Collins
Add interface enforcement for the behaviour of iter_changes with missing subtrees with explicit paths - the whole subtree is returned.
2082
            return fallback_check(file_id)
2083
2084
    def has_id(self, file_id):
2085
        return self._has_id(file_id, self._transform._tree.has_id)
2086
2087
    def has_or_had_id(self, file_id):
2088
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2089
3363.5.2 by Aaron Bentley
Massive simplification of path2id
2090
    def _path2trans_id(self, path):
3363.17.22 by Aaron Bentley
Cache expensive operations
2091
        # We must not use None here, because that is a valid value to store.
2092
        trans_id = self._path2trans_id_cache.get(path, object)
2093
        if trans_id is not object:
2094
            return trans_id
3363.5.2 by Aaron Bentley
Massive simplification of path2id
2095
        segments = splitpath(path)
3363.2.19 by Aaron Bentley
Make PreviewTree.path2id correct
2096
        cur_parent = self._transform.root
3363.5.2 by Aaron Bentley
Massive simplification of path2id
2097
        for cur_segment in segments:
2098
            for child in self._all_children(cur_parent):
3363.17.22 by Aaron Bentley
Cache expensive operations
2099
                final_name = self._final_name_cache.get(child)
2100
                if final_name is None:
2101
                    final_name = self._transform.final_name(child)
2102
                    self._final_name_cache[child] = final_name
2103
                if final_name == cur_segment:
3363.2.19 by Aaron Bentley
Make PreviewTree.path2id correct
2104
                    cur_parent = child
2105
                    break
2106
            else:
3363.17.22 by Aaron Bentley
Cache expensive operations
2107
                self._path2trans_id_cache[path] = None
3363.5.2 by Aaron Bentley
Massive simplification of path2id
2108
                return None
3363.17.22 by Aaron Bentley
Cache expensive operations
2109
        self._path2trans_id_cache[path] = cur_parent
3363.5.2 by Aaron Bentley
Massive simplification of path2id
2110
        return cur_parent
3363.2.26 by Aaron Bentley
Get symlinks working
2111
3363.2.20 by Aaron Bentley
Split path2id into smaller pieces
2112
    def path2id(self, path):
3363.5.2 by Aaron Bentley
Massive simplification of path2id
2113
        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
2114
2115
    def id2path(self, file_id):
2116
        trans_id = self._transform.trans_id_file_id(file_id)
2117
        try:
2118
            return self._final_paths._determine_path(trans_id)
2119
        except NoFinalPath:
2120
            raise errors.NoSuchId(self, file_id)
2121
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2122
    def _all_children(self, trans_id):
3363.17.22 by Aaron Bentley
Cache expensive operations
2123
        children = self._all_children_cache.get(trans_id)
2124
        if children is not None:
2125
            return children
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2126
        children = set(self._transform.iter_tree_children(trans_id))
2127
        # children in the _new_parent set are provided by _by_parent.
2128
        children.difference_update(self._transform._new_parent.keys())
2129
        children.update(self._by_parent.get(trans_id, []))
3363.17.22 by Aaron Bentley
Cache expensive operations
2130
        self._all_children_cache[trans_id] = children
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2131
        return children
2132
3363.12.2 by Aaron Bentley
Implement tree.iter_children to instead of adjusting InventoryEntry handling
2133
    def iter_children(self, file_id):
2134
        trans_id = self._transform.trans_id_file_id(file_id)
2135
        for child_trans_id in self._all_children(trans_id):
2136
            yield self._transform.final_file_id(child_trans_id)
2137
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
2138
    def extras(self):
2139
        possible_extras = set(self._transform.trans_id_tree_path(p) for p
2140
                              in self._transform._tree.extras())
3363.13.2 by Aaron Bentley
Test specific cases for PreviewTree.extras
2141
        possible_extras.update(self._transform._new_contents)
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
2142
        possible_extras.update(self._transform._removed_id)
2143
        for trans_id in possible_extras:
2144
            if self._transform.final_file_id(trans_id) is None:
2145
                yield self._final_paths._determine_path(trans_id)
2146
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
2147
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
2148
        yield_parents=False):
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2149
        for trans_id, parent_file_id in ordered_entries:
2150
            file_id = self._transform.final_file_id(trans_id)
2151
            if file_id is None:
2152
                continue
2153
            if (specific_file_ids is not None
2154
                and file_id not in specific_file_ids):
2155
                continue
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
2156
            kind = self._transform.final_kind(trans_id)
2157
            if kind is None:
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2158
                kind = self._transform._tree.stored_kind(file_id)
2159
            new_entry = inventory.make_entry(
2160
                kind,
2161
                self._transform.final_name(trans_id),
2162
                parent_file_id, file_id)
2163
            yield new_entry, trans_id
2164
3363.11.1 by Aaron Bentley
Cheap implementation of list_files
2165
    def _list_files_by_dir(self):
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2166
        todo = [ROOT_PARENT]
2167
        ordered_ids = []
2168
        while len(todo) > 0:
2169
            parent = todo.pop()
2170
            parent_file_id = self._transform.final_file_id(parent)
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
2171
            children = list(self._all_children(parent))
2172
            paths = dict(zip(children, self._final_paths.get_paths(children)))
2173
            children.sort(key=paths.get)
3363.5.4 by Aaron Bentley
Fix iteration order of iter_entries_by_dir
2174
            todo.extend(reversed(children))
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2175
            for trans_id in children:
2176
                ordered_ids.append((trans_id, parent_file_id))
3363.11.1 by Aaron Bentley
Cheap implementation of list_files
2177
        return ordered_ids
2178
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
2179
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
3363.11.1 by Aaron Bentley
Cheap implementation of list_files
2180
        # This may not be a maximally efficient implementation, but it is
2181
        # reasonably straightforward.  An implementation that grafts the
2182
        # TreeTransform changes onto the tree's iter_entries_by_dir results
2183
        # might be more efficient, but requires tricky inferences about stack
2184
        # position.
2185
        ordered_ids = self._list_files_by_dir()
3363.2.21 by Aaron Bentley
Implement iter_entries_by_dir
2186
        for entry, trans_id in self._make_inv_entries(ordered_ids,
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
2187
            specific_file_ids, yield_parents=yield_parents):
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
2188
            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
2189
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
2190
    def _iter_entries_for_dir(self, dir_path):
2191
        """Return path, entry for items in a directory without recursing down."""
2192
        dir_file_id = self.path2id(dir_path)
2193
        ordered_ids = []
2194
        for file_id in self.iter_children(dir_file_id):
2195
            trans_id = self._transform.trans_id_file_id(file_id)
2196
            ordered_ids.append((trans_id, file_id))
2197
        for entry, trans_id in self._make_inv_entries(ordered_ids):
2198
            yield unicode(self._final_paths.get_path(trans_id)), entry
2199
2200
    def list_files(self, include_root=False, from_dir=None, recursive=True):
2201
        """See WorkingTree.list_files."""
3363.11.1 by Aaron Bentley
Cheap implementation of list_files
2202
        # XXX This should behave like WorkingTree.list_files, but is really
2203
        # more like RevisionTree.list_files.
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
2204
        if recursive:
2205
            prefix = None
2206
            if from_dir:
2207
                prefix = from_dir + '/'
2208
            entries = self.iter_entries_by_dir()
2209
            for path, entry in entries:
2210
                if entry.name == '' and not include_root:
2211
                    continue
2212
                if prefix:
2213
                    if not path.startswith(prefix):
2214
                        continue
2215
                    path = path[len(prefix):]
2216
                yield path, 'V', entry.kind, entry.file_id, entry
2217
        else:
2218
            if from_dir is None and include_root is True:
2219
                root_entry = inventory.make_entry('directory', '',
2220
                    ROOT_PARENT, self.get_root_id())
2221
                yield '', 'V', 'directory', root_entry.file_id, root_entry
2222
            entries = self._iter_entries_for_dir(from_dir or '')
2223
            for path, entry in entries:
2224
                yield path, 'V', entry.kind, entry.file_id, entry
3363.11.1 by Aaron Bentley
Cheap implementation of list_files
2225
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2226
    def kind(self, file_id):
2227
        trans_id = self._transform.trans_id_file_id(file_id)
2228
        return self._transform.final_kind(trans_id)
2229
2230
    def stored_kind(self, file_id):
3363.2.36 by Aaron Bentley
Fix PreviewTree.stored_kind
2231
        trans_id = self._transform.trans_id_file_id(file_id)
2232
        try:
2233
            return self._transform._new_contents[trans_id]
2234
        except KeyError:
2235
            return self._transform._tree.stored_kind(file_id)
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2236
2237
    def get_file_mtime(self, file_id, path=None):
2238
        """See Tree.get_file_mtime"""
2239
        if not self._content_change(file_id):
4635.1.1 by Aaron Bentley
Fix OSError with renamed files in PreviewTree.
2240
            return self._transform._tree.get_file_mtime(file_id)
3363.2.9 by Aaron Bentley
Fix up some refactorings
2241
        return self._stat_limbo_file(file_id).st_mtime
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2242
3363.14.5 by Aaron Bentley
Add _file_size for comparison
2243
    def _file_size(self, entry, stat_value):
2244
        return self.get_file_size(entry.file_id)
2245
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2246
    def get_file_size(self, file_id):
3363.3.3 by Aaron Bentley
Updates from review
2247
        """See Tree.get_file_size"""
5809.3.6 by Aaron Bentley
Fix PreviewTree.get_file_size.
2248
        trans_id = self._transform.trans_id_file_id(file_id)
2249
        kind = self._transform.final_kind(trans_id)
2250
        if kind != 'file':
2251
            return None
2252
        if trans_id in self._transform._new_contents:
2253
            return self._stat_limbo_file(trans_id=trans_id).st_size
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2254
        if self.kind(file_id) == 'file':
2255
            return self._transform._tree.get_file_size(file_id)
3363.3.3 by Aaron Bentley
Updates from review
2256
        else:
2257
            return None
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2258
5906.1.9 by Jelmer Vernooij
Add PreviewTree.get_file_verifier.
2259
    def get_file_verifier(self, file_id, path=None, stat_value=None):
2260
        trans_id = self._transform.trans_id_file_id(file_id)
2261
        kind = self._transform._new_contents.get(trans_id)
2262
        if kind is None:
2263
            return self._transform._tree.get_file_verifier(file_id)
2264
        if kind == 'file':
2265
            fileobj = self.get_file(file_id)
2266
            try:
5906.1.10 by Jelmer Vernooij
sha1 -> SHA1
2267
                return ("SHA1", sha_file(fileobj))
5906.1.9 by Jelmer Vernooij
Add PreviewTree.get_file_verifier.
2268
            finally:
2269
                fileobj.close()
2270
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2271
    def get_file_sha1(self, file_id, path=None, stat_value=None):
3363.15.4 by Aaron Bentley
Implement PreviewTree.get_file_sha1 properly
2272
        trans_id = self._transform.trans_id_file_id(file_id)
2273
        kind = self._transform._new_contents.get(trans_id)
2274
        if kind is None:
2275
            return self._transform._tree.get_file_sha1(file_id)
2276
        if kind == 'file':
2277
            fileobj = self.get_file(file_id)
2278
            try:
2279
                return sha_file(fileobj)
2280
            finally:
2281
                fileobj.close()
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
2282
2283
    def is_executable(self, file_id, path=None):
3363.14.8 by Aaron Bentley
Fix more tests
2284
        if file_id is None:
2285
            return False
3363.2.37 by Aaron Bentley
Fix is_executable
2286
        trans_id = self._transform.trans_id_file_id(file_id)
2287
        try:
2288
            return self._transform._new_executability[trans_id]
2289
        except KeyError:
3363.17.17 by Aaron Bentley
Start testing merging PreviewTree as OTHER
2290
            try:
2291
                return self._transform._tree.is_executable(file_id, path)
2292
            except OSError, e:
2293
                if e.errno == errno.ENOENT:
2294
                    return False
2295
                raise
3363.17.18 by Aaron Bentley
Fix is_executable for PreviewTree
2296
            except errors.NoSuchId:
2297
                return False
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2298
5809.3.2 by Aaron Bentley
Support PreviewTree.has_filename.
2299
    def has_filename(self, path):
2300
        trans_id = self._path2trans_id(path)
2301
        if trans_id in self._transform._new_contents:
2302
            return True
2303
        elif trans_id in self._transform._removed_contents:
2304
            return False
2305
        else:
2306
            return self._transform._tree.has_filename(path)
2307
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2308
    def path_content_summary(self, path):
3363.6.1 by Aaron Bentley
Merge with preview-tree-changed
2309
        trans_id = self._path2trans_id(path)
3363.2.27 by Aaron Bentley
Make path_content_summary a core API
2310
        tt = self._transform
3363.6.1 by Aaron Bentley
Merge with preview-tree-changed
2311
        tree_path = tt._tree_id_paths.get(trans_id)
3363.2.27 by Aaron Bentley
Make path_content_summary a core API
2312
        kind = tt._new_contents.get(trans_id)
2313
        if kind is None:
3363.6.1 by Aaron Bentley
Merge with preview-tree-changed
2314
            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
2315
                return 'missing', None, None, None
2316
            summary = tt._tree.path_content_summary(tree_path)
2317
            kind, size, executable, link_or_sha1 = summary
2318
        else:
2319
            link_or_sha1 = None
2320
            limbo_name = tt._limbo_name(trans_id)
2321
            if trans_id in tt._new_reference_revision:
2322
                kind = 'tree-reference'
2323
            if kind == 'file':
2324
                statval = os.lstat(limbo_name)
2325
                size = statval.st_size
2326
                if not supports_executable():
4789.16.1 by John Arbash Meinel
Tweak the PreviewTree.path_content_summary tests for executablity on windows.
2327
                    executable = False
3363.2.27 by Aaron Bentley
Make path_content_summary a core API
2328
                else:
2329
                    executable = statval.st_mode & S_IEXEC
2330
            else:
2331
                size = None
2332
                executable = None
2333
            if kind == 'symlink':
4095.3.1 by Vincent Ladeuil
Fix #339055 and #277444 by handling non ascii symlink targets.
2334
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
4789.16.1 by John Arbash Meinel
Tweak the PreviewTree.path_content_summary tests for executablity on windows.
2335
        executable = tt._new_executability.get(trans_id, executable)
3363.2.27 by Aaron Bentley
Make path_content_summary a core API
2336
        return kind, size, executable, link_or_sha1
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2337
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
2338
    def iter_changes(self, from_tree, include_unchanged=False,
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
2339
                      specific_files=None, pb=None, extra_trees=None,
2340
                      require_versioned=True, want_unversioned=False):
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
2341
        """See InterTree.iter_changes.
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
2342
3363.19.1 by Aaron Bentley
Make PreviewTree.iter_changes accept all options.
2343
        This has a fast path that is only used when the from_tree matches
2344
        the transform tree, and no fancy options are supplied.
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
2345
        """
3363.19.1 by Aaron Bentley
Make PreviewTree.iter_changes accept all options.
2346
        if (from_tree is not self._transform._tree or include_unchanged or
2347
            specific_files or want_unversioned):
3363.14.1 by Aaron Bentley
Update to support comparison
2348
            return tree.InterTree(from_tree, self).iter_changes(
2349
                include_unchanged=include_unchanged,
2350
                specific_files=specific_files,
2351
                pb=pb,
2352
                extra_trees=extra_trees,
2353
                require_versioned=require_versioned,
2354
                want_unversioned=want_unversioned)
3008.1.17 by Aaron Bentley
Test unused parameters of preview_tree._iter_changes
2355
        if want_unversioned:
2356
            raise ValueError('want_unversioned is not supported')
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
2357
        return self._transform.iter_changes()
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
2358
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2359
    def get_file(self, file_id, path=None):
3008.1.20 by Aaron Bentley
Add some docstrings
2360
        """See Tree.get_file"""
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2361
        if not self._content_change(file_id):
2362
            return self._transform._tree.get_file(file_id, path)
3008.1.3 by Aaron Bentley
Support basic diff
2363
        trans_id = self._transform.trans_id_file_id(file_id)
2364
        name = self._transform._limbo_name(trans_id)
2365
        return open(name, 'rb')
2366
4354.4.5 by Aaron Bentley
Ensure Tree.get_file_with_stat is provided.
2367
    def get_file_with_stat(self, file_id, path=None):
4354.4.2 by Aaron Bentley
Allow committing a file add to a PreviewTree.
2368
        return self.get_file(file_id, path), None
2369
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2370
    def annotate_iter(self, file_id,
2371
                      default_revision=_mod_revision.CURRENT_REVISION):
4634.57.1 by Aaron Bentley
Cache iter_changes values instead of re-running.
2372
        changes = self._iter_changes_cache.get(file_id)
3363.2.35 by Aaron Bentley
Update to get tests passing
2373
        if changes is None:
2374
            get_old = True
3363.2.33 by Aaron Bentley
Implement PreviewTree.annotate_iter
2375
        else:
3363.2.35 by Aaron Bentley
Update to get tests passing
2376
            changed_content, versioned, kind = (changes[2], changes[3],
2377
                                                changes[6])
2378
            if kind[1] is None:
2379
                return None
2380
            get_old = (kind[0] == 'file' and versioned[0])
2381
        if get_old:
3363.2.33 by Aaron Bentley
Implement PreviewTree.annotate_iter
2382
            old_annotation = self._transform._tree.annotate_iter(file_id,
2383
                default_revision=default_revision)
3363.2.35 by Aaron Bentley
Update to get tests passing
2384
        else:
2385
            old_annotation = []
2386
        if changes is None:
2387
            return old_annotation
3363.2.33 by Aaron Bentley
Implement PreviewTree.annotate_iter
2388
        if not changed_content:
2389
            return old_annotation
4454.3.70 by John Arbash Meinel
Some comments about the PreviewTree.annotate_iter implementation.
2390
        # TODO: This is doing something similar to what WT.annotate_iter is
2391
        #       doing, however it fails slightly because it doesn't know what
2392
        #       the *other* revision_id is, so it doesn't know how to give the
2393
        #       other as the origin for some lines, they all get
2394
        #       'default_revision'
2395
        #       It would be nice to be able to use the new Annotator based
2396
        #       approach, as well.
3363.2.33 by Aaron Bentley
Implement PreviewTree.annotate_iter
2397
        return annotate.reannotate([old_annotation],
2398
                                   self.get_file(file_id).readlines(),
2399
                                   default_revision)
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2400
5858.1.1 by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target.
2401
    def get_symlink_target(self, file_id, path=None):
3228.1.1 by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so
2402
        """See Tree.get_symlink_target"""
3363.2.29 by Aaron Bentley
Remove unneeded changes
2403
        if not self._content_change(file_id):
2404
            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
2405
        trans_id = self._transform.trans_id_file_id(file_id)
3363.2.29 by Aaron Bentley
Remove unneeded changes
2406
        name = self._transform._limbo_name(trans_id)
4241.14.16 by Vincent Ladeuil
Fix _PreviewTree.get_symlink_target for unicode symlinks.
2407
        return osutils.readlink(name)
3228.1.1 by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so
2408
3363.9.9 by Aaron Bentley
Implement walkdirs in terms of TreeTransform
2409
    def walkdirs(self, prefix=''):
2410
        pending = [self._transform.root]
2411
        while len(pending) > 0:
2412
            parent_id = pending.pop()
2413
            children = []
2414
            subdirs = []
2415
            prefix = prefix.rstrip('/')
2416
            parent_path = self._final_paths.get_path(parent_id)
2417
            parent_file_id = self._transform.final_file_id(parent_id)
2418
            for child_id in self._all_children(parent_id):
2419
                path_from_root = self._final_paths.get_path(child_id)
2420
                basename = self._transform.final_name(child_id)
3363.9.10 by Aaron Bentley
Handle dangling file-ids correctly
2421
                file_id = self._transform.final_file_id(child_id)
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
2422
                kind  = self._transform.final_kind(child_id)
2423
                if kind is not None:
3363.9.10 by Aaron Bentley
Handle dangling file-ids correctly
2424
                    versioned_kind = kind
4597.9.7 by Vincent Ladeuil
transform.final_kind() now returns None instead of raising NoSuchFile.
2425
                else:
3363.9.10 by Aaron Bentley
Handle dangling file-ids correctly
2426
                    kind = 'unknown'
2427
                    versioned_kind = self._transform._tree.stored_kind(file_id)
2428
                if versioned_kind == 'directory':
3363.9.9 by Aaron Bentley
Implement walkdirs in terms of TreeTransform
2429
                    subdirs.append(child_id)
2430
                children.append((path_from_root, basename, kind, None,
3363.9.10 by Aaron Bentley
Handle dangling file-ids correctly
2431
                                 file_id, versioned_kind))
3363.9.9 by Aaron Bentley
Implement walkdirs in terms of TreeTransform
2432
            children.sort()
2433
            if parent_path.startswith(prefix):
2434
                yield (parent_path, parent_file_id), children
2435
            pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2436
                                  reverse=True))
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2437
2438
    def get_parent_ids(self):
3571.1.1 by Aaron Bentley
Allow set/get of parent_ids in PreviewTree
2439
        return self._parent_ids
2440
2441
    def set_parent_ids(self, parent_ids):
2442
        self._parent_ids = parent_ids
3363.2.4 by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests
2443
2444
    def get_revision_tree(self, revision_id):
2445
        return self._transform._tree.get_revision_tree(revision_id)
3008.1.1 by Aaron Bentley
Start work allowing previews of transforms
2446
2447
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
2448
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
2449
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
2450
    if parent is None or parent == "":
2451
        return child
2452
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
2453
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2454
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
2455
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2456
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2457
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
2458
2459
    The underlying tree must not be manipulated between calls, or else
2460
    the results will likely be incorrect.
2461
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
2462
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2463
        object.__init__(self)
2464
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
2465
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2466
2467
    def _determine_path(self, trans_id):
4526.9.23 by Robert Collins
Change the tree transform test_first_commit test to set a root id in the new tree, and workaround an apparent bug in TreeTransform._determine_path.
2468
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2469
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
2470
        name = self.transform.final_name(trans_id)
2471
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
2472
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2473
            return name
2474
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
2475
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2476
2477
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
2478
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
2479
        if trans_id not in self._known_paths:
2480
            self._known_paths[trans_id] = self._determine_path(trans_id)
2481
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2482
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
2483
    def get_paths(self, trans_ids):
2484
        return [(self.get_path(t), t) for t in trans_ids]
2485
2486
3006.2.2 by Alexander Belchenko
tests added.
2487
1534.7.30 by Aaron Bentley
Factored out topological id sorting
2488
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
2489
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
2490
    file_ids = list(tree)
2491
    file_ids.sort(key=tree.id2path)
2492
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2493
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2494
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
2495
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
2496
               delta_from_tree=False):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2497
    """Create working tree for a branch, using a TreeTransform.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2498
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2499
    This function should be used on empty trees, having a tree root at most.
2500
    (see merge and revert functionality for working with existing trees)
2501
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2502
    Existing files are handled like so:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2503
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2504
    - Existing bzrdirs take precedence over creating new items.  They are
2505
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2506
    - Otherwise, if the content on disk matches the content we are building,
2507
      it is silently replaced.
2508
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
3123.5.17 by Aaron Bentley
Update docs
2509
2510
    :param tree: The tree to convert wt into a copy of
2511
    :param wt: The working tree that files will be placed into
2512
    :param accelerator_tree: A tree which can be used for retrieving file
2513
        contents more quickly than tree itself, i.e. a workingtree.  tree
2514
        will be used for cases where accelerator_tree's content is different.
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2515
    :param hardlink: If true, hard-link files to accelerator_tree, where
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
2516
        possible.  accelerator_tree must implement abspath, i.e. be a
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2517
        working tree.
3453.2.6 by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment
2518
    :param delta_from_tree: If true, build_tree may use the input Tree to
2519
        generate the inventory delta.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2520
    """
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.
2521
    wt.lock_tree_write()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
2522
    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.
2523
        tree.lock_read()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
2524
        try:
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
2525
            if accelerator_tree is not None:
2526
                accelerator_tree.lock_read()
2527
            try:
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
2528
                return _build_tree(tree, wt, accelerator_tree, hardlink,
3453.2.6 by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment
2529
                                   delta_from_tree)
3123.5.1 by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree
2530
            finally:
2531
                if accelerator_tree is not None:
2532
                    accelerator_tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
2533
        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.
2534
            tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
2535
    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.
2536
        wt.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
2537
3006.2.2 by Alexander Belchenko
tests added.
2538
3453.2.6 by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment
2539
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
2540
    """See build_tree."""
3146.8.17 by Aaron Bentley
Change to explicit file_id list
2541
    for num, _unused in enumerate(wt.all_file_ids()):
3146.8.16 by Aaron Bentley
Updates from review
2542
        if num > 0:  # more than just a root
2543
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2544
    file_trans_id = {}
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
2545
    top_pb = ui.ui_factory.nested_progress_bar()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
2546
    pp = ProgressPhase("Build phase", 2, top_pb)
6220.4.1 by Jelmer Vernooij
Some cleanups in bzrlib.transform.
2547
    if tree.get_root_id() is not None:
2502.1.6 by Aaron Bentley
Update from review comments
2548
        # This is kind of a hack: we should be altering the root
2549
        # as part of the regular tree shape diff logic.
2550
        # 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.
2551
        # expensive operation (flush) every time the root id
2552
        # is set within the tree, nor setting the root and thus
2553
        # marking the tree as dirty, because we use two different
2554
        # 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('')
2555
        if wt.get_root_id() != tree.get_root_id():
2556
            wt.set_root_id(tree.get_root_id())
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
2557
            wt.flush()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2558
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2559
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2560
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
2561
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2562
        file_trans_id[wt.get_root_id()] = \
2563
            tt.trans_id_tree_file_id(wt.get_root_id())
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
2564
        pb = ui.ui_factory.nested_progress_bar()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
2565
        try:
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
2566
            deferred_contents = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2567
            num = 0
6220.4.1 by Jelmer Vernooij
Some cleanups in bzrlib.transform.
2568
            total = len(tree.all_file_ids())
3453.2.6 by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment
2569
            if delta_from_tree:
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
2570
                precomputed_delta = []
2571
            else:
2572
                precomputed_delta = None
5268.2.7 by Parth Malwankar
fixed comment
2573
            # Check if tree inventory has content. If so, we populate
5268.2.3 by Parth Malwankar
keep the tree_entries list lazy to ensure progress bar works
2574
            # existing_files with the directory content. If there are no
2575
            # entries we skip populating existing_files as its not used.
2576
            # This improves performance and unncessary work on large
2577
            # directory trees. (#501307)
5268.2.5 by Parth Malwankar
simplified conditional file list creating using existing count.
2578
            if total > 0:
5268.2.1 by Parth Malwankar
init no longer iterates files in dir.
2579
                existing_files = set()
2580
                for dir, files in wt.walkdirs():
2581
                    existing_files.update(f[0] for f in files)
5268.2.5 by Parth Malwankar
simplified conditional file list creating using existing count.
2582
            for num, (tree_path, entry) in \
6220.4.1 by Jelmer Vernooij
Some cleanups in bzrlib.transform.
2583
                enumerate(tree.iter_entries_by_dir()):
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
2584
                pb.update(gettext("Building tree"), num - len(deferred_contents), total)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
2585
                if entry.parent_id is None:
2586
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2587
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2588
                file_id = entry.file_id
3453.2.6 by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment
2589
                if delta_from_tree:
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
2590
                    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
2591
                if tree_path in existing_files:
2592
                    target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2593
                    kind = file_kind(target_path)
2594
                    if kind == "directory":
2595
                        try:
6207.3.3 by jelmer at samba
Fix tests and the like.
2596
                            controldir.ControlDir.open(target_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2597
                        except errors.NotBranchError:
2598
                            pass
2599
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2600
                            divert.add(file_id)
2601
                    if (file_id not in divert and
2602
                        _content_match(tree, entry, file_id, kind,
2603
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2604
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
2605
                        if kind == 'directory':
2606
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
2607
                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
2608
                if entry.kind == 'file':
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
2609
                    # We *almost* replicate new_by_entry, so that we can defer
2610
                    # getting the file text, and get them all at once.
2611
                    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
2612
                    file_trans_id[file_id] = trans_id
3483.1.1 by Ian Clatworthy
minor _build_tree cleanups
2613
                    tt.version_file(file_id, trans_id)
2614
                    executable = tree.is_executable(file_id, tree_path)
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
2615
                    if executable:
2708.1.8 by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress
2616
                        tt.set_executability(executable, trans_id)
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
2617
                    trans_data = (trans_id, tree_path, entry.text_sha1)
3368.2.27 by Ian Clatworthy
merge bzr.dev r3564
2618
                    deferred_contents.append((file_id, trans_data))
2708.1.2 by Aaron Bentley
Use extract_files_bytes for build_tree
2619
                else:
2620
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2621
                                                          tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2622
                if reparent:
2623
                    new_trans_id = file_trans_id[file_id]
2624
                    old_parent = tt.trans_id_tree_path(tree_path)
2625
                    _reparent_children(tt, old_parent, new_trans_id)
3136.1.11 by Aaron Bentley
Updates from review
2626
            offset = num + 1 - len(deferred_contents)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2627
            _create_files(tt, tree, deferred_contents, pb, offset,
2628
                          accelerator_tree, hardlink)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
2629
        finally:
2630
            pb.finished()
2631
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2632
        divert_trans = set(file_trans_id[f] for f in divert)
2633
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
2634
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
3453.2.4 by Aaron Bentley
Disable fast-path when conflicts are encountered
2635
        if len(raw_conflicts) > 0:
2636
            precomputed_delta = None
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2637
        conflicts = cook_conflicts(raw_conflicts, tt)
2638
        for conflict in conflicts:
5898.1.6 by Martin
Avoid implicit str casting in trace methods by calling unicode() on conflict objects first
2639
            trace.warning(unicode(conflict))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2640
        try:
2641
            wt.add_conflicts(conflicts)
2642
        except errors.UnsupportedOperation:
2643
            pass
3453.2.3 by Aaron Bentley
Enable using a precomputed inventory delta for build_tree.
2644
        result = tt.apply(no_conflicts=True,
2645
                          precomputed_delta=precomputed_delta)
1534.7.47 by Aaron Bentley
Started work on 'revert'
2646
    finally:
2647
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
2648
        top_pb.finished()
2502.1.5 by Aaron Bentley
Cleanup
2649
    return result
1534.7.47 by Aaron Bentley
Started work on 'revert'
2650
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2651
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2652
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2653
                  hardlink):
2654
    total = len(desired_files) + offset
4208.4.1 by Ian Clatworthy
eol conversion support
2655
    wt = tt._tree
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
2656
    if accelerator_tree is None:
2657
        new_desired_files = desired_files
2658
    else:
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
2659
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
4826.1.1 by Andrew Bennetts
Quick change to allow hardlinking from a tree that supports content filtering for files that are unaffected by filters.
2660
        unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2661
                     in iter if not (c or e[0] != e[1])]
2662
        if accelerator_tree.supports_content_filtering():
2663
            unchanged = [(f, p) for (f, p) in unchanged
2664
                         if not accelerator_tree.iter_search_rules([p]).next()]
2665
        unchanged = dict(unchanged)
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
2666
        new_desired_files = []
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2667
        count = 0
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
2668
        for file_id, (trans_id, tree_path, text_sha1) in desired_files:
3123.5.13 by Aaron Bentley
Accelerate further by using iter_changes
2669
            accelerator_path = unchanged.get(file_id)
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
2670
            if accelerator_path is None:
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
2671
                new_desired_files.append((file_id,
2672
                    (trans_id, tree_path, text_sha1)))
3123.5.12 by Aaron Bentley
Try to optimize iter_changes_accelerated
2673
                continue
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
2674
            pb.update(gettext('Adding file contents'), count + offset, total)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2675
            if hardlink:
3136.1.4 by Aaron Bentley
Avoid id2abspath calls
2676
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2677
                                   trans_id)
2678
            else:
2679
                contents = accelerator_tree.get_file(file_id, accelerator_path)
4208.4.1 by Ian Clatworthy
eol conversion support
2680
                if wt.supports_content_filtering():
2681
                    filters = wt._content_filter_stack(tree_path)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
2682
                    contents = filtered_output_bytes(contents, filters,
2683
                        ContentFilterContext(tree_path, tree))
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2684
                try:
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
2685
                    tt.create_file(contents, trans_id, sha1=text_sha1)
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2686
                finally:
3368.2.29 by Ian Clatworthy
access rules via get_special_file to fix recursion bug
2687
                    try:
2688
                        contents.close()
2689
                    except AttributeError:
2690
                        # after filtering, contents may no longer be file-like
2691
                        pass
3136.1.2 by Aaron Bentley
Implement hard-linking for build_tree
2692
            count += 1
2693
        offset += count
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
2694
    for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
3368.2.20 by Ian Clatworthy
move filtering up the layers in TreeTransform
2695
            tree.iter_files_bytes(new_desired_files)):
4208.4.1 by Ian Clatworthy
eol conversion support
2696
        if wt.supports_content_filtering():
2697
            filters = wt._content_filter_stack(tree_path)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
2698
            contents = filtered_output_bytes(contents, filters,
2699
                ContentFilterContext(tree_path, tree))
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
2700
        tt.create_file(contents, trans_id, sha1=text_sha1)
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
2701
        pb.update(gettext('Adding file contents'), count + offset, total)
3123.5.5 by Aaron Bentley
Split out _iter_files_bytes_accelerated
2702
2703
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2704
def _reparent_children(tt, old_parent, new_parent):
2705
    for child in tt.iter_tree_children(old_parent):
2706
        tt.adjust_path(tt.final_name(child), new_parent, child)
2707
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
2708
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
2709
def _reparent_transform_children(tt, old_parent, new_parent):
2710
    by_parent = tt.by_parent()
2711
    for child in by_parent[old_parent]:
2712
        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)
2713
    return by_parent[old_parent]
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2714
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
2715
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2716
def _content_match(tree, entry, file_id, kind, target_path):
2717
    if entry.kind != kind:
2718
        return False
2719
    if entry.kind == "directory":
2720
        return True
2721
    if entry.kind == "file":
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
2722
        f = file(target_path, 'rb')
2723
        try:
2724
            if tree.get_file_text(file_id) == f.read():
2725
                return True
2726
        finally:
2727
            f.close()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2728
    elif entry.kind == "symlink":
2729
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
2730
            return True
2731
    return False
2732
2733
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2734
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2735
    new_conflicts = set()
2736
    for c_type, conflict in ((c[0], c) for c in conflicts):
2737
        # Anything but a 'duplicate' would indicate programmer error
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2738
        if c_type != 'duplicate':
2739
            raise AssertionError(c_type)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2740
        # 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
2741
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2742
            new_file = conflict[1]
2743
            old_file = conflict[2]
2744
        else:
2745
            new_file = conflict[2]
2746
            old_file = conflict[1]
2747
2748
        # We should only get here if the conflict wasn't completely
2749
        # resolved
2750
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
2751
        if new_file in divert:
2752
            new_name = tt.final_name(old_file)+'.diverted'
2753
            tt.adjust_path(new_name, final_parent, new_file)
2754
            new_conflicts.add((c_type, 'Diverted to',
2755
                               new_file, old_file))
2756
        else:
2757
            new_name = tt.final_name(old_file)+'.moved'
2758
            tt.adjust_path(new_name, final_parent, old_file)
2759
            new_conflicts.add((c_type, 'Moved existing file to',
2760
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
2761
    return new_conflicts
2762
2763
1534.7.47 by Aaron Bentley
Started work on 'revert'
2764
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
2765
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
2766
    name = entry.name
2767
    kind = entry.kind
2768
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
2769
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
2770
        executable = tree.is_executable(entry.file_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2771
        return tt.new_file(name, parent_id, contents, entry.file_id,
1534.7.47 by Aaron Bentley
Started work on 'revert'
2772
                           executable)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
2773
    elif kind in ('directory', 'tree-reference'):
2774
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
2775
        if kind == 'tree-reference':
2776
            tt.set_tree_reference(entry.reference_revision, trans_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2777
        return trans_id
1534.7.47 by Aaron Bentley
Started work on 'revert'
2778
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
2779
        target = tree.get_symlink_target(entry.file_id)
2780
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
2781
    else:
2782
        raise errors.BadFileKindError(name, kind)
1534.7.47 by Aaron Bentley
Started work on 'revert'
2783
3006.2.2 by Alexander Belchenko
tests added.
2784
4443.2.1 by Ian Clatworthy
apply content filters when merging new files
2785
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2786
    filter_tree_path=None):
2787
    """Create new file contents according to tree contents.
2788
    
2789
    :param filter_tree_path: the tree path to use to lookup
2790
      content filters to apply to the bytes output in the working tree.
2791
      This only applies if the working tree supports content filtering.
2792
    """
3363.17.24 by Aaron Bentley
Implement create_by_tree
2793
    kind = tree.kind(file_id)
2794
    if kind == 'directory':
2795
        tt.create_directory(trans_id)
2796
    elif kind == "file":
3363.17.25 by Aaron Bentley
remove get_inventory_entry, replace with create_from_tree
2797
        if bytes is None:
2798
            tree_file = tree.get_file(file_id)
2799
            try:
2800
                bytes = tree_file.readlines()
2801
            finally:
2802
                tree_file.close()
4443.2.1 by Ian Clatworthy
apply content filters when merging new files
2803
        wt = tt._tree
2804
        if wt.supports_content_filtering() and filter_tree_path is not None:
2805
            filters = wt._content_filter_stack(filter_tree_path)
2806
            bytes = filtered_output_bytes(bytes, filters,
2807
                ContentFilterContext(filter_tree_path, tree))
3363.17.25 by Aaron Bentley
remove get_inventory_entry, replace with create_from_tree
2808
        tt.create_file(bytes, trans_id)
3363.17.24 by Aaron Bentley
Implement create_by_tree
2809
    elif kind == "symlink":
2810
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
3363.17.27 by Aaron Bentley
Add default case for create_from_tree
2811
    else:
2812
        raise AssertionError('Unknown kind %r' % kind)
3363.17.24 by Aaron Bentley
Implement create_by_tree
2813
2814
1534.7.89 by Aaron Bentley
Handle all content types in three-way
2815
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
2816
    """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
2817
    if entry.kind == "file":
2818
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
2819
1534.7.157 by Aaron Bentley
Added more docs
2820
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
2821
@deprecated_function(deprecated_in((2, 3, 0)))
1534.10.28 by Aaron Bentley
Use numbered backup files
2822
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2823
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2824
2825
5409.1.11 by Vincent Ladeuil
Slightly cleanup bzrlib.transform and deprecate unused code.
2826
@deprecated_function(deprecated_in((2, 3, 0)))
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2827
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1534.10.28 by Aaron Bentley
Use numbered backup files
2828
    """Produce a backup-style name that appears to be available"""
2829
    def name_gen():
2830
        counter = 1
2831
        while True:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2832
            yield "%s.~%d~" % (name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
2833
            counter += 1
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2834
    for new_name in name_gen():
2835
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2836
            return new_name
2837
1534.10.28 by Aaron Bentley
Use numbered backup files
2838
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2839
def revert(working_tree, target_tree, filenames, backups=False,
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2840
           pb=None, change_reporter=None):
1534.7.157 by Aaron Bentley
Added more docs
2841
    """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.
2842
    target_tree.lock_read()
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2843
    pb = ui.ui_factory.nested_progress_bar()
1534.9.7 by Aaron Bentley
Show progress bars in revert
2844
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
2845
    try:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2846
        pp = ProgressPhase("Revert phase", 3, pb)
3363.2.10 by Aaron Bentley
Refactor _prepare_revert_transform out of revert
2847
        conflicts, merge_modified = _prepare_revert_transform(
2848
            working_tree, target_tree, tt, filenames, backups, pp)
1551.11.5 by Aaron Bentley
cleanup
2849
        if change_reporter:
1551.10.25 by Aaron Bentley
Make ChangeReporter private
2850
            change_reporter = delta._ChangeReporter(
2255.7.98 by Robert Collins
Merge bzr.dev.
2851
                unversioned_filter=working_tree.is_ignored)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
2852
            delta.report_changes(tt.iter_changes(), change_reporter)
1551.11.6 by Aaron Bentley
Emit change listings before conflict warnings
2853
        for conflict in conflicts:
5898.1.6 by Martin
Avoid implicit str casting in trace methods by calling unicode() on conflict objects first
2854
            trace.warning(unicode(conflict))
1551.11.6 by Aaron Bentley
Emit change listings before conflict warnings
2855
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2856
        tt.apply()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
2857
        working_tree.set_merge_modified(merge_modified)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2858
    finally:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2859
        target_tree.unlock()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
2860
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
2861
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
2862
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
2863
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
2864
3363.2.10 by Aaron Bentley
Refactor _prepare_revert_transform out of revert
2865
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
3363.2.17 by Aaron Bentley
Start implementing post-change PreviewTree functionality
2866
                              backups, pp, basis_tree=None,
2867
                              merge_modified=None):
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
2868
    child_pb = ui.ui_factory.nested_progress_bar()
3363.2.10 by Aaron Bentley
Refactor _prepare_revert_transform out of revert
2869
    try:
3363.2.17 by Aaron Bentley
Start implementing post-change PreviewTree functionality
2870
        if merge_modified is None:
2871
            merge_modified = working_tree.merge_modified()
3363.2.10 by Aaron Bentley
Refactor _prepare_revert_transform out of revert
2872
        merge_modified = _alter_files(working_tree, target_tree, tt,
3363.2.17 by Aaron Bentley
Start implementing post-change PreviewTree functionality
2873
                                      child_pb, filenames, backups,
2874
                                      merge_modified, basis_tree)
3363.2.10 by Aaron Bentley
Refactor _prepare_revert_transform out of revert
2875
    finally:
2876
        child_pb.finished()
5582.10.4 by Jelmer Vernooij
Fix a bunch of tests.
2877
    child_pb = ui.ui_factory.nested_progress_bar()
3363.2.10 by Aaron Bentley
Refactor _prepare_revert_transform out of revert
2878
    try:
2879
        raw_conflicts = resolve_conflicts(tt, child_pb,
2880
            lambda t, c: conflict_pass(t, c, target_tree))
2881
    finally:
2882
        child_pb.finished()
2883
    conflicts = cook_conflicts(raw_conflicts, tt)
2884
    return conflicts, merge_modified
2885
2886
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2887
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
3363.2.17 by Aaron Bentley
Start implementing post-change PreviewTree functionality
2888
                 backups, merge_modified, basis_tree=None):
3363.10.25 by Aaron Bentley
_alter_files locks supplied basis_tree
2889
    if basis_tree is not None:
2890
        basis_tree.lock_read()
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2891
    # We ask the working_tree for its changes relative to the target, rather
2892
    # than the target changes relative to the working tree. Because WT4 has an
2893
    # optimizer to compare itself to a target, but no optimizer for the
2894
    # reverse.
5783.3.3 by John Arbash Meinel
Now swap the ordering, tests still pass.
2895
    change_list = working_tree.iter_changes(target_tree,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2896
        specific_files=specific_files, pb=pb)
3363.10.5 by Aaron Bentley
Fix locking issue
2897
    if target_tree.get_root_id() is None:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2898
        skip_root = True
2899
    else:
2900
        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.
2901
    try:
2708.1.5 by Aaron Bentley
Use Tree.extract_files_bytes in revert
2902
        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.
2903
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2904
                kind, executable) in enumerate(change_list):
5783.3.3 by John Arbash Meinel
Now swap the ordering, tests still pass.
2905
            target_path, wt_path = path
2906
            target_versioned, wt_versioned = versioned
2907
            target_parent, wt_parent = parent
2908
            target_name, wt_name = name
2909
            target_kind, wt_kind = kind
2910
            target_executable, wt_executable = executable
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2911
            if skip_root and wt_parent is None:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2912
                continue
2913
            trans_id = tt.trans_id_file_id(file_id)
2914
            mode_id = None
2915
            if changed_content:
2916
                keep_content = False
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2917
                if wt_kind == 'file' and (backups or target_kind is None):
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2918
                    wt_sha1 = working_tree.get_file_sha1(file_id)
2919
                    if merge_modified.get(file_id) != wt_sha1:
2502.1.6 by Aaron Bentley
Update from review comments
2920
                        # acquire the basis tree lazily to prevent the
2921
                        # expense of accessing it when it's not needed ?
2922
                        # (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.
2923
                        if basis_tree is None:
2924
                            basis_tree = working_tree.basis_tree()
2925
                            basis_tree.lock_read()
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
2926
                        if basis_tree.has_id(file_id):
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2927
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
2928
                                keep_content = True
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2929
                        elif target_kind is None and not target_versioned:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
2930
                            keep_content = True
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2931
                if wt_kind is not None:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2932
                    if not keep_content:
2933
                        tt.delete_contents(trans_id)
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2934
                    elif target_kind is not None:
2935
                        parent_trans_id = tt.trans_id_file_id(wt_parent)
5409.8.4 by Vincent Ladeuil
Fix indentations.
2936
                        backup_name = tt._available_backup_name(
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2937
                            wt_name, parent_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.
2938
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2939
                        new_trans_id = tt.create_path(wt_name, parent_trans_id)
5783.3.2 by John Arbash Meinel
catch a couple more cases
2940
                        if wt_versioned and target_versioned:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2941
                            tt.unversion_file(trans_id)
2942
                            tt.version_file(file_id, new_trans_id)
2943
                        # New contents should have the same unix perms as old
2944
                        # contents
2945
                        mode_id = trans_id
2946
                        trans_id = new_trans_id
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2947
                if target_kind 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.
2948
                    tt.create_directory(trans_id)
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2949
                    if target_kind == 'tree-reference':
3363.11.3 by Aaron Bentley
Handle adding tree references in revert
2950
                        revision = target_tree.get_reference_revision(file_id,
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2951
                                                                      target_path)
3363.11.3 by Aaron Bentley
Handle adding tree references in revert
2952
                        tt.set_tree_reference(revision, trans_id)
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2953
                elif target_kind == 'symlink':
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2954
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
2955
                                      trans_id)
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2956
                elif target_kind == 'file':
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
2957
                    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
2958
                    if basis_tree is None:
2959
                        basis_tree = working_tree.basis_tree()
2960
                        basis_tree.lock_read()
2961
                    new_sha1 = target_tree.get_file_sha1(file_id)
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
2962
                    if (basis_tree.has_id(file_id) and
2963
                        new_sha1 == basis_tree.get_file_sha1(file_id)):
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
2964
                        if file_id in merge_modified:
2965
                            del merge_modified[file_id]
2966
                    else:
2967
                        merge_modified[file_id] = new_sha1
2968
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2969
                    # preserve the execute bit when backing up
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2970
                    if keep_content and wt_executable == target_executable:
2971
                        tt.set_executability(target_executable, trans_id)
2972
                elif target_kind is not None:
2973
                    raise AssertionError(target_kind)
5783.3.2 by John Arbash Meinel
catch a couple more cases
2974
            if not wt_versioned and target_versioned:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2975
                tt.version_file(file_id, trans_id)
5783.3.2 by John Arbash Meinel
catch a couple more cases
2976
            if wt_versioned and not target_versioned:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
2977
                tt.unversion_file(trans_id)
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2978
            if (target_name is not None and
2979
                (wt_name != target_name or wt_parent != target_parent)):
2980
                if target_name == '' and target_parent is None:
3363.2.16 by Aaron Bentley
Fix root directory creation
2981
                    parent_trans = ROOT_PARENT
2982
                else:
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2983
                    parent_trans = tt.trans_id_file_id(target_parent)
2984
                if wt_parent is None and wt_versioned:
2985
                    tt.adjust_root_path(target_name, parent_trans)
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
2986
                else:
5783.3.1 by John Arbash Meinel
Do an 'obvious' transformation for clarity.
2987
                    tt.adjust_path(target_name, parent_trans, trans_id)
2988
            if wt_executable != target_executable and target_kind == "file":
2989
                tt.set_executability(target_executable, trans_id)
4443.2.7 by Ian Clatworthy
test and fix for revert with content filtering
2990
        if working_tree.supports_content_filtering():
2991
            for index, ((trans_id, mode_id), bytes) in enumerate(
2992
                target_tree.iter_files_bytes(deferred_files)):
2993
                file_id = deferred_files[index][0]
4634.102.4 by Ian Clatworthy
Explain why we're using the target tree to look up the path when reverting
2994
                # We're reverting a tree to the target tree so using the
2995
                # target tree to find the file path seems the best choice
2996
                # here IMO - Ian C 27/Oct/2009
4443.2.7 by Ian Clatworthy
test and fix for revert with content filtering
2997
                filter_tree_path = target_tree.id2path(file_id)
2998
                filters = working_tree._content_filter_stack(filter_tree_path)
2999
                bytes = filtered_output_bytes(bytes, filters,
3000
                    ContentFilterContext(filter_tree_path, working_tree))
3001
                tt.create_file(bytes, trans_id, mode_id)
3002
        else:
3003
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3004
                deferred_files):
3005
                tt.create_file(bytes, trans_id, mode_id)
4634.122.2 by Aaron Bentley, John Arbash Meinel
Bring the fixup_new_roots code from the nested-trees code.
3006
        tt.fixup_new_roots()
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
3007
    finally:
3008
        if basis_tree is not None:
3009
            basis_tree.unlock()
2499.1.1 by Aaron Bentley
Revert does not try to preserve file contents produced by revert
3010
    return merge_modified
2012.1.12 by Aaron Bentley
Use iter_changes for revert
3011
3012
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
3013
def resolve_conflicts(tt, pb=None, pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
3014
    """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
3015
    if pass_func is None:
3016
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
3017
    new_conflicts = set()
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
3018
    pb = ui.ui_factory.nested_progress_bar()
1534.9.1 by Aaron Bentley
Added progress bars to merge
3019
    try:
3020
        for n in range(10):
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
3021
            pb.update(gettext('Resolution pass'), n+1, 10)
1534.9.1 by Aaron Bentley
Added progress bars to merge
3022
            conflicts = tt.find_conflicts()
3023
            if len(conflicts) == 0:
3024
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
3025
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
3026
        raise MalformedTransform(conflicts=conflicts)
3027
    finally:
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
3028
        pb.finished()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
3029
3030
2590.2.8 by Aaron Bentley
Restore conflict handling changes
3031
def conflict_pass(tt, conflicts, path_tree=None):
3032
    """Resolve some classes of conflicts.
3033
3034
    :param tt: The transform to resolve conflicts in
3035
    :param conflicts: The conflicts to resolve
3036
    :param path_tree: A Tree to get supplemental paths from
3037
    """
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
3038
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
3039
    for c_type, conflict in ((c[0], c) for c in conflicts):
3040
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
3041
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
3042
            new_conflicts.add((c_type, 'Unversioned existing file',
3043
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
3044
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
3045
            # files that were renamed take precedence
3046
            final_parent = tt.final_parent(conflict[1])
3047
            if tt.path_changed(conflict[1]):
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
3048
                existing_file, new_file = conflict[2], conflict[1]
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
3049
            else:
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
3050
                existing_file, new_file = conflict[1], conflict[2]
6015.47.2 by Vincent Ladeuil
Cosmetic change.
3051
            new_name = tt.final_name(existing_file) + '.moved'
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
3052
            tt.adjust_path(new_name, final_parent, existing_file)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3053
            new_conflicts.add((c_type, 'Moved existing file to',
3034.4.1 by Aaron Bentley
Start handling case-insensitivity
3054
                               existing_file, new_file))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
3055
        elif c_type == 'parent loop':
3056
            # break the loop by undoing one of the ops that caused the loop
3057
            cur = conflict[1]
3058
            while not tt.path_changed(cur):
3059
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
3060
            new_conflicts.add((c_type, 'Cancelled move', cur,
3061
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
3062
            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
3063
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
3064
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
3065
            trans_id = conflict[1]
5409.1.3 by Vincent Ladeuil
Clarify b.transform.conflict_pass.
3066
            if trans_id in tt._removed_contents:
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
3067
                cancel_deletion = True
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
3068
                orphans = tt._get_potential_orphans(trans_id)
3069
                if orphans:
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
3070
                    cancel_deletion = False
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
3071
                    # All children are orphans
3072
                    for o in orphans:
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
3073
                        try:
3074
                            tt.new_orphan(o, trans_id)
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
3075
                        except OrphaningError:
3076
                            # Something bad happened so we cancel the directory
3077
                            # deletion which will leave it in place with a
3078
                            # conflict. The user can deal with it from there.
3079
                            # Note that this also catch the case where we don't
3080
                            # want to create orphans and leave the directory in
3081
                            # place.
3082
                            cancel_deletion = True
5409.1.14 by Vincent Ladeuil
Prepare for more ways to handle orphans.
3083
                            break
5409.1.16 by Vincent Ladeuil
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.
3084
                if cancel_deletion:
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
3085
                    # Cancel the directory deletion
3086
                    tt.cancel_deletion(trans_id)
3087
                    new_conflicts.add(('deleting parent', 'Not deleting',
3088
                                       trans_id))
5409.1.3 by Vincent Ladeuil
Clarify b.transform.conflict_pass.
3089
            else:
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
3090
                create = True
2590.2.8 by Aaron Bentley
Restore conflict handling changes
3091
                try:
3092
                    tt.final_name(trans_id)
3093
                except NoFinalPath:
1551.19.6 by Aaron Bentley
Revert doesn't crash restoring a file from a deleted directory
3094
                    if path_tree is not None:
3095
                        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)
3096
                        if file_id is None:
3097
                            file_id = tt.inactive_file_id(trans_id)
5783.2.5 by John Arbash Meinel
Call iter_entries_by_dir correctly.
3098
                        _, entry = path_tree.iter_entries_by_dir(
3099
                            [file_id]).next()
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
3100
                        # special-case the other tree root (move its
3101
                        # children to current root)
3102
                        if entry.parent_id is None:
5128.1.1 by Vincent Ladeuil
Uncontroversial cleanups, mostly comments
3103
                            create = False
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
3104
                            moved = _reparent_transform_children(
3105
                                tt, trans_id, tt.root)
3106
                            for child in moved:
3107
                                new_conflicts.add((c_type, 'Moved to root',
3108
                                                   child))
3109
                        else:
3110
                            parent_trans_id = tt.trans_id_file_id(
3111
                                entry.parent_id)
3112
                            tt.adjust_path(entry.name, parent_trans_id,
3113
                                           trans_id)
3114
                if create:
3115
                    tt.create_directory(trans_id)
3116
                    new_conflicts.add((c_type, 'Created directory', trans_id))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
3117
        elif c_type == 'unversioned parent':
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
3118
            file_id = tt.inactive_file_id(conflict[1])
3119
            # special-case the other tree root (move its children instead)
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
3120
            if path_tree and path_tree.has_id(file_id):
5599.1.1 by John Arbash Meinel
Move away from using Tree.inventory[] just to check if this is a root.
3121
                if path_tree.path2id('') == file_id:
3122
                    # This is the root entry, skip it
1551.19.32 by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092)
3123
                    continue
3124
            tt.version_file(file_id, conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
3125
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
3126
        elif c_type == 'non-directory parent':
3127
            parent_id = conflict[1]
3128
            parent_parent = tt.final_parent(parent_id)
3129
            parent_name = tt.final_name(parent_id)
3130
            parent_file_id = tt.final_file_id(parent_id)
3131
            new_parent_id = tt.new_directory(parent_name + '.new',
3132
                parent_parent, parent_file_id)
3133
            _reparent_transform_children(tt, parent_id, new_parent_id)
3146.8.19 by Aaron Bentley
Merge with bzr.dev
3134
            if parent_file_id is not None:
3135
                tt.unversion_file(parent_id)
3144.4.2 by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390)
3136
            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
3137
        elif c_type == 'versioning no contents':
3138
            tt.cancel_versioning(conflict[1])
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
3139
    return new_conflicts
3140
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
3141
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
3142
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
3143
    """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
3144
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
5988.2.1 by Vincent Ladeuil
Do not generate path conflicts if a corresponding content conflict exists
3145
    return sorted(conflict_iter, key=conflicts.Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
3146
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
3147
3148
def iter_cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
3149
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
3150
    for conflict in raw_conflicts:
3151
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
3152
        action = conflict[1]
3153
        modified_path = fp.get_path(conflict[2])
3154
        modified_id = tt.final_file_id(conflict[2])
3155
        if len(conflict) == 3:
5988.2.1 by Vincent Ladeuil
Do not generate path conflicts if a corresponding content conflict exists
3156
            yield conflicts.Conflict.factory(
3157
                c_type, action=action, path=modified_path, file_id=modified_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3158
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
3159
        else:
3160
            conflicting_path = fp.get_path(conflict[3])
3161
            conflicting_id = tt.final_file_id(conflict[3])
5988.2.1 by Vincent Ladeuil
Do not generate path conflicts if a corresponding content conflict exists
3162
            yield conflicts.Conflict.factory(
3163
                c_type, action=action, path=modified_path,
3164
                file_id=modified_id,
3165
                conflict_path=conflicting_path,
3166
                conflict_file_id=conflicting_id)
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
3167
3168
3169
class _FileMover(object):
2733.2.9 by Aaron Bentley
Update docstrings
3170
    """Moves and deletes files for TreeTransform, tracking operations"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
3171
3172
    def __init__(self):
3173
        self.past_renames = []
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
3174
        self.pending_deletions = []
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
3175
3176
    def rename(self, from_, to):
5186.2.2 by Martin Pool
wrap os.rename to insert the source and destination filenames in any exception that may be raised
3177
        """Rename a file from one path to another."""
3063.1.1 by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758).
3178
        try:
5050.15.1 by Martin
Revert change of rename function in transform from r5192 to fix failures on Windows
3179
            os.rename(from_, to)
3180
        except OSError, e:
3063.1.3 by Aaron Bentley
Update for Linux
3181
            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).
3182
                raise errors.FileExists(to, str(e))
5186.2.5 by Martin Pool
Raise a specific clearer error when a rename fails inside transform
3183
            # normal OSError doesn't include filenames so it's hard to see where
3184
            # the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
5186.2.7 by Martin Pool
Update other cases where transform detects failure to rename
3185
            raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
3186
        self.past_renames.append((from_, to))
3187
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
3188
    def pre_delete(self, from_, to):
2733.2.9 by Aaron Bentley
Update docstrings
3189
        """Rename a file out of the way and mark it for deletion.
3190
3191
        Unlike os.unlink, this works equally well for files and directories.
3192
        :param from_: The current file path
3193
        :param to: A temporary path for the file
3194
        """
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
3195
        self.rename(from_, to)
3196
        self.pending_deletions.append(to)
3197
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
3198
    def rollback(self):
2733.2.9 by Aaron Bentley
Update docstrings
3199
        """Reverse all renames that have been performed"""
2733.2.1 by Aaron Bentley
Implement FileMover, to support TreeTransform rollback
3200
        for from_, to in reversed(self.past_renames):
5186.2.7 by Martin Pool
Update other cases where transform detects failure to rename
3201
            try:
5050.15.1 by Martin
Revert change of rename function in transform from r5192 to fix failures on Windows
3202
                os.rename(to, from_)
3203
            except OSError, e:
5409.5.2 by Vincent Ladeuil
Fix spurious spaces.
3204
                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2733.2.12 by Aaron Bentley
Updates from review
3205
        # after rollback, don't reuse _FileMover
3206
        past_renames = None
3207
        pending_deletions = None
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
3208
3209
    def apply_deletions(self):
2733.2.9 by Aaron Bentley
Update docstrings
3210
        """Apply all marked deletions"""
2733.2.5 by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions
3211
        for path in self.pending_deletions:
3212
            delete_any(path)
2733.2.12 by Aaron Bentley
Updates from review
3213
        # after apply_deletions, don't reuse _FileMover
3214
        past_renames = None
3215
        pending_deletions = None