/brz/remove-bazaar

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