/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5630.2.2 by John Arbash Meinel
Start fleshing out the design. Something weird is causing my tests to all fail.
1
# Copyright (C) 2005-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
453 by Martin Pool
- Split WorkingTree into its own file
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
#
453 by Martin Pool
- Split WorkingTree into its own file
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
#
453 by Martin Pool
- Split WorkingTree into its own file
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
453 by Martin Pool
- Split WorkingTree into its own file
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
"""WorkingTree object and friends.
18
19
A WorkingTree represents the editable working copy of a branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
20
Operations which represent the WorkingTree are also done here,
6672.2.6 by Jelmer Vernooij
Some cleanups.
21
such as renaming or adding files.
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
22
23
At the moment every WorkingTree has its own branch.  Remote
24
WorkingTrees aren't supported.
25
6681.2.4 by Jelmer Vernooij
More renames.
26
To get a WorkingTree, call controldir.open_workingtree() or
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
27
WorkingTree.open(dir).
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
28
"""
29
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
30
from __future__ import absolute_import
956 by Martin Pool
doc
31
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
32
import errno
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
33
import os
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
34
import sys
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
35
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
36
import breezy
37
38
from .lazy_import import lazy_import
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
39
lazy_import(globals(), """
7058.3.12 by Jelmer Vernooij
Lazy import shutil; on some platforms, it triggers an import of tarfile.
40
import shutil
1398 by Robert Collins
integrate in Gustavos x-bit patch
41
import stat
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
42
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
43
from breezy import (
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
44
    conflicts as _mod_conflicts,
45
    errors,
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
46
    filters as _mod_filters,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
47
    merge,
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
48
    revision as _mod_revision,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
49
    transform,
6653.3.9 by Jelmer Vernooij
Missing import.
50
    transport,
3586.1.3 by Ian Clatworthy
add views attribute to working trees
51
    views,
1731.2.17 by Aaron Bentley
Support extracting with checkouts
52
    )
7265.5.2 by Jelmer Vernooij
Fix import.
53
from breezy.bzr import (
54
    generate_ids,
55
    )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
56
""")
57
7311.2.1 by Jelmer Vernooij
Move is_control_filename onto ControlDirFormat.
58
from .controldir import (
59
    ControlComponent,
60
    ControlComponentFormatRegistry,
61
    ControlComponentFormat,
62
    ControlDir,
63
    ControlDirFormat,
64
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
65
from . import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
66
    osutils,
6213.1.35 by Jelmer Vernooij
Simplify importing of bzrdir.
67
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
68
from .i18n import gettext
69
from . import mutabletree
7290.25.1 by Jelmer Vernooij
merge lp:~gz/bzr/resolve_auto_refactor
70
from .symbol_versioning import deprecated_method, deprecated_in
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
71
from .trace import mutter, note
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
72
73
6741.1.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids.
74
class SettingFileIdUnsupported(errors.BzrError):
75
6772.3.3 by Jelmer Vernooij
Move shelf method implementations to .bzr.
76
    _fmt = "This format does not support setting file ids."
77
78
79
class ShelvingUnsupported(errors.BzrError):
80
81
    _fmt = "This format does not support shelving changes."
6741.1.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids.
82
83
7311.2.1 by Jelmer Vernooij
Move is_control_filename onto ControlDirFormat.
84
class WorkingTree(mutabletree.MutableTree, ControlComponent):
453 by Martin Pool
- Split WorkingTree into its own file
85
    """Working copy tree.
86
5335.1.2 by Robert Collins
Add note that basedir is a unicode object as per John's review.
87
    :ivar basedir: The root of the tree on disk. This is a unicode path object
88
        (as opposed to a URL).
453 by Martin Pool
- Split WorkingTree into its own file
89
    """
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
90
3586.1.3 by Ian Clatworthy
add views attribute to working trees
91
    # override this to set the strategy for storing views
92
    def _make_views(self):
93
        return views.DisabledViews(self)
94
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
95
    def __init__(self, basedir='.',
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
96
                 branch=None,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
97
                 _internal=False,
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
98
                 _transport=None,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
99
                 _format=None,
6681.2.4 by Jelmer Vernooij
More renames.
100
                 _controldir=None):
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
101
        """Construct a WorkingTree instance. This is not a public API.
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
102
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
103
        :param branch: A branch to override probing for the branch.
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
104
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
105
        self._format = _format
6681.2.4 by Jelmer Vernooij
More renames.
106
        self.controldir = _controldir
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
107
        if not _internal:
6681.2.4 by Jelmer Vernooij
More renames.
108
            raise errors.BzrError("Please use controldir.open_workingtree or "
7143.15.2 by Jelmer Vernooij
Run autopep8.
109
                                  "WorkingTree.open() to obtain a WorkingTree.")
6653.3.1 by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree.
110
        basedir = osutils.safe_unicode(basedir)
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
111
        mutter("opening working tree %r", basedir)
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
112
        if branch is not None:
6313.1.4 by Jelmer Vernooij
Fix tests.
113
            self._branch = branch
114
        else:
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
115
            self._branch = self.controldir.open_branch()
6653.3.1 by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree.
116
        self.basedir = osutils.realpath(basedir)
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
117
        self._transport = _transport
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
118
        self._rules_searcher = None
3586.1.3 by Ian Clatworthy
add views attribute to working trees
119
        self.views = self._make_views()
3034.4.3 by Aaron Bentley
Add case-sensitivity handling to WorkingTree
120
5158.6.5 by Martin Pool
Implement ControlComponent on WorkingTree
121
    @property
122
    def user_transport(self):
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
123
        return self.controldir.user_transport
5158.6.5 by Martin Pool
Implement ControlComponent on WorkingTree
124
125
    @property
126
    def control_transport(self):
127
        return self._transport
128
7122.6.5 by Jelmer Vernooij
More improvements, add tests.
129
    def supports_symlinks(self):
130
        return osutils.supports_symlinks(self.basedir)
131
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
132
    def is_control_filename(self, filename):
133
        """True if filename is the name of a control file in this tree.
134
135
        :param filename: A filename within the tree. This is a relative path
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
136
            from the root of this tree.
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
137
138
        This is true IF and ONLY IF the filename is part of the meta data
139
        that bzr controls in this tree. I.E. a random .bzr directory placed
140
        on disk will not be a control file for this tree.
141
        """
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
142
        return self.controldir.is_control_filename(filename)
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
143
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
144
    branch = property(
145
        fget=lambda self: self._branch,
146
        doc="""The branch this WorkingTree is connected to.
147
148
            This cannot be set - it is reflective of the actual disk structure
149
            the working tree has been constructed from.
150
            """)
151
6110.6.1 by Jelmer Vernooij
Add Tree.has_versioned_directories.
152
    def has_versioned_directories(self):
153
        """See `Tree.has_versioned_directories`."""
154
        return self._format.supports_versioned_directories
155
6885.2.1 by Jelmer Vernooij
Add WorkingTree.supports_merge_modified.
156
    def supports_merge_modified(self):
157
        """Indicate whether this workingtree supports storing merge_modified.
158
        """
159
        return self._format.supports_merge_modified
160
6379.7.2 by Jelmer Vernooij
Deprecate supports_executable, move check to working tree.
161
    def _supports_executable(self):
7122.7.1 by Jelmer Vernooij
Check for fs type to determine whether executable bit is supported.
162
        return osutils.supports_executable(self.basedir)
6379.7.2 by Jelmer Vernooij
Deprecate supports_executable, move check to working tree.
163
1687.1.9 by Robert Collins
Teach WorkingTree about break-lock.
164
    def break_lock(self):
165
        """Break a lock if one is present from another instance.
166
167
        Uses the ui factory to ask for confirmation if the lock may be from
168
        an active process.
169
170
        This will probe the repository for its lock as well.
171
        """
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
172
        raise NotImplementedError(self.break_lock)
1687.1.9 by Robert Collins
Teach WorkingTree about break-lock.
173
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
174
    def requires_rich_root(self):
175
        return self._format.requires_rich_root
176
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
177
    def supports_tree_reference(self):
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
178
        return False
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
179
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
180
    def supports_content_filtering(self):
181
        return self._format.supports_content_filtering()
182
3586.1.3 by Ian Clatworthy
add views attribute to working trees
183
    def supports_views(self):
184
        return self.views.supports_views()
185
6741.1.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids.
186
    def supports_setting_file_ids(self):
187
        return self._format.supports_setting_file_ids
188
6449.4.1 by Jelmer Vernooij
Add convenience method WorkingTree.get_config_stack().
189
    def get_config_stack(self):
6449.4.5 by Jelmer Vernooij
Review feedback from vila.
190
        """Retrieve the config stack for this tree.
191
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
192
        :return: A ``breezy.config.Stack``
6449.4.5 by Jelmer Vernooij
Review feedback from vila.
193
        """
194
        # For the moment, just provide the branch config stack.
6449.4.1 by Jelmer Vernooij
Add convenience method WorkingTree.get_config_stack().
195
        return self.branch.get_config_stack()
196
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
197
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
198
    def open(path=None, _unsupported=False):
199
        """Open an existing working tree at path.
200
201
        """
202
        if path is None:
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
203
            path = osutils.getcwd()
7311.2.1 by Jelmer Vernooij
Move is_control_filename onto ControlDirFormat.
204
        control = ControlDir.open(path, _unsupported=_unsupported)
6402.1.1 by Jelmer Vernooij
Simplify probing.
205
        return control.open_workingtree(unsupported=_unsupported)
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
206
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
207
    @staticmethod
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
208
    def open_containing(path=None):
209
        """Open an existing working tree which has its root about path.
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
210
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
211
        This probes for a working tree at path and searches upwards from there.
212
213
        Basically we keep looking up until we find the control directory or
214
        run into /.  If there isn't one, raises NotBranchError.
215
        TODO: give this a new exception.
216
        If there is one, it is returned, along with the unused portion of path.
1685.1.27 by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths
217
218
        :return: The WorkingTree that contains 'path', and the rest of path
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
219
        """
220
        if path is None:
1830.3.14 by John Arbash Meinel
WorkingTree.open_containing() was directly calling os.getcwdu(), which on mac returns the wrong normalization, and on win32 would have the wrong slashes
221
            path = osutils.getcwd()
7311.2.1 by Jelmer Vernooij
Move is_control_filename onto ControlDirFormat.
222
        control, relpath = ControlDir.open_containing(path)
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
223
        return control.open_workingtree(), relpath
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
224
225
    @staticmethod
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
226
    def open_containing_paths(file_list, default_directory=None,
227
                              canonicalize=True, apply_view=True):
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
228
        """Open the WorkingTree that contains a set of paths.
229
230
        Fail if the paths given are not all in a single tree.
231
232
        This is used for the many command-line interfaces that take a list of
233
        any number of files and that require they all be in the same tree.
234
        """
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
235
        if default_directory is None:
236
            default_directory = u'.'
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
237
        # recommended replacement for builtins.internal_tree_files
238
        if file_list is None or len(file_list) == 0:
239
            tree = WorkingTree.open_containing(default_directory)[0]
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
240
            # XXX: doesn't really belong here, and seems to have the strange
241
            # side effect of making it return a bunch of files, not the whole
242
            # tree -- mbp 20100716
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
243
            if tree.supports_views() and apply_view:
244
                view_files = tree.views.lookup_view()
245
                if view_files:
246
                    file_list = view_files
247
                    view_str = views.view_display_str(view_files)
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
248
                    note(gettext("Ignoring files outside view. View is %s") % view_str)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
249
            return tree, file_list
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
250
        if default_directory == u'.':
251
            seed = file_list[0]
252
        else:
253
            seed = default_directory
254
            file_list = [osutils.pathjoin(default_directory, f)
255
                         for f in file_list]
256
        tree = WorkingTree.open_containing(seed)[0]
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
257
        return tree, tree.safe_relpath_files(file_list, canonicalize,
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
258
                                             apply_view=apply_view)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
259
260
    def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
261
        """Convert file_list into a list of relpaths in tree.
262
263
        :param self: A tree to operate on.
264
        :param file_list: A list of user provided paths or None.
265
        :param apply_view: if True and a view is set, apply it or check that
266
            specified files are within it
267
        :return: A list of relative paths.
268
        :raises errors.PathNotChild: When a provided path is in a different self
269
            than self.
270
        """
271
        if file_list is None:
272
            return None
273
        if self.supports_views() and apply_view:
274
            view_files = self.views.lookup_view()
275
        else:
276
            view_files = []
277
        new_list = []
278
        # self.relpath exists as a "thunk" to osutils, but canonical_relpath
279
        # doesn't - fix that up here before we enter the loop.
280
        if canonicalize:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
281
            def fixer(p):
282
                return osutils.canonical_relpath(self.basedir, p)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
283
        else:
284
            fixer = self.relpath
285
        for filename in file_list:
5346.4.3 by Martin Pool
PathNotChild should not give a traceback.
286
            relpath = fixer(osutils.dereference_path(filename))
287
            if view_files and not osutils.is_inside_any(view_files, relpath):
6734.1.2 by Jelmer Vernooij
Fix more imports.
288
                raise views.FileOutsideView(filename, view_files)
5346.4.3 by Martin Pool
PathNotChild should not give a traceback.
289
            new_list.append(relpath)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
290
        return new_list
291
292
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
293
    def open_downlevel(path=None):
294
        """Open an unsupported working tree.
295
6681.2.4 by Jelmer Vernooij
More renames.
296
        Only intended for advanced situations like upgrading part of a controldir.
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
297
        """
298
        return WorkingTree.open(path, _unsupported=True)
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
299
453 by Martin Pool
- Split WorkingTree into its own file
300
    def __repr__(self):
301
        return "<%s of %s>" % (self.__class__.__name__,
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
302
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
303
304
    def abspath(self, filename):
6653.3.1 by Jelmer Vernooij
Move bzr-specific code to breezy.bzrworkingtree.
305
        return osutils.pathjoin(self.basedir, filename)
2292.1.30 by Marius Kruger
* Minor text fixes.
306
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
307
    def basis_tree(self):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
308
        """Return RevisionTree for the current last revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
309
1927.2.3 by Robert Collins
review comment application - paired with Martin.
310
        If the left most parent is a ghost then the returned tree will be an
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
311
        empty tree - one obtained by calling
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
312
        repository.revision_tree(NULL_REVISION).
1927.2.3 by Robert Collins
review comment application - paired with Martin.
313
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
314
        try:
315
            revision_id = self.get_parent_ids()[0]
316
        except IndexError:
317
            # no parents, return an empty revision tree.
318
            # in the future this should return the tree for
319
            # 'empty:' - the implicit root empty tree.
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
320
            return self.branch.repository.revision_tree(
7143.15.2 by Jelmer Vernooij
Run autopep8.
321
                _mod_revision.NULL_REVISION)
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
322
        try:
323
            return self.revision_tree(revision_id)
324
        except errors.NoSuchRevision:
325
            pass
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
326
        # No cached copy available, retrieve from the repository.
6825.3.1 by Jelmer Vernooij
Move walkdirs implementation to bzr/.
327
        # FIXME? RBC 20060403 should we cache the tree locally
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
328
        # at this point ?
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
329
        try:
330
            return self.branch.repository.revision_tree(revision_id)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
331
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
332
            # the basis tree *may* be a ghost or a low level error may have
4031.3.1 by Frank Aspell
Fixing various typos
333
            # occurred. If the revision is present, its a problem, if its not
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
334
            # its a ghost.
335
            if self.branch.repository.has_revision(revision_id):
336
                raise
1927.2.3 by Robert Collins
review comment application - paired with Martin.
337
            # the basis tree is a ghost so return an empty tree.
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
338
            return self.branch.repository.revision_tree(
7143.15.2 by Jelmer Vernooij
Run autopep8.
339
                _mod_revision.NULL_REVISION)
2665.3.2 by Daniel Watkins
Created _cleanup() method in WorkingTree.
340
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
341
    def relpath(self, path):
342
        """Return the local path portion from a given path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
343
344
        The path may be absolute or relative. If its a relative path it is
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
345
        interpreted relative to the python current working directory.
346
        """
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
347
        return osutils.relpath(self.basedir, path)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
348
453 by Martin Pool
- Split WorkingTree into its own file
349
    def has_filename(self, filename):
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
350
        return osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
351
7192.5.1 by Jelmer Vernooij
Remove more file ids.
352
    def get_file(self, path, filtered=True):
353
        return self.get_file_with_stat(path, filtered=filtered)[0]
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
354
7192.5.1 by Jelmer Vernooij
Remove more file ids.
355
    def get_file_with_stat(self, path, filtered=True,
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
356
                           _fstat=osutils.fstat):
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
357
        """See Tree.get_file_with_stat."""
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
358
        abspath = self.abspath(path)
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
359
        try:
6874.2.6 by Jelmer Vernooij
Review comments.
360
            file_obj = open(abspath, 'rb')
361
        except EnvironmentError as e:
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
362
            if e.errno == errno.ENOENT:
363
                raise errors.NoSuchFile(path)
364
            raise
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
365
        stat_value = _fstat(file_obj.fileno())
4413.4.3 by John Arbash Meinel
Move the boolean check to the first part of the if statement
366
        if filtered and self.supports_content_filtering():
3368.2.46 by Ian Clatworthy
minor fix
367
            filters = self._content_filter_stack(path)
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
368
            file_obj = _mod_filters.filtered_input_file(file_obj, filters)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
369
        return (file_obj, stat_value)
453 by Martin Pool
- Split WorkingTree into its own file
370
7192.5.1 by Jelmer Vernooij
Remove more file ids.
371
    def get_file_text(self, path, filtered=True):
372
        with self.get_file(path, filtered=filtered) as my_file:
5236.1.1 by Tim Penhey
Close the file after read.
373
            return my_file.read()
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
374
7192.5.1 by Jelmer Vernooij
Remove more file ids.
375
    def get_file_lines(self, path, filtered=True):
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
376
        """See Tree.get_file_lines()"""
7192.5.1 by Jelmer Vernooij
Remove more file ids.
377
        with self.get_file(path, filtered=filtered) as file:
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
378
            return file.readlines()
379
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
380
    def get_parent_ids(self):
381
        """See Tree.get_parent_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
382
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
383
        This implementation reads the pending merges list and last_revision
384
        value and uses that to decide what the parents list should be.
385
        """
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
386
        last_rev = _mod_revision.ensure_null(self._last_revision())
2598.5.7 by Aaron Bentley
Updates from review
387
        if _mod_revision.NULL_REVISION == last_rev:
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
388
            parents = []
389
        else:
390
            parents = [last_rev]
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
391
        try:
4852.1.7 by John Arbash Meinel
Lots of tweaks in WorkingTree.
392
            merges_bytes = self._transport.get_bytes('pending-merges')
2206.1.7 by Marius Kruger
* errors
393
        except errors.NoSuchFile:
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
394
            pass
395
        else:
4852.1.9 by John Arbash Meinel
Minor typo fix.
396
            for l in osutils.split_lines(merges_bytes):
6973.7.8 by Jelmer Vernooij
Fix more tests.
397
                revision_id = l.rstrip(b'\n')
2249.5.9 by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate
398
                parents.append(revision_id)
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
399
        return parents
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
400
6207.3.5 by Jelmer Vernooij
Use controldir rather than bzrdir.
401
    def clone(self, to_controldir, revision_id=None):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
402
        """Duplicate this working tree into to_bzr, including all state.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
403
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
404
        Specifically modified files are kept as modified, but
405
        ignored and unknown files are discarded.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
406
6207.3.5 by Jelmer Vernooij
Use controldir rather than bzrdir.
407
        If you want to make a new line of development, see ControlDir.sprout()
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
408
409
        revision
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
410
            If not None, the cloned tree will have its last revision set to
4031.3.1 by Frank Aspell
Fixing various typos
411
            revision, and difference between the source trees last revision
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
412
            and this one merged in.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
413
        """
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
414
        with self.lock_read():
415
            # assumes the target bzr dir format is compatible.
416
            result = to_controldir.create_workingtree()
417
            self.copy_content_into(result, revision_id)
418
            return result
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
419
420
    def copy_content_into(self, tree, revision_id=None):
421
        """Copy the current content and user files of this tree into tree."""
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
422
        with self.lock_read():
7358.14.1 by Jelmer Vernooij
Remove Tree.get_root_id() in favour of Tree.path2id('').
423
            tree.set_root_id(self.path2id(''))
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
424
            if revision_id is None:
425
                merge.transform_tree(tree, self)
6241.3.1 by Jelmer Vernooij
Support WorkingTree.clone() having its revision argument set to the NULL revision.
426
            else:
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
427
                # TODO now merge from tree.last_revision to revision (to
428
                # preserve user local changes)
429
                try:
430
                    other_tree = self.revision_tree(revision_id)
431
                except errors.NoSuchRevision:
432
                    other_tree = self.branch.repository.revision_tree(
7143.15.2 by Jelmer Vernooij
Run autopep8.
433
                        revision_id)
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
434
435
                merge.transform_tree(tree, other_tree)
436
                if revision_id == _mod_revision.NULL_REVISION:
437
                    new_parents = []
438
                else:
439
                    new_parents = [revision_id]
440
                tree.set_parent_ids(new_parents)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
441
7192.5.1 by Jelmer Vernooij
Remove more file ids.
442
    def get_file_size(self, path):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
443
        """See Tree.get_file_size"""
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
444
        # XXX: this returns the on-disk size; it should probably return the
445
        # canonical size
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
446
        try:
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
447
            return os.path.getsize(self.abspath(path))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
448
        except OSError as e:
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
449
            if e.errno != errno.ENOENT:
450
                raise
451
            else:
452
                return None
453 by Martin Pool
- Split WorkingTree into its own file
453
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
454
    def _gather_kinds(self, files, kinds):
455
        """See MutableTree._gather_kinds."""
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
456
        with self.lock_tree_write():
457
            for pos, f in enumerate(files):
458
                if kinds[pos] is None:
459
                    fullpath = osutils.normpath(self.abspath(f))
460
                    try:
461
                        kinds[pos] = osutils.file_kind(fullpath)
462
                    except OSError as e:
463
                        if e.errno == errno.ENOENT:
464
                            raise errors.NoSuchFile(fullpath)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
465
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
466
    def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
467
        """Add revision_id as a parent.
468
469
        This is equivalent to retrieving the current list of parent ids
470
        and setting the list to its value plus revision_id.
471
472
        :param revision_id: The revision id to add to the parent list. It may
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
473
            be a ghost revision as long as its not the first parent to be
474
            added, or the allow_leftmost_as_ghost parameter is set True.
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
475
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
476
        """
6754.8.17 by Jelmer Vernooij
Remove uses of needs_write_lock.
477
        with self.lock_write():
478
            parents = self.get_parent_ids() + [revision_id]
479
            self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
7143.15.2 by Jelmer Vernooij
Run autopep8.
480
                                or allow_leftmost_as_ghost)
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
481
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
482
    def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
483
        """Add revision_id, tree tuple as a parent.
484
485
        This is equivalent to retrieving the current list of parent trees
486
        and setting the list to its value plus parent_tuple. See also
487
        add_parent_tree_id - if you only have a parent id available it will be
488
        simpler to use that api. If you have the parent already available, using
489
        this api is preferred.
490
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
491
        :param parent_tuple: The (revision id, tree) to add to the parent list.
492
            If the revision_id is a ghost, pass None for the tree.
493
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
494
        """
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
495
        with self.lock_tree_write():
496
            parent_ids = self.get_parent_ids() + [parent_tuple[0]]
497
            if len(parent_ids) > 1:
498
                # the leftmost may have already been a ghost, preserve that if it
499
                # was.
500
                allow_leftmost_as_ghost = True
501
            self.set_parent_ids(parent_ids,
7143.15.2 by Jelmer Vernooij
Run autopep8.
502
                                allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
503
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
504
    def add_pending_merge(self, *revision_ids):
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
505
        with self.lock_tree_write():
506
            # TODO: Perhaps should check at this point that the
507
            # history of the revision is actually present?
508
            parents = self.get_parent_ids()
509
            updated = False
510
            for rev_id in revision_ids:
511
                if rev_id in parents:
512
                    continue
513
                parents.append(rev_id)
514
                updated = True
515
            if updated:
516
                self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
517
2949.6.2 by Alexander Belchenko
more changes osutils.lstat -> os.lstat
518
    def path_content_summary(self, path, _lstat=os.lstat,
7143.15.2 by Jelmer Vernooij
Run autopep8.
519
                             _mapper=osutils.file_kind_from_stat_mode):
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
520
        """See Tree.path_content_summary."""
521
        abspath = self.abspath(path)
522
        try:
523
            stat_result = _lstat(abspath)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
524
        except OSError as e:
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
525
            if getattr(e, 'errno', None) == errno.ENOENT:
526
                # no file.
527
                return ('missing', None, None, None)
2776.1.9 by Robert Collins
Review feedback.
528
            # propagate other errors
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
529
            raise
530
        kind = _mapper(stat_result.st_mode)
531
        if kind == 'file':
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
532
            return self._file_content_summary(path, stat_result)
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
533
        elif kind == 'directory':
534
            # perhaps it looks like a plain directory, but it's really a
535
            # reference.
536
            if self._directory_is_tree_reference(path):
537
                kind = 'tree-reference'
538
            return kind, None, None, None
539
        elif kind == 'symlink':
4241.14.18 by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs.
540
            target = osutils.readlink(abspath)
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
541
            return ('symlink', None, None, target)
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
542
        else:
543
            return (kind, None, None, None)
544
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
545
    def _file_content_summary(self, path, stat_result):
546
        size = stat_result.st_size
547
        executable = self._is_executable_from_path_and_stat(path, stat_result)
548
        # try for a stat cache lookup
549
        return ('file', size, executable, self._sha_from_stat(
550
            path, stat_result))
551
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
552
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
553
        """Common ghost checking functionality from set_parent_*.
554
555
        This checks that the left hand-parent exists if there are any
556
        revisions present.
557
        """
558
        if len(revision_ids) > 0:
559
            leftmost_id = revision_ids[0]
560
            if (not allow_leftmost_as_ghost and not
7143.15.2 by Jelmer Vernooij
Run autopep8.
561
                    self.branch.repository.has_revision(leftmost_id)):
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
562
                raise errors.GhostRevisionUnusableHere(leftmost_id)
563
564
    def _set_merges_from_parent_ids(self, parent_ids):
565
        merges = parent_ids[1:]
6855.3.1 by Jelmer Vernooij
Several more fixes.
566
        self._transport.put_bytes('pending-merges', b'\n'.join(merges),
7143.15.2 by Jelmer Vernooij
Run autopep8.
567
                                  mode=self.controldir._get_file_mode())
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
568
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
569
    def _filter_parent_ids_by_ancestry(self, revision_ids):
570
        """Check that all merged revisions are proper 'heads'.
571
572
        This will always return the first revision_id, and any merged revisions
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
573
        which are
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
574
        """
575
        if len(revision_ids) == 0:
576
            return revision_ids
577
        graph = self.branch.repository.get_graph()
578
        heads = graph.heads(revision_ids)
579
        new_revision_ids = revision_ids[:1]
580
        for revision_id in revision_ids[1:]:
581
            if revision_id in heads and revision_id not in new_revision_ids:
582
                new_revision_ids.append(revision_id)
583
        if new_revision_ids != revision_ids:
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
584
            mutter('requested to set revision_ids = %s,'
7143.15.2 by Jelmer Vernooij
Run autopep8.
585
                   ' but filtered to %s', revision_ids, new_revision_ids)
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
586
        return new_revision_ids
587
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
588
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
589
        """Set the parent ids to revision_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
590
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
591
        See also set_parent_trees. This api will try to retrieve the tree data
592
        for each element of revision_ids from the trees repository. If you have
593
        tree data already available, it is more efficient to use
594
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
595
        an easier API to use.
596
597
        :param revision_ids: The revision_ids to set as the parent ids of this
598
            working tree. Any of these may be ghosts.
599
        """
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
600
        with self.lock_tree_write():
601
            self._check_parents_for_ghosts(revision_ids,
7143.15.2 by Jelmer Vernooij
Run autopep8.
602
                                           allow_leftmost_as_ghost=allow_leftmost_as_ghost)
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
603
            for revision_id in revision_ids:
604
                _mod_revision.check_not_reserved_id(revision_id)
605
606
            revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
607
608
            if len(revision_ids) > 0:
609
                self.set_last_revision(revision_ids[0])
610
            else:
611
                self.set_last_revision(_mod_revision.NULL_REVISION)
612
613
            self._set_merges_from_parent_ids(revision_ids)
614
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
615
    def set_pending_merges(self, rev_list):
6771.1.1 by Jelmer Vernooij
Move remove to inventorytree.
616
        with self.lock_tree_write():
617
            parents = self.get_parent_ids()
618
            leftmost = parents[:1]
619
            new_parents = leftmost + rev_list
620
            self.set_parent_ids(new_parents)
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
621
1534.7.192 by Aaron Bentley
Record hashes produced by merges
622
    def set_merge_modified(self, modified_hashes):
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
623
        """Set the merge modified hashes."""
624
        raise NotImplementedError(self.set_merge_modified)
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
625
2776.1.8 by Robert Collins
Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits.
626
    def _sha_from_stat(self, path, stat_result):
627
        """Get a sha digest from the tree's stat cache.
628
629
        The default implementation assumes no stat cache is present.
630
631
        :param path: The path.
632
        :param stat_result: The stat result being looked up.
633
        """
634
        return None
635
1551.15.69 by Aaron Bentley
Add merge_type to merge_from_branch
636
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
637
                          merge_type=None, force=False):
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
638
        """Merge from a branch into this working tree.
639
640
        :param branch: The branch to merge from.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
641
        :param to_revision: If non-None, the merge will merge to to_revision,
642
            but not beyond it. to_revision does not need to be in the history
2206.1.7 by Marius Kruger
* errors
643
            of the branch when it is supplied. If None, to_revision defaults to
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
644
            branch.last_revision().
645
        """
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
646
        from .merge import Merger, Merge3Merger
6754.8.17 by Jelmer Vernooij
Remove uses of needs_write_lock.
647
        with self.lock_write():
648
            merger = Merger(self.branch, this_tree=self)
649
            # check that there are no local alterations
650
            if not force and self.has_changes():
651
                raise errors.UncommittedChanges(self)
652
            if to_revision is None:
653
                to_revision = _mod_revision.ensure_null(branch.last_revision())
654
            merger.other_rev_id = to_revision
655
            if _mod_revision.is_null(merger.other_rev_id):
656
                raise errors.NoCommits(branch)
657
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
658
            merger.other_basis = merger.other_rev_id
659
            merger.other_tree = self.branch.repository.revision_tree(
660
                merger.other_rev_id)
661
            merger.other_branch = branch
662
            if from_revision is None:
663
                merger.find_base()
664
            else:
665
                merger.set_base_revision(from_revision, branch)
666
            if merger.base_rev_id == merger.other_rev_id:
667
                raise errors.PointlessMerge
668
            merger.backup_files = False
669
            if merge_type is None:
670
                merger.merge_type = Merge3Merger
671
            else:
672
                merger.merge_type = merge_type
673
            merger.set_interesting_files(None)
674
            merger.show_base = False
675
            merger.reprocess = False
676
            conflicts = merger.do_merge()
677
            merger.set_pending()
678
            return conflicts
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
679
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
680
    def merge_modified(self):
2298.1.1 by Martin Pool
Add test for merge_modified
681
        """Return a dictionary of files modified by a merge.
682
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
683
        The list is initialized by WorkingTree.set_merge_modified, which is
2298.1.1 by Martin Pool
Add test for merge_modified
684
        typically called after we make some automatic updates to the tree
685
        because of a merge.
686
687
        This returns a map of file_id->sha1, containing only files which are
6825.3.1 by Jelmer Vernooij
Move walkdirs implementation to bzr/.
688
        still in the working tree and have that text hash.
2298.1.1 by Martin Pool
Add test for merge_modified
689
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
690
        raise NotImplementedError(self.merge_modified)
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
691
692
    def mkdir(self, path, file_id=None):
693
        """See MutableTree.mkdir()."""
694
        if file_id is None:
6793.4.1 by Jelmer Vernooij
Improve set_root_id handling.
695
            if self.supports_setting_file_ids():
696
                file_id = generate_ids.gen_file_id(os.path.basename(path))
697
        else:
698
            if not self.supports_setting_file_ids():
699
                raise SettingFileIdUnsupported()
6754.8.17 by Jelmer Vernooij
Remove uses of needs_write_lock.
700
        with self.lock_write():
701
            os.mkdir(self.abspath(path))
702
            self.add(path, file_id, 'directory')
703
            return file_id
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
704
7192.5.1 by Jelmer Vernooij
Remove more file ids.
705
    def get_symlink_target(self, path):
6883.7.6 by Jelmer Vernooij
Remove uses of id2path.
706
        abspath = self.abspath(path)
4241.14.18 by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs.
707
        target = osutils.readlink(abspath)
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
708
        return target
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
709
1731.2.1 by Aaron Bentley
Initial subsume implementation
710
    def subsume(self, other_tree):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
711
        raise NotImplementedError(self.subsume)
1731.2.1 by Aaron Bentley
Initial subsume implementation
712
7311.2.4 by Jelmer Vernooij
Move directory_is_tree_reference.
713
    def _directory_is_tree_reference(self, relpath):
714
        raise NotImplementedError(self._directory_is_tree_reference)
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
715
7192.5.1 by Jelmer Vernooij
Remove more file ids.
716
    def extract(self, path, format=None):
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
717
        """Extract a subtree from this tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
718
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
719
        A new branch will be created, relative to the path for this tree.
720
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
721
        raise NotImplementedError(self.extract)
453 by Martin Pool
- Split WorkingTree into its own file
722
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
723
    def flush(self):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
724
        """Write the in memory meta data to disk."""
725
        raise NotImplementedError(self.flush)
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
726
7192.5.1 by Jelmer Vernooij
Remove more file ids.
727
    def kind(self, relpath):
1551.10.29 by Aaron Bentley
Fix tree.list_files when file kind changes
728
        return osutils.file_kind(self.abspath(relpath))
729
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
730
    def list_files(self, include_root=False, from_dir=None, recursive=True):
731
        """List all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
732
733
        Lists, but does not descend into unversioned directories.
734
        This does not include files that have been deleted in this
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
735
        tree. Skips the control directory.
453 by Martin Pool
- Split WorkingTree into its own file
736
5128.1.1 by Vincent Ladeuil
Uncontroversial cleanups, mostly comments
737
        :param include_root: if True, return an entry for the root
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
738
        :param from_dir: start from this directory or None for the root
739
        :param recursive: whether to recurse into subdirectories or not
453 by Martin Pool
- Split WorkingTree into its own file
740
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
741
        raise NotImplementedError(self.list_files)
742
5346.1.5 by Vincent Ladeuil
Delete the to_name parameter from WorkingTree.move()
743
    def move(self, from_paths, to_dir=None, after=False):
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
744
        """Rename files.
745
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
746
        to_dir must be known to the working tree.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
747
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
748
        If to_dir exists and is a directory, the files are moved into
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
749
        it, keeping their old names.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
750
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
751
        Note that to_dir is only the last component of the new name;
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
752
        this doesn't change the directory.
753
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
754
        For each entry in from_paths the move mode will be determined
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
755
        independently.
756
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
757
        The first mode moves the file in the filesystem and updates the
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
758
        working tree metadata. The second mode only updates the working tree
759
        metadata without touching the file on the filesystem.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
760
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
761
        move uses the second mode if 'after == True' and the target is not
762
        versioned but present in the working tree.
763
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
764
        move uses the second mode if 'after == False' and the source is
765
        versioned but no longer in the working tree, and the target is not
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
766
        versioned but present in the working tree.
767
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
768
        move uses the first mode if 'after == False' and the source is
769
        versioned and present in the working tree, and the target is not
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
770
        versioned and not present in the working tree.
771
772
        Everything else results in an error.
773
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
774
        This returns a list of (from_path, to_path) pairs for each
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
775
        entry that is moved.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
776
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
777
        raise NotImplementedError(self.move)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
778
6853 by Jelmer Vernooij
Add MutableTree.copy_one.
779
    def copy_one(self, from_rel, to_rel):
780
        """Copy a file in the tree to a new location.
781
782
        This default implementation just copies the file, then
783
        adds the target.
784
785
        :param from_rel: From location (relative to tree root)
786
        :param to_rel: Target location (relative to tree root)
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
787
        """
6853 by Jelmer Vernooij
Add MutableTree.copy_one.
788
        shutil.copyfile(self.abspath(from_rel), self.abspath(to_rel))
789
        self.add(to_rel)
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
790
453 by Martin Pool
- Split WorkingTree into its own file
791
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
792
        """Return all unknown files.
793
794
        These are files in the working directory that are not versioned or
795
        control files or ignored.
796
        """
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
797
        with self.lock_read():
798
            # force the extras method to be fully executed before returning, to
799
            # prevent race conditions with the lock
800
            return iter(
801
                [subp for subp in self.extras() if not self.is_ignored(subp)])
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
802
6809.4.25 by Jelmer Vernooij
Add paths argument to .unversion.
803
    def unversion(self, paths):
804
        """Remove the path in pahs from the current versioned set.
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
805
6809.4.25 by Jelmer Vernooij
Add paths argument to .unversion.
806
        When a path is unversioned, all of its children are automatically
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
807
        unversioned.
808
6842.2.1 by Jelmer Vernooij
Avoid setting file ids in unversion tests.
809
        :param paths: The paths to stop versioning.
6844 by Jelmer Vernooij
Merge lp:~jelmer/brz/unversion.
810
        :raises NoSuchFile: if any path is not currently versioned.
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
811
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
812
        raise NotImplementedError(self.unversion)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
813
1551.11.10 by Aaron Bentley
Add change reporting to pull
814
    def pull(self, source, overwrite=False, stop_revision=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
815
             change_reporter=None, possible_transports=None, local=False,
816
             show_base=False):
6754.8.20 by Jelmer Vernooij
Update NEWS.
817
        with self.lock_write(), source.lock_read():
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
818
            old_revision_info = self.branch.last_revision_info()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
819
            basis_tree = self.basis_tree()
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
820
            count = self.branch.pull(source, overwrite, stop_revision,
4056.6.4 by Gary van der Merwe
Implement pull --local.
821
                                     possible_transports=possible_transports,
822
                                     local=local)
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
823
            new_revision_info = self.branch.last_revision_info()
824
            if new_revision_info != old_revision_info:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
825
                repository = self.branch.repository
5847.2.1 by John Arbash Meinel
Bug #780677, use a RevisionTree for pull
826
                if repository._format.fast_deltas:
5847.2.2 by John Arbash Meinel
Forgot that sometimes we don't have any parents during pull.
827
                    parent_ids = self.get_parent_ids()
828
                    if parent_ids:
829
                        basis_id = parent_ids[0]
830
                        basis_tree = repository.revision_tree(basis_id)
6754.8.4 by Jelmer Vernooij
Use new context stuff.
831
                with basis_tree.lock_read():
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
832
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
833
                    merge.merge_inner(
7143.15.2 by Jelmer Vernooij
Run autopep8.
834
                        self.branch,
835
                        new_basis_tree,
836
                        basis_tree,
837
                        this_tree=self,
838
                        change_reporter=change_reporter,
839
                        show_base=show_base)
7358.14.1 by Jelmer Vernooij
Remove Tree.get_root_id() in favour of Tree.path2id('').
840
                    basis_root_id = basis_tree.path2id('')
841
                    new_root_id = new_basis_tree.path2id('')
6243.1.1 by Jelmer Vernooij
Fix WorkingTree.pull(stop_revision='null:', overwrite=True).
842
                    if new_root_id is not None and basis_root_id != new_root_id:
4634.123.11 by John Arbash Meinel
fix 'pull' to also set the root id.
843
                        self.set_root_id(new_root_id)
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
844
                # TODO - dedup parents list with things merged by pull ?
1908.6.3 by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
845
                # reuse the revisiontree we merged against to set the new
846
                # tree data.
6243.1.1 by Jelmer Vernooij
Fix WorkingTree.pull(stop_revision='null:', overwrite=True).
847
                parent_trees = []
848
                if self.branch.last_revision() != _mod_revision.NULL_REVISION:
849
                    parent_trees.append(
850
                        (self.branch.last_revision(), new_basis_tree))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
851
                # we have to pull the merge trees out again, because
852
                # merge_inner has set the ids. - this corner is not yet
1908.6.3 by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
853
                # layered well enough to prevent double handling.
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
854
                # XXX TODO: Fix the double handling: telling the tree about
855
                # the already known parent data is wasteful.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
856
                merges = self.get_parent_ids()[1:]
857
                parent_trees.extend([
858
                    (parent, repository.revision_tree(parent)) for
7143.15.2 by Jelmer Vernooij
Run autopep8.
859
                    parent in merges])
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
860
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
861
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
862
7192.5.1 by Jelmer Vernooij
Remove more file ids.
863
    def put_file_bytes_non_atomic(self, path, bytes):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
864
        """See MutableTree.put_file_bytes_non_atomic."""
6963.2.18 by Jelmer Vernooij
Add bees to some of bp.weave_fmt.
865
        with self.lock_write(), open(self.abspath(path), 'wb') as stream:
7143.15.2 by Jelmer Vernooij
Run autopep8.
866
            stream.write(bytes)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
867
453 by Martin Pool
- Split WorkingTree into its own file
868
    def extras(self):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
869
        """Yield all unversioned files in this WorkingTree.
453 by Martin Pool
- Split WorkingTree into its own file
870
7199.3.1 by Jelmer Vernooij
Don't report empty directories as changes.
871
        If there are any unversioned directories and the file format
872
        supports versioning directories, then only the directory is returned,
873
        not all its children. But if there are unversioned files under a
874
        versioned subdirectory, they are returned.
453 by Martin Pool
- Split WorkingTree into its own file
875
876
        Currently returned depth-first, sorted by name within directories.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
877
        This is the same order used by 'osutils.walkdirs'.
453 by Martin Pool
- Split WorkingTree into its own file
878
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
879
        raise NotImplementedError(self.extras)
453 by Martin Pool
- Split WorkingTree into its own file
880
881
    def ignored_files(self):
882
        """Yield list of PATH, IGNORE_PATTERN"""
883
        for subp in self.extras():
884
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
885
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
886
                yield subp, pat
887
888
    def is_ignored(self, filename):
889
        r"""Check whether the filename matches an ignore pattern.
6724.3.1 by Jelmer Vernooij
Move get_ignore_list to InventoryWorkingTree.
890
        """
891
        raise NotImplementedError(self.is_ignored)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
892
7192.5.1 by Jelmer Vernooij
Remove more file ids.
893
    def stored_kind(self, path):
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
894
        """See Tree.stored_kind"""
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
895
        raise NotImplementedError(self.stored_kind)
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
896
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
897
    def _comparison_data(self, entry, path):
898
        abspath = self.abspath(path)
899
        try:
900
            stat_value = os.lstat(abspath)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
901
        except OSError as e:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
902
            if getattr(e, 'errno', None) == errno.ENOENT:
903
                stat_value = None
904
                kind = None
905
                executable = False
906
            else:
907
                raise
908
        else:
909
            mode = stat_value.st_mode
910
            kind = osutils.file_kind_from_stat_mode(mode)
6379.7.1 by Jelmer Vernooij
Add and use WorkingTree._supports_executable.
911
            if not self._supports_executable():
2409.1.2 by Dmitry Vasiliev
Used one-line conditional expression instead of the multi-line one
912
                executable = entry is not None and entry.executable
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
913
            else:
914
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
915
        return kind, executable, stat_value
916
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
917
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
918
        """Return the last revision of the branch for this tree.
919
920
        This format tree does not support a separate marker for last-revision
921
        compared to the branch.
922
923
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
924
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
925
        return self._last_revision()
926
927
    def _last_revision(self):
928
        """helper for get_parent_ids."""
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
929
        with self.lock_read():
930
            return _mod_revision.ensure_null(self.branch.last_revision())
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
931
1694.2.6 by Martin Pool
[merge] bzr.dev
932
    def is_locked(self):
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
933
        """Check if this tree is locked."""
934
        raise NotImplementedError(self.is_locked)
2298.1.1 by Martin Pool
Add test for merge_modified
935
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
936
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
937
        """Lock the tree for reading.
938
939
        This also locks the branch, and can be unlocked via self.unlock().
940
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
941
        :return: A breezy.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
942
        """
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
943
        raise NotImplementedError(self.lock_read)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
944
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
945
    def lock_tree_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
946
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
947
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
948
        :return: A breezy.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
949
        """
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
950
        raise NotImplementedError(self.lock_tree_write)
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
951
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
952
    def lock_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
953
        """See MutableTree.lock_write, and WorkingTree.unlock.
954
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
955
        :return: A breezy.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
956
        """
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
957
        raise NotImplementedError(self.lock_write)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
958
1694.2.6 by Martin Pool
[merge] bzr.dev
959
    def get_physical_lock_status(self):
6313.1.1 by Jelmer Vernooij
Move bzr-specific functionality to InventoryWorkingTree.
960
        raise NotImplementedError(self.get_physical_lock_status)
2255.2.204 by Robert Collins
Fix info and status again.
961
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
962
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
963
        """Change the last revision in the working tree."""
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
964
        raise NotImplementedError(self.set_last_revision)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
965
966
    def _change_last_revision(self, new_revision):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
967
        """Template method part of set_last_revision to perform the change.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
968
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
969
        This is used to allow WorkingTree3 instances to not affect branch
970
        when their last revision is set.
971
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
972
        if _mod_revision.is_null(new_revision):
5718.7.13 by Jelmer Vernooij
Avoid using set_revision_history.
973
            self.branch.set_last_revision_info(0, new_revision)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
974
            return False
5718.8.14 by Jelmer Vernooij
Check for reserved revids.
975
        _mod_revision.check_not_reserved_id(new_revision)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
976
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
977
            self.branch.generate_revision_history(new_revision)
978
        except errors.NoSuchRevision:
979
            # not present in the repo - dont try to set it deeper than the tip
5807.6.1 by Jelmer Vernooij
Use undeprecated wrappers.
980
            self.branch._set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
981
        return True
982
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
983
    def remove(self, files, verbose=False, to_file=None, keep_files=True,
6771.1.1 by Jelmer Vernooij
Move remove to inventorytree.
984
               force=False):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
985
        """Remove nominated files from the working tree metadata.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
986
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
987
        :files: File paths relative to the basedir.
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
988
        :keep_files: If true, the files will also be kept.
2292.1.10 by Marius Kruger
* workingtree.remove
989
        :force: Delete files and directories, even if they are changed and
990
            even if the directories are not empty.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
991
        """
6771.1.1 by Jelmer Vernooij
Move remove to inventorytree.
992
        raise NotImplementedError(self.remove)
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
993
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
994
    def revert(self, filenames=None, old_tree=None, backups=True,
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
995
               pb=None, report_changes=False):
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
996
        from .conflicts import resolve
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
997
        with self.lock_tree_write():
998
            if old_tree is None:
999
                basis_tree = self.basis_tree()
1000
                basis_tree.lock_read()
1001
                old_tree = basis_tree
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
1002
            else:
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1003
                basis_tree = None
1004
            try:
1005
                conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1006
                                             report_changes)
1007
                if filenames is None and len(self.get_parent_ids()) > 1:
1008
                    parent_trees = []
1009
                    last_revision = self.last_revision()
1010
                    if last_revision != _mod_revision.NULL_REVISION:
1011
                        if basis_tree is None:
1012
                            basis_tree = self.basis_tree()
1013
                            basis_tree.lock_read()
1014
                        parent_trees.append((last_revision, basis_tree))
1015
                    self.set_parent_trees(parent_trees)
1016
                    resolve(self)
1017
                else:
1018
                    resolve(self, filenames, ignore_misses=True, recursive=True)
1019
            finally:
1020
                if basis_tree is not None:
1021
                    basis_tree.unlock()
1022
            return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1023
6538.1.5 by Aaron Bentley
Implement WorkingTree.store_uncommitted.
1024
    def store_uncommitted(self):
6538.1.20 by Aaron Bentley
Cleanup
1025
        """Store uncommitted changes from the tree in the branch."""
6772.3.3 by Jelmer Vernooij
Move shelf method implementations to .bzr.
1026
        raise NotImplementedError(self.store_uncommitted)
6538.1.5 by Aaron Bentley
Implement WorkingTree.store_uncommitted.
1027
6538.1.20 by Aaron Bentley
Cleanup
1028
    def restore_uncommitted(self):
1029
        """Restore uncommitted changes from the branch into the tree."""
6772.3.3 by Jelmer Vernooij
Move shelf method implementations to .bzr.
1030
        raise NotImplementedError(self.restore_uncommitted)
6538.1.10 by Aaron Bentley
Implement WorkingTree.get_uncommitted_data
1031
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
1032
    def revision_tree(self, revision_id):
1033
        """See Tree.revision_tree.
1034
6825.3.1 by Jelmer Vernooij
Move walkdirs implementation to bzr/.
1035
        For trees that can be obtained from the working tree, this
1036
        will do so. For other trees, it will fall back to the repository.
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
1037
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1038
        raise NotImplementedError(self.revision_tree)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1039
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1040
    def set_root_id(self, file_id):
1041
        """Set the root id for this tree."""
6741.1.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids.
1042
        if not self.supports_setting_file_ids():
1043
            raise SettingFileIdUnsupported()
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1044
        with self.lock_tree_write():
6745.1.3 by Jelmer Vernooij
Merge trunk.
1045
            # for compatibility
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1046
            if file_id is None:
1047
                raise ValueError(
1048
                    'WorkingTree.set_root_id with fileid=None')
1049
            file_id = osutils.safe_file_id(file_id)
1050
            self._set_root_id(file_id)
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1051
1052
    def _set_root_id(self, file_id):
1053
        """Set the root id for this tree, in a format specific manner.
1054
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1055
        :param file_id: The file id to assign to the root. It must not be
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1056
            present in the current inventory or an error will occur. It must
1057
            not be None, but rather a valid file id.
1058
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1059
        raise NotImplementedError(self._set_root_id)
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1060
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1061
    def unlock(self):
1062
        """See Branch.unlock.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1063
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1064
        WorkingTree locking just uses the Branch locking facilities.
1065
        This is current because all working trees have an embedded branch
1066
        within them. IF in the future, we were to make branch data shareable
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1067
        between multiple working trees, i.e. via shared storage, then we
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1068
        would probably want to lock both the local tree, and the branch.
1069
        """
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
1070
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1071
1907.5.7 by Matthieu Moy
Coding style fixes thanks to jam.
1072
    _marker = object()
1073
2009.1.4 by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are
1074
    def update(self, change_reporter=None, possible_transports=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1075
               revision=None, old_tip=_marker, show_base=False):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1076
        """Update a working tree along its branch.
1077
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1078
        This will update the branch if its bound too, which means we have
1079
        multiple trees involved:
1080
1081
        - The new basis tree of the master.
1082
        - The old basis tree of the branch.
1083
        - The old basis tree of the working tree.
1084
        - The current working tree state.
1085
1086
        Pathologically, all three may be different, and non-ancestors of each
1087
        other.  Conceptually we want to:
1088
1089
        - Preserve the wt.basis->wt.state changes
1090
        - Transform the wt.basis to the new master basis.
1091
        - Apply a merge of the old branch basis to get any 'local' changes from
1092
          it into the tree.
1093
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1094
1095
        There isn't a single operation at the moment to do that, so we:
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1096
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1097
        - Merge current state -> basis tree of the master w.r.t. the old tree
1098
          basis.
1099
        - Do a 'normal' merge of the old branch basis if it is relevant.
1907.5.4 by Matthieu Moy
Added test-cases for update -r. Tweaked the implementation too.
1100
2009.1.2 by John Arbash Meinel
minor whitespace cleanup.
1101
        :param revision: The target revision to update to. Must be in the
1102
            revision history.
1103
        :param old_tip: If branch.update() has already been run, the value it
1104
            returned (old tip of the branch or None). _marker is used
1105
            otherwise.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1106
        """
3280.5.1 by John Arbash Meinel
Avoid opening the master branch when we won't use it.
1107
        if self.branch.get_bound_location() is not None:
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1108
            self.lock_write()
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
1109
            update_branch = (old_tip is self._marker)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1110
        else:
1111
            self.lock_tree_write()
1112
            update_branch = False
1113
        try:
1114
            if update_branch:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1115
                old_tip = self.branch.update(possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1116
            else:
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
1117
                if old_tip is self._marker:
1118
                    old_tip = None
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1119
            return self._update_tree(old_tip, change_reporter, revision, show_base)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1120
        finally:
1121
            self.unlock()
1122
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1123
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
1124
                     show_base=False):
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1125
        """Update a tree to the master branch.
1126
1127
        :param old_tip: if supplied, the previous tip revision the branch,
1128
            before it was changed to the master branch's tip.
1129
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1130
        # here if old_tip is not None, it is the old tip of the branch before
1131
        # it was updated from the master branch. This should become a pending
1132
        # merge in the working tree to preserve the user existing work.  we
1133
        # cant set that until we update the working trees last revision to be
1134
        # one from the new branch, because it will just get absorbed by the
1135
        # parent de-duplication logic.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1136
        #
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1137
        # We MUST save it even if an error occurs, because otherwise the users
1138
        # local work is unreferenced and will appear to have been lost.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1139
        #
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1140
        with self.lock_tree_write():
1141
            nb_conflicts = 0
1142
            try:
1143
                last_rev = self.get_parent_ids()[0]
1144
            except IndexError:
1145
                last_rev = _mod_revision.NULL_REVISION
1146
            if revision is None:
1147
                revision = self.branch.last_revision()
1148
1149
            old_tip = old_tip or _mod_revision.NULL_REVISION
1150
1151
            if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
1152
                # the branch we are bound to was updated
1153
                # merge those changes in first
7143.15.2 by Jelmer Vernooij
Run autopep8.
1154
                base_tree = self.basis_tree()
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1155
                other_tree = self.branch.repository.revision_tree(old_tip)
1156
                nb_conflicts = merge.merge_inner(self.branch, other_tree,
1157
                                                 base_tree, this_tree=self,
1158
                                                 change_reporter=change_reporter,
1159
                                                 show_base=show_base)
1160
                if nb_conflicts:
1161
                    self.add_parent_tree((old_tip, other_tree))
1162
                    note(gettext('Rerun update after fixing the conflicts.'))
1163
                    return nb_conflicts
1164
1165
            if last_rev != _mod_revision.ensure_null(revision):
1166
                # the working tree is up to date with the branch
1167
                # we can merge the specified revision from master
1168
                to_tree = self.branch.repository.revision_tree(revision)
7358.14.1 by Jelmer Vernooij
Remove Tree.get_root_id() in favour of Tree.path2id('').
1169
                to_root_id = to_tree.path2id('')
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1170
1171
                basis = self.basis_tree()
1172
                with basis.lock_read():
7358.14.1 by Jelmer Vernooij
Remove Tree.get_root_id() in favour of Tree.path2id('').
1173
                    if (basis.path2id('') is None or basis.path2id('') != to_root_id):
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1174
                        self.set_root_id(to_root_id)
1175
                        self.flush()
1176
1177
                # determine the branch point
1178
                graph = self.branch.repository.get_graph()
1179
                base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
1180
                                                    last_rev)
1181
                base_tree = self.branch.repository.revision_tree(base_rev_id)
1182
1183
                nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
1184
                                                 this_tree=self,
1185
                                                 change_reporter=change_reporter,
1186
                                                 show_base=show_base)
1187
                self.set_last_revision(revision)
1188
                # TODO - dedup parents list with things merged by pull ?
1189
                # reuse the tree we've updated to to set the basis:
1190
                parent_trees = [(revision, to_tree)]
1191
                merges = self.get_parent_ids()[1:]
1192
                # Ideally we ask the tree for the trees here, that way the working
1193
                # tree can decide whether to give us the entire tree or give us a
1194
                # lazy initialised tree. dirstate for instance will have the trees
1195
                # in ram already, whereas a last-revision + basis-inventory tree
1196
                # will not, but also does not need them when setting parents.
1197
                for parent in merges:
1198
                    parent_trees.append(
1199
                        (parent, self.branch.repository.revision_tree(parent)))
1200
                if not _mod_revision.is_null(old_tip):
1201
                    parent_trees.append(
1202
                        (old_tip, self.branch.repository.revision_tree(old_tip)))
1203
                self.set_parent_trees(parent_trees)
1204
                last_rev = parent_trees[0][0]
1205
            return nb_conflicts
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1206
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1207
    def set_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1208
        raise errors.UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1209
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1210
    def add_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1211
        raise errors.UnsupportedOperation(self.add_conflicts, self)
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1212
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1213
    def conflicts(self):
5582.10.47 by Jelmer Vernooij
Move some upgrade tests that rely on bzrdirformat 0.0.4.
1214
        raise NotImplementedError(self.conflicts)
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1215
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
1216
    def walkdirs(self, prefix=""):
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
1217
        """Walk the directories of this tree.
1218
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1219
        returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
1220
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1221
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
1222
                   file1_kind), ... ])
1223
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
1224
        This API returns a generator, which is only valid during the current
1225
        tree transaction - within a single lock_read or lock_write duration.
1226
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1227
        If the tree is not locked, it may cause an error to be raised,
1228
        depending on the tree implementation.
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
1229
        """
6825.3.1 by Jelmer Vernooij
Move walkdirs implementation to bzr/.
1230
        raise NotImplementedError(self.walkdirs)
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
1231
7290.25.3 by Jelmer Vernooij
Update version.
1232
    @deprecated_method(deprecated_in((3, 0, 1)))
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
1233
    def auto_resolve(self):
1234
        """Automatically resolve text conflicts according to contents.
1235
1236
        Only text conflicts are auto_resolvable. Files with no conflict markers
1237
        are considered 'resolved', because bzr always puts conflict markers
1238
        into files that have text conflicts.  The corresponding .THIS .BASE and
1239
        .OTHER files are deleted, as per 'resolve'.
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1240
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
1241
        :return: a tuple of ConflictLists: (un_resolved, resolved).
1242
        """
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1243
        with self.lock_tree_write():
1244
            un_resolved = _mod_conflicts.ConflictList()
1245
            resolved = _mod_conflicts.ConflictList()
1246
            for conflict in self.conflicts():
7290.25.1 by Jelmer Vernooij
merge lp:~gz/bzr/resolve_auto_refactor
1247
                try:
1248
                    conflict.action_auto(self)
1249
                except NotImplementedError:
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1250
                    un_resolved.append(conflict)
7290.25.1 by Jelmer Vernooij
merge lp:~gz/bzr/resolve_auto_refactor
1251
                else:
1252
                    conflict.cleanup(self)
1253
                    resolved.append(conflict)
6754.8.18 by Jelmer Vernooij
Get rid of lock_tree_write.
1254
            self.set_conflicts(un_resolved)
1255
            return un_resolved, resolved
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
1256
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
1257
    def _validate(self):
1258
        """Validate internal structures.
1259
1260
        This is meant mostly for the test suite. To give it a chance to detect
1261
        corruption after actions have occurred. The default implementation is a
1262
        just a no-op.
1263
1264
        :return: None. An exception should be raised if there is an error.
1265
        """
1266
        return
1267
5630.2.3 by John Arbash Meinel
Looks like it was a stale experimental .pyd file causing trouble. Tests pass again now.
1268
    def check_state(self):
1269
        """Check that the working state is/isn't valid."""
5850.1.2 by Jelmer Vernooij
Move inventory tree specific check implementation to InventoryWorkingTree.
1270
        raise NotImplementedError(self.check_state)
5630.2.4 by John Arbash Meinel
Basically works in the case where the dirstate isn't corrupted.
1271
1272
    def reset_state(self, revision_ids=None):
1273
        """Reset the state of the working tree.
1274
1275
        This does a hard-reset to a last-known-good state. This is a way to
1276
        fix if something got corrupted (like the .bzr/checkout/dirstate file)
1277
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1278
        raise NotImplementedError(self.reset_state)
5630.2.2 by John Arbash Meinel
Start fleshing out the design. Something weird is causing my tests to all fail.
1279
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
1280
    def _get_rules_searcher(self, default_searcher):
1281
        """See Tree._get_rules_searcher."""
1282
        if self._rules_searcher is None:
1283
            self._rules_searcher = super(WorkingTree,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1284
                                         self)._get_rules_searcher(default_searcher)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
1285
        return self._rules_searcher
1286
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
1287
    def get_shelf_manager(self):
1288
        """Return the ShelfManager for this WorkingTree."""
6772.3.3 by Jelmer Vernooij
Move shelf method implementations to .bzr.
1289
        raise NotImplementedError(self.get_shelf_manager)
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
1290
7104.3.2 by Jelmer Vernooij
Split out canonical path.
1291
    def get_canonical_paths(self, paths):
1292
        """Like get_canonical_path() but works on multiple items.
1293
1294
        :param paths: A sequence of paths relative to the root of the tree.
1295
        :return: A list of paths, with each item the corresponding input path
1296
            adjusted to account for existing elements that match case
1297
            insensitively.
1298
        """
1299
        with self.lock_read():
1300
            for path in paths:
1301
                yield path
1302
1303
    def get_canonical_path(self, path):
7104.3.3 by Jelmer Vernooij
Move get_canonical_paths to WorkingTree.
1304
        """Returns the first item in the tree that matches a path.
1305
1306
        This is meant to allow case-insensitive path lookups on e.g.
1307
        FAT filesystems.
7104.3.2 by Jelmer Vernooij
Split out canonical path.
1308
1309
        If a path matches exactly, it is returned. If no path matches exactly
7104.3.3 by Jelmer Vernooij
Move get_canonical_paths to WorkingTree.
1310
        but more than one path matches according to the underlying file system,
1311
        it is implementation defined which is returned.
7104.3.2 by Jelmer Vernooij
Split out canonical path.
1312
7104.3.3 by Jelmer Vernooij
Move get_canonical_paths to WorkingTree.
1313
        If no path matches according to the file system, the input path is
1314
        returned, but with as many path entries that do exist changed to their
1315
        canonical form.
7104.3.2 by Jelmer Vernooij
Split out canonical path.
1316
1317
        If you need to resolve many names from the same tree, you should
1318
        use get_canonical_paths() to avoid O(N) behaviour.
1319
1320
        :param path: A paths relative to the root of the tree.
1321
        :return: The input path adjusted to account for existing elements
1322
        that match case insensitively.
1323
        """
1324
        with self.lock_read():
1325
            return next(self.get_canonical_paths([path]))
1326
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1327
7311.2.1 by Jelmer Vernooij
Move is_control_filename onto ControlDirFormat.
1328
class WorkingTreeFormatRegistry(ControlComponentFormatRegistry):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
1329
    """Registry for working tree formats."""
1330
1331
    def __init__(self, other_registry=None):
1332
        super(WorkingTreeFormatRegistry, self).__init__(other_registry)
1333
        self._default_format = None
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
1334
        self._default_format_key = None
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
1335
1336
    def get_default(self):
1337
        """Return the current default format."""
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
1338
        if (self._default_format_key is not None and
7143.15.2 by Jelmer Vernooij
Run autopep8.
1339
                self._default_format is None):
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
1340
            self._default_format = self.get(self._default_format_key)
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
1341
        return self._default_format
1342
1343
    def set_default(self, format):
5816.2.3 by Jelmer Vernooij
Add docstrings.
1344
        """Set the default format."""
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
1345
        self._default_format = format
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
1346
        self._default_format_key = None
1347
1348
    def set_default_key(self, format_string):
5816.2.3 by Jelmer Vernooij
Add docstrings.
1349
        """Set the default format by its format string."""
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
1350
        self._default_format_key = format_string
1351
        self._default_format = None
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
1352
1353
1354
format_registry = WorkingTreeFormatRegistry()
1355
1356
7311.2.1 by Jelmer Vernooij
Move is_control_filename onto ControlDirFormat.
1357
class WorkingTreeFormat(ControlComponentFormat):
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1358
    """An encapsulation of the initialization and open routines for a format.
1359
1360
    Formats provide three things:
1361
     * An initialization routine,
1362
     * a format string,
1363
     * an open routine.
1364
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1365
    Formats are placed in an dict by their format string for reference
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1366
    during workingtree opening. Its not required that these be instances, they
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1367
    can be classes themselves with class methods - it simply depends on
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1368
    whether state is needed for a given format or not.
1369
1370
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1371
    methods on the format class. Do not deprecate the object, as the
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1372
    object will be created every time regardless.
1373
    """
1374
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
1375
    requires_rich_root = False
1376
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1377
    upgrade_recommended = False
1378
5582.10.29 by Jelmer Vernooij
Add requires_normalized_unicode_filenames
1379
    requires_normalized_unicode_filenames = False
1380
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
1381
    case_sensitive_filename = "FoRMaT"
1382
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
1383
    missing_parent_conflicts = False
1384
    """If this format supports missing parent conflicts."""
1385
5993.3.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_versioned_directories attribute.
1386
    supports_versioned_directories = None
1387
6885.2.1 by Jelmer Vernooij
Add WorkingTree.supports_merge_modified.
1388
    supports_merge_modified = True
1389
    """If this format supports storing merge modified hashes."""
1390
6741.1.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids.
1391
    supports_setting_file_ids = True
1392
    """If this format allows setting the file id."""
1393
6772.3.2 by Jelmer Vernooij
Add flag for store uncommitted in working tree formats.
1394
    supports_store_uncommitted = True
1395
    """If this format supports shelve-like functionality."""
1396
6844.1.2 by Jelmer Vernooij
Add supports_leftmost_parent_id_as_ghost.
1397
    supports_leftmost_parent_id_as_ghost = True
1398
6861.5.1 by Jelmer Vernooij
Add supports_righthand_parent_id_as_ghost flag.
1399
    supports_righthand_parent_id_as_ghost = True
1400
6876.4.1 by Jelmer Vernooij
Add format setting with ignore filename.
1401
    ignore_filename = None
1402
    """Name of file with ignore patterns, if any. """
1403
6207.3.3 by jelmer at samba
Fix tests and the like.
1404
    def initialize(self, controldir, revision_id=None, from_branch=None,
5683.1.1 by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize().
1405
                   accelerator_tree=None, hardlink=False):
6207.3.3 by jelmer at samba
Fix tests and the like.
1406
        """Initialize a new working tree in controldir.
5683.1.1 by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize().
1407
6207.3.3 by jelmer at samba
Fix tests and the like.
1408
        :param controldir: ControlDir to initialize the working tree in.
5683.1.1 by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize().
1409
        :param revision_id: allows creating a working tree at a different
1410
            revision than the branch is at.
1411
        :param from_branch: Branch to checkout
1412
        :param accelerator_tree: A tree which can be used for retrieving file
1413
            contents more quickly than the revision tree, i.e. a workingtree.
1414
            The revision tree will be used for cases where accelerator_tree's
1415
            content is different.
1416
        :param hardlink: If true, hard-link files from accelerator_tree,
1417
            where possible.
1418
        """
1419
        raise NotImplementedError(self.initialize)
1420
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1421
    def __eq__(self, other):
1422
        return self.__class__ is other.__class__
1423
1424
    def __ne__(self, other):
1425
        return not (self == other)
1426
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1427
    def get_format_description(self):
1428
        """Return the short description for this format."""
1429
        raise NotImplementedError(self.get_format_description)
1430
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1431
    def is_supported(self):
1432
        """Is this format supported?
1433
1434
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1435
        Unsupported formats may not support initialization or committing or
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1436
        some other features depending on the reason for not being supported.
1437
        """
1438
        return True
1439
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
1440
    def supports_content_filtering(self):
1441
        """True if this format supports content filtering."""
1442
        return False
1443
3586.1.4 by Ian Clatworthy
first cut at tree-level view tests
1444
    def supports_views(self):
1445
        """True if this format supports stored views."""
1446
        return False
1447
6162.3.2 by Jelmer Vernooij
Add WorkingTreeFormat.get_controldir_for_branch().
1448
    def get_controldir_for_branch(self):
1449
        """Get the control directory format for creating branches.
1450
1451
        This is to support testing of working tree formats that can not exist
1452
        in the same control directory as a branch.
1453
        """
6746.2.1 by Jelmer Vernooij
Rename matchingbzrdir to matchingcontroldir.
1454
        return self._matchingcontroldir
6162.3.2 by Jelmer Vernooij
Add WorkingTreeFormat.get_controldir_for_branch().
1455
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1456
6855.2.2 by Jelmer Vernooij
Format strings are bytes.
1457
format_registry.register_lazy(b"Bazaar Working Tree Format 4 (bzr 0.15)\n",
7143.15.2 by Jelmer Vernooij
Run autopep8.
1458
                              "breezy.bzr.workingtree_4", "WorkingTreeFormat4")
6855.2.2 by Jelmer Vernooij
Format strings are bytes.
1459
format_registry.register_lazy(b"Bazaar Working Tree Format 5 (bzr 1.11)\n",
7143.15.2 by Jelmer Vernooij
Run autopep8.
1460
                              "breezy.bzr.workingtree_4", "WorkingTreeFormat5")
6855.2.2 by Jelmer Vernooij
Format strings are bytes.
1461
format_registry.register_lazy(b"Bazaar Working Tree Format 6 (bzr 1.14)\n",
7143.15.2 by Jelmer Vernooij
Run autopep8.
1462
                              "breezy.bzr.workingtree_4", "WorkingTreeFormat6")
6855.2.2 by Jelmer Vernooij
Format strings are bytes.
1463
format_registry.register_lazy(b"Bazaar-NG Working Tree format 3",
7143.15.2 by Jelmer Vernooij
Run autopep8.
1464
                              "breezy.bzr.workingtree_3", "WorkingTreeFormat3")
6855.2.2 by Jelmer Vernooij
Format strings are bytes.
1465
format_registry.set_default_key(b"Bazaar Working Tree Format 6 (bzr 1.14)\n")