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