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