/brz/remove-bazaar

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