/brz/remove-bazaar

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