/brz/remove-bazaar

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