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