/brz/remove-bazaar

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