/brz/remove-bazaar

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