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