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