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