/brz/remove-bazaar

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