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