/brz/remove-bazaar

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