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