/brz/remove-bazaar

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