/brz/remove-bazaar

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