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