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