/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,
21
such as renaming or adding files.  The WorkingTree has an inventory
22
which is updated by these operations.  A commit produces a
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
23
new revision based on the workingtree and its inventory.
24
25
At the moment every WorkingTree has its own branch.  Remote
26
WorkingTrees aren't supported.
27
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
28
To get a WorkingTree, call bzrdir.open_workingtree() or
29
WorkingTree.open(dir).
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
30
"""
31
956 by Martin Pool
doc
32
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
33
from cStringIO import StringIO
34
import os
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
37
from bzrlib.lazy_import import lazy_import
38
lazy_import(globals(), """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
39
from bisect import bisect_left
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
40
import collections
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
41
import errno
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
42
import itertools
43
import operator
1398 by Robert Collins
integrate in Gustavos x-bit patch
44
import stat
2120.7.5 by Aaron Bentley
Merge bzr.dev
45
import re
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
46
1731.2.17 by Aaron Bentley
Support extracting with checkouts
47
from bzrlib import (
48
    branch,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
49
    bzrdir,
50
    conflicts as _mod_conflicts,
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
51
    controldir,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
52
    errors,
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
53
    filters as _mod_filters,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
54
    generate_ids,
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
55
    globbing,
4454.3.67 by John Arbash Meinel
Implement RevisionTree.annotate_iter and WT.annotate_iter
56
    graph as _mod_graph,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
57
    ignores,
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
58
    inventory,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
59
    merge,
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
60
    revision as _mod_revision,
1908.11.5 by John Arbash Meinel
[merge] bzr.dev 2240
61
    revisiontree,
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
62
    rio as _mod_rio,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
63
    transform,
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
64
    transport,
2323.6.2 by Martin Pool
Move responsibility for suggesting upgrades to ui object
65
    ui,
3586.1.3 by Ian Clatworthy
add views attribute to working trees
66
    views,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
67
    xml5,
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
68
    xml7,
1731.2.17 by Aaron Bentley
Support extracting with checkouts
69
    )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
70
""")
71
1986.5.6 by Robert Collins
Merge bzr.dev.
72
from bzrlib import symbol_versioning
1534.4.28 by Robert Collins
first cut at merge from integration.
73
from bzrlib.decorators import needs_read_lock, needs_write_lock
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
74
from bzrlib.lock import LogicalLockResult
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
75
import bzrlib.mutabletree
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
76
from bzrlib.mutabletree import needs_tree_write_lock
2949.6.2 by Alexander Belchenko
more changes osutils.lstat -> os.lstat
77
from bzrlib import osutils
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
78
from bzrlib.osutils import (
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
79
    file_kind,
80
    isdir,
2206.1.8 by Marius Kruger
Converted move/rename error messages to show source => target.
81
    normpath,
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
82
    pathjoin,
2206.1.8 by Marius Kruger
Converted move/rename error messages to show source => target.
83
    realpath,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
84
    safe_unicode,
85
    splitpath,
86
    supports_executable,
87
    )
88
from bzrlib.trace import mutter, note
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
89
from bzrlib.revision import CURRENT_REVISION
90
from bzrlib.symbol_versioning import (
91
    deprecated_passed,
92
    DEPRECATED_PARAMETER,
93
    )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
94
95
96
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
4597.3.48 by Vincent Ladeuil
Start cleaning BRANCH.TODO by pushing changes to either the python modules or the documentation.
97
# TODO: Modifying the conflict objects or their type is currently nearly
98
# impossible as there is no clear relationship between the working tree format
99
# and the conflict list file format.
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
100
CONFLICT_HEADER_1 = "BZR conflict list format 1"
1685.1.30 by John Arbash Meinel
PEP8 for workingtree.py
101
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
102
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
103
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
104
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
105
class TreeEntry(object):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
106
    """An entry that implements the minimum interface used by commands.
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
107
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
108
    This needs further inspection, it may be better to have
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
109
    InventoryEntries without ids - though that seems wrong. For now,
110
    this is a parallel hierarchy to InventoryEntry, and needs to become
111
    one of several things: decorates to that hierarchy, children of, or
112
    parents of it.
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
113
    Another note is that these objects are currently only used when there is
114
    no InventoryEntry available - i.e. for unversioned objects.
115
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
116
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
117
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
118
    def __eq__(self, other):
119
        # yes, this us ugly, TODO: best practice __eq__ style.
120
        return (isinstance(other, TreeEntry)
121
                and other.__class__ == self.__class__)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
122
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
123
    def kind_character(self):
124
        return "???"
125
126
127
class TreeDirectory(TreeEntry):
128
    """See TreeEntry. This is a directory in a working tree."""
129
130
    def __eq__(self, other):
131
        return (isinstance(other, TreeDirectory)
132
                and other.__class__ == self.__class__)
133
134
    def kind_character(self):
135
        return "/"
136
137
138
class TreeFile(TreeEntry):
139
    """See TreeEntry. This is a regular file in a working tree."""
140
141
    def __eq__(self, other):
142
        return (isinstance(other, TreeFile)
143
                and other.__class__ == self.__class__)
144
145
    def kind_character(self):
146
        return ''
147
148
149
class TreeLink(TreeEntry):
150
    """See TreeEntry. This is a symlink in a working tree."""
151
152
    def __eq__(self, other):
153
        return (isinstance(other, TreeLink)
154
                and other.__class__ == self.__class__)
155
156
    def kind_character(self):
157
        return ''
158
159
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
160
class WorkingTree(bzrlib.mutabletree.MutableTree,
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
161
    controldir.ControlComponent):
453 by Martin Pool
- Split WorkingTree into its own file
162
    """Working copy tree.
163
5335.1.2 by Robert Collins
Add note that basedir is a unicode object as per John's review.
164
    :ivar basedir: The root of the tree on disk. This is a unicode path object
165
        (as opposed to a URL).
453 by Martin Pool
- Split WorkingTree into its own file
166
    """
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
167
3586.1.3 by Ian Clatworthy
add views attribute to working trees
168
    # override this to set the strategy for storing views
169
    def _make_views(self):
170
        return views.DisabledViews(self)
171
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
172
    def __init__(self, basedir='.',
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
173
                 branch=DEPRECATED_PARAMETER,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
174
                 _control_files=None,
175
                 _internal=False,
176
                 _format=None,
177
                 _bzrdir=None):
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
178
        """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.
179
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
180
        :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.
181
        """
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.
182
        self._format = _format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
183
        self.bzrdir = _bzrdir
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
184
        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)
185
            raise errors.BzrError("Please use bzrdir.open_workingtree or "
186
                "WorkingTree.open() to obtain a WorkingTree.")
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
187
        basedir = safe_unicode(basedir)
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
188
        mutter("opening working tree %r", basedir)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
189
        if deprecated_passed(branch):
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
190
            self._branch = branch
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
191
        else:
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
192
            self._branch = self.bzrdir.open_branch()
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
193
        self.basedir = realpath(basedir)
5582.9.4 by Jelmer Vernooij
Remove hack for loading version 2 working trees from WorkingTree.
194
        self._control_files = _control_files
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
195
        self._transport = self._control_files._transport
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
196
        self._rules_searcher = None
3586.1.3 by Ian Clatworthy
add views attribute to working trees
197
        self.views = self._make_views()
3034.4.3 by Aaron Bentley
Add case-sensitivity handling to WorkingTree
198
5158.6.5 by Martin Pool
Implement ControlComponent on WorkingTree
199
    @property
200
    def user_transport(self):
201
        return self.bzrdir.user_transport
202
203
    @property
204
    def control_transport(self):
205
        return self._transport
206
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
207
    def is_control_filename(self, filename):
208
        """True if filename is the name of a control file in this tree.
209
210
        :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.
211
            from the root of this tree.
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
212
213
        This is true IF and ONLY IF the filename is part of the meta data
214
        that bzr controls in this tree. I.E. a random .bzr directory placed
215
        on disk will not be a control file for this tree.
216
        """
217
        return self.bzrdir.is_control_filename(filename)
218
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
219
    branch = property(
220
        fget=lambda self: self._branch,
221
        doc="""The branch this WorkingTree is connected to.
222
223
            This cannot be set - it is reflective of the actual disk structure
224
            the working tree has been constructed from.
225
            """)
226
1687.1.9 by Robert Collins
Teach WorkingTree about break-lock.
227
    def break_lock(self):
228
        """Break a lock if one is present from another instance.
229
230
        Uses the ui factory to ask for confirmation if the lock may be from
231
        an active process.
232
233
        This will probe the repository for its lock as well.
234
        """
235
        self._control_files.break_lock()
236
        self.branch.break_lock()
237
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
238
    def requires_rich_root(self):
239
        return self._format.requires_rich_root
240
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
241
    def supports_tree_reference(self):
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
242
        return False
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
243
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
244
    def supports_content_filtering(self):
245
        return self._format.supports_content_filtering()
246
3586.1.3 by Ian Clatworthy
add views attribute to working trees
247
    def supports_views(self):
248
        return self.views.supports_views()
249
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
250
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
251
    def open(path=None, _unsupported=False):
252
        """Open an existing working tree at path.
253
254
        """
255
        if path is None:
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
256
            path = osutils.getcwd()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
257
        control = bzrdir.BzrDir.open(path, _unsupported)
258
        return control.open_workingtree(_unsupported)
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
259
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
260
    @staticmethod
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
261
    def open_containing(path=None):
262
        """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.
263
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
264
        This probes for a working tree at path and searches upwards from there.
265
266
        Basically we keep looking up until we find the control directory or
267
        run into /.  If there isn't one, raises NotBranchError.
268
        TODO: give this a new exception.
269
        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
270
271
        :return: The WorkingTree that contains 'path', and the rest of path
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
272
        """
273
        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
274
            path = osutils.getcwd()
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
275
        control, relpath = bzrdir.BzrDir.open_containing(path)
276
        return control.open_workingtree(), relpath
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
277
278
    @staticmethod
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
279
    def open_containing_paths(file_list, default_directory=None,
280
                              canonicalize=True, apply_view=True):
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
281
        """Open the WorkingTree that contains a set of paths.
282
283
        Fail if the paths given are not all in a single tree.
284
285
        This is used for the many command-line interfaces that take a list of
286
        any number of files and that require they all be in the same tree.
287
        """
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
288
        if default_directory is None:
289
            default_directory = u'.'
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
290
        # recommended replacement for builtins.internal_tree_files
291
        if file_list is None or len(file_list) == 0:
292
            tree = WorkingTree.open_containing(default_directory)[0]
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
293
            # XXX: doesn't really belong here, and seems to have the strange
294
            # side effect of making it return a bunch of files, not the whole
295
            # tree -- mbp 20100716
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
296
            if tree.supports_views() and apply_view:
297
                view_files = tree.views.lookup_view()
298
                if view_files:
299
                    file_list = view_files
300
                    view_str = views.view_display_str(view_files)
301
                    note("Ignoring files outside view. View is %s" % view_str)
302
            return tree, file_list
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
303
        if default_directory == u'.':
304
            seed = file_list[0]
305
        else:
306
            seed = default_directory
307
            file_list = [osutils.pathjoin(default_directory, f)
308
                         for f in file_list]
309
        tree = WorkingTree.open_containing(seed)[0]
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
310
        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.
311
                                             apply_view=apply_view)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
312
313
    def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
314
        """Convert file_list into a list of relpaths in tree.
315
316
        :param self: A tree to operate on.
317
        :param file_list: A list of user provided paths or None.
318
        :param apply_view: if True and a view is set, apply it or check that
319
            specified files are within it
320
        :return: A list of relative paths.
321
        :raises errors.PathNotChild: When a provided path is in a different self
322
            than self.
323
        """
324
        if file_list is None:
325
            return None
326
        if self.supports_views() and apply_view:
327
            view_files = self.views.lookup_view()
328
        else:
329
            view_files = []
330
        new_list = []
331
        # self.relpath exists as a "thunk" to osutils, but canonical_relpath
332
        # doesn't - fix that up here before we enter the loop.
333
        if canonicalize:
334
            fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
335
        else:
336
            fixer = self.relpath
337
        for filename in file_list:
5346.4.3 by Martin Pool
PathNotChild should not give a traceback.
338
            relpath = fixer(osutils.dereference_path(filename))
339
            if view_files and not osutils.is_inside_any(view_files, relpath):
340
                raise errors.FileOutsideView(filename, view_files)
341
            new_list.append(relpath)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
342
        return new_list
343
344
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
345
    def open_downlevel(path=None):
346
        """Open an unsupported working tree.
347
348
        Only intended for advanced situations like upgrading part of a bzrdir.
349
        """
350
        return WorkingTree.open(path, _unsupported=True)
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
351
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
352
    @staticmethod
353
    def find_trees(location):
354
        def list_current(transport):
355
            return [d for d in transport.list_dir('') if d != '.bzr']
356
        def evaluate(bzrdir):
357
            try:
358
                tree = bzrdir.open_workingtree()
359
            except errors.NoWorkingTree:
360
                return True, None
361
            else:
362
                return True, tree
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
363
        t = transport.get_transport(location)
364
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
365
                                              list_current=list_current)
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
366
        return [tr for tr in iterator if tr is not None]
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
367
3146.8.16 by Aaron Bentley
Updates from review
368
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
369
        """See Tree.iter_all_file_ids"""
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
370
        raise NotImplementedError(self.all_file_ids)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
371
453 by Martin Pool
- Split WorkingTree into its own file
372
    def __repr__(self):
373
        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
374
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
375
376
    def abspath(self, filename):
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
377
        return pathjoin(self.basedir, filename)
2292.1.30 by Marius Kruger
* Minor text fixes.
378
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
379
    def basis_tree(self):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
380
        """Return RevisionTree for the current last revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
381
1927.2.3 by Robert Collins
review comment application - paired with Martin.
382
        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
383
        empty tree - one obtained by calling
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
384
        repository.revision_tree(NULL_REVISION).
1927.2.3 by Robert Collins
review comment application - paired with Martin.
385
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
386
        try:
387
            revision_id = self.get_parent_ids()[0]
388
        except IndexError:
389
            # no parents, return an empty revision tree.
390
            # in the future this should return the tree for
391
            # 'empty:' - the implicit root empty tree.
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
392
            return self.branch.repository.revision_tree(
393
                       _mod_revision.NULL_REVISION)
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
394
        try:
395
            return self.revision_tree(revision_id)
396
        except errors.NoSuchRevision:
397
            pass
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
398
        # No cached copy available, retrieve from the repository.
399
        # FIXME? RBC 20060403 should we cache the inventory locally
400
        # 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.
401
        try:
402
            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.
403
        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.
404
            # the basis tree *may* be a ghost or a low level error may have
4031.3.1 by Frank Aspell
Fixing various typos
405
            # 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.
406
            # its a ghost.
407
            if self.branch.repository.has_revision(revision_id):
408
                raise
1927.2.3 by Robert Collins
review comment application - paired with Martin.
409
            # 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().
410
            return self.branch.repository.revision_tree(
411
                       _mod_revision.NULL_REVISION)
453 by Martin Pool
- Split WorkingTree into its own file
412
2665.3.2 by Daniel Watkins
Created _cleanup() method in WorkingTree.
413
    def _cleanup(self):
414
        self._flush_ignore_list_cache()
415
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
416
    def relpath(self, path):
417
        """Return the local path portion from a given path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
418
419
        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).
420
        interpreted relative to the python current working directory.
421
        """
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
422
        return osutils.relpath(self.basedir, path)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
423
453 by Martin Pool
- Split WorkingTree into its own file
424
    def has_filename(self, filename):
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
425
        return osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
426
3368.2.11 by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py
427
    def get_file(self, file_id, path=None, filtered=True):
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
428
        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.
429
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
430
    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.
431
                           _fstat=osutils.fstat):
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
432
        """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
433
        if path is None:
434
            path = self.id2path(file_id)
3368.2.41 by Ian Clatworthy
1st cut merge of bzr.dev r3907
435
        file_obj = self.get_file_byname(path, filtered=False)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
436
        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
437
        if filtered and self.supports_content_filtering():
3368.2.46 by Ian Clatworthy
minor fix
438
            filters = self._content_filter_stack(path)
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
439
            file_obj = _mod_filters.filtered_input_file(file_obj, filters)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
440
        return (file_obj, stat_value)
453 by Martin Pool
- Split WorkingTree into its own file
441
3368.2.41 by Ian Clatworthy
1st cut merge of bzr.dev r3907
442
    def get_file_text(self, file_id, path=None, filtered=True):
5236.1.1 by Tim Penhey
Close the file after read.
443
        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
444
        try:
5236.1.1 by Tim Penhey
Close the file after read.
445
            return my_file.read()
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
446
        finally:
5236.1.1 by Tim Penhey
Close the file after read.
447
            my_file.close()
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
448
3368.2.11 by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py
449
    def get_file_byname(self, filename, filtered=True):
3368.2.1 by Ian Clatworthy
first cut at working tree content filtering
450
        path = self.abspath(filename)
3368.2.11 by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py
451
        f = file(path, 'rb')
4413.4.3 by John Arbash Meinel
Move the boolean check to the first part of the if statement
452
        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
453
            filters = self._content_filter_stack(filename)
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
454
            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
455
        else:
456
            return f
453 by Martin Pool
- Split WorkingTree into its own file
457
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
458
    def get_file_lines(self, file_id, path=None, filtered=True):
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
459
        """See Tree.get_file_lines()"""
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
460
        file = self.get_file(file_id, path, filtered=filtered)
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
461
        try:
462
            return file.readlines()
463
        finally:
464
            file.close()
465
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
466
    def get_parent_ids(self):
467
        """See Tree.get_parent_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
468
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
469
        This implementation reads the pending merges list and last_revision
470
        value and uses that to decide what the parents list should be.
471
        """
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
472
        last_rev = _mod_revision.ensure_null(self._last_revision())
2598.5.7 by Aaron Bentley
Updates from review
473
        if _mod_revision.NULL_REVISION == last_rev:
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
474
            parents = []
475
        else:
476
            parents = [last_rev]
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
477
        try:
4852.1.7 by John Arbash Meinel
Lots of tweaks in WorkingTree.
478
            merges_bytes = self._transport.get_bytes('pending-merges')
2206.1.7 by Marius Kruger
* errors
479
        except errors.NoSuchFile:
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
480
            pass
481
        else:
4852.1.9 by John Arbash Meinel
Minor typo fix.
482
            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.
483
                revision_id = l.rstrip('\n')
2249.5.9 by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate
484
                parents.append(revision_id)
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
485
        return parents
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
486
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
487
    def get_root_id(self):
488
        """Return the id of this trees root"""
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
489
        raise NotImplementedError(self.get_root_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
490
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
491
    @needs_read_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
492
    def clone(self, to_bzrdir, 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.
493
        """Duplicate this working tree into to_bzr, including all state.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
494
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.
495
        Specifically modified files are kept as modified, but
496
        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()
497
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
498
        If you want to make a new line of development, see bzrdir.sprout()
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
499
500
        revision
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
501
            If not None, the cloned tree will have its last revision set to
4031.3.1 by Frank Aspell
Fixing various typos
502
            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.
503
            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()
504
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
505
        # assumes the target bzr dir format is compatible.
3650.5.5 by Aaron Bentley
Make WorkingTree.clone use bzrdir's format
506
        result = to_bzrdir.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.
507
        self.copy_content_into(result, revision_id)
508
        return result
509
510
    @needs_read_lock
511
    def copy_content_into(self, tree, revision_id=None):
512
        """Copy the current content and user files of this tree into tree."""
1731.1.33 by Aaron Bentley
Revert no-special-root changes
513
        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.
514
        if revision_id is None:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
515
            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.
516
        else:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
517
            # TODO now merge from tree.last_revision to revision (to preserve
518
            # user local changes)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
519
            merge.transform_tree(tree, self)
1908.6.3 by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
520
            tree.set_parent_ids([revision_id])
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
521
1248 by Martin Pool
- new weave based cleanup [broken]
522
    def id2abspath(self, file_id):
523
        return self.abspath(self.id2path(file_id))
524
5786.1.5 by John Arbash Meinel
Move the logic about InventoryDirectory => TreeReference into iter_entries
525
    def _check_for_tree_references(self, iterator):
526
        """See if directories have become tree-references."""
527
        blocked_parent_ids = set()
528
        for path, ie in iterator:
529
            if ie.parent_id in blocked_parent_ids:
530
                # This entry was pruned because one of its parents became a
531
                # TreeReference. If this is a directory, mark it as blocked.
532
                if ie.kind == 'directory':
533
                    blocked_parent_ids.add(ie.file_id)
534
                continue
535
            if ie.kind == 'directory' and self._directory_is_tree_reference(path):
536
                # This InventoryDirectory needs to be a TreeReference
537
                ie = inventory.TreeReference(ie.file_id, ie.name, ie.parent_id)
538
                blocked_parent_ids.add(ie.file_id)
539
            yield path, ie
540
541
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
542
        """See Tree.iter_entries_by_dir()"""
543
        # The only trick here is that if we supports_tree_reference then we
544
        # need to detect if a directory becomes a tree-reference.
545
        iterator = super(WorkingTree, self).iter_entries_by_dir(
546
                specific_file_ids=specific_file_ids,
547
                yield_parents=yield_parents)
548
        if not self.supports_tree_reference():
549
            return iterator
550
        else:
551
            return self._check_for_tree_references(iterator)
552
453 by Martin Pool
- Split WorkingTree into its own file
553
    def get_file_size(self, file_id):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
554
        """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
555
        # XXX: this returns the on-disk size; it should probably return the
556
        # canonical size
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
557
        try:
558
            return os.path.getsize(self.id2abspath(file_id))
559
        except OSError, e:
560
            if e.errno != errno.ENOENT:
561
                raise
562
            else:
563
                return None
453 by Martin Pool
- Split WorkingTree into its own file
564
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
565
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
566
    def _gather_kinds(self, files, kinds):
567
        """See MutableTree._gather_kinds."""
568
        for pos, f in enumerate(files):
569
            if kinds[pos] is None:
570
                fullpath = normpath(self.abspath(f))
571
                try:
572
                    kinds[pos] = file_kind(fullpath)
573
                except OSError, e:
574
                    if e.errno == errno.ENOENT:
2206.1.7 by Marius Kruger
* errors
575
                        raise errors.NoSuchFile(fullpath)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
576
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
577
    @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.
578
    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.
579
        """Add revision_id as a parent.
580
581
        This is equivalent to retrieving the current list of parent ids
582
        and setting the list to its value plus revision_id.
583
584
        :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.
585
            be a ghost revision as long as its not the first parent to be
586
            added, or the allow_leftmost_as_ghost parameter is set True.
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
587
        :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.
588
        """
1908.5.13 by Robert Collins
Adding a parent when the first is a ghost already should not require forcing it.
589
        parents = self.get_parent_ids() + [revision_id]
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
590
        self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
2206.1.7 by Marius Kruger
* errors
591
            or allow_leftmost_as_ghost)
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
592
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
593
    @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.
594
    def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
595
        """Add revision_id, tree tuple as a parent.
596
597
        This is equivalent to retrieving the current list of parent trees
598
        and setting the list to its value plus parent_tuple. See also
599
        add_parent_tree_id - if you only have a parent id available it will be
600
        simpler to use that api. If you have the parent already available, using
601
        this api is preferred.
602
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
603
        :param parent_tuple: The (revision id, tree) to add to the parent list.
604
            If the revision_id is a ghost, pass None for the tree.
605
        :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.
606
        """
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
607
        parent_ids = self.get_parent_ids() + [parent_tuple[0]]
608
        if len(parent_ids) > 1:
609
            # the leftmost may have already been a ghost, preserve that if it
610
            # was.
611
            allow_leftmost_as_ghost = True
612
        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.
613
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
614
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
615
    @needs_tree_write_lock
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
616
    def add_pending_merge(self, *revision_ids):
617
        # TODO: Perhaps should check at this point that the
618
        # 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.
619
        parents = self.get_parent_ids()
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
620
        updated = False
621
        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.
622
            if rev_id in parents:
623
                continue
624
            parents.append(rev_id)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
625
            updated = True
626
        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.
627
            self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
628
2949.6.2 by Alexander Belchenko
more changes osutils.lstat -> os.lstat
629
    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
630
        _mapper=osutils.file_kind_from_stat_mode):
631
        """See Tree.path_content_summary."""
632
        abspath = self.abspath(path)
633
        try:
634
            stat_result = _lstat(abspath)
635
        except OSError, e:
636
            if getattr(e, 'errno', None) == errno.ENOENT:
637
                # no file.
638
                return ('missing', None, None, None)
2776.1.9 by Robert Collins
Review feedback.
639
            # propagate other errors
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
640
            raise
641
        kind = _mapper(stat_result.st_mode)
642
        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
643
            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
644
        elif kind == 'directory':
645
            # perhaps it looks like a plain directory, but it's really a
646
            # reference.
647
            if self._directory_is_tree_reference(path):
648
                kind = 'tree-reference'
649
            return kind, None, None, None
650
        elif kind == 'symlink':
4241.14.18 by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs.
651
            target = osutils.readlink(abspath)
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
652
            return ('symlink', None, None, target)
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
653
        else:
654
            return (kind, None, None, None)
655
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
656
    def _file_content_summary(self, path, stat_result):
657
        size = stat_result.st_size
658
        executable = self._is_executable_from_path_and_stat(path, stat_result)
659
        # try for a stat cache lookup
660
        return ('file', size, executable, self._sha_from_stat(
661
            path, stat_result))
662
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
663
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
664
        """Common ghost checking functionality from set_parent_*.
665
666
        This checks that the left hand-parent exists if there are any
667
        revisions present.
668
        """
669
        if len(revision_ids) > 0:
670
            leftmost_id = revision_ids[0]
671
            if (not allow_leftmost_as_ghost and not
672
                self.branch.repository.has_revision(leftmost_id)):
673
                raise errors.GhostRevisionUnusableHere(leftmost_id)
674
675
    def _set_merges_from_parent_ids(self, parent_ids):
676
        merges = parent_ids[1:]
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
677
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
678
            mode=self.bzrdir._get_file_mode())
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
679
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
680
    def _filter_parent_ids_by_ancestry(self, revision_ids):
681
        """Check that all merged revisions are proper 'heads'.
682
683
        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
684
        which are
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
685
        """
686
        if len(revision_ids) == 0:
687
            return revision_ids
688
        graph = self.branch.repository.get_graph()
689
        heads = graph.heads(revision_ids)
690
        new_revision_ids = revision_ids[:1]
691
        for revision_id in revision_ids[1:]:
692
            if revision_id in heads and revision_id not in new_revision_ids:
693
                new_revision_ids.append(revision_id)
694
        if new_revision_ids != revision_ids:
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
695
            mutter('requested to set revision_ids = %s,'
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
696
                         ' but filtered to %s', revision_ids, new_revision_ids)
697
        return new_revision_ids
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
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.
700
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
701
        """Set the parent ids to revision_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
702
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
703
        See also set_parent_trees. This api will try to retrieve the tree data
704
        for each element of revision_ids from the trees repository. If you have
705
        tree data already available, it is more efficient to use
706
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
707
        an easier API to use.
708
709
        :param revision_ids: The revision_ids to set as the parent ids of this
710
            working tree. Any of these may be ghosts.
711
        """
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
712
        self._check_parents_for_ghosts(revision_ids,
713
            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
714
        for revision_id in revision_ids:
715
            _mod_revision.check_not_reserved_id(revision_id)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
716
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
717
        revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
718
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
719
        if len(revision_ids) > 0:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
720
            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.
721
        else:
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
722
            self.set_last_revision(_mod_revision.NULL_REVISION)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
723
724
        self._set_merges_from_parent_ids(revision_ids)
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
725
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
726
    @needs_tree_write_lock
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
727
    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.
728
        parents = self.get_parent_ids()
729
        leftmost = parents[:1]
730
        new_parents = leftmost + rev_list
731
        self.set_parent_ids(new_parents)
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
732
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
733
    @needs_tree_write_lock
1534.7.192 by Aaron Bentley
Record hashes produced by merges
734
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
735
        def iter_stanzas():
736
            for file_id, hash in modified_hashes.iteritems():
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
737
                yield _mod_rio.Stanza(file_id=file_id.decode('utf8'),
738
                    hash=hash)
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
739
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
740
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.
741
    def _sha_from_stat(self, path, stat_result):
742
        """Get a sha digest from the tree's stat cache.
743
744
        The default implementation assumes no stat cache is present.
745
746
        :param path: The path.
747
        :param stat_result: The stat result being looked up.
748
        """
749
        return None
750
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
751
    def _put_rio(self, filename, stanzas, header):
2298.1.1 by Martin Pool
Add test for merge_modified
752
        self._must_be_locked()
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
753
        my_file = _mod_rio.rio_file(stanzas, header)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
754
        self._transport.put_file(filename, my_file,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
755
            mode=self.bzrdir._get_file_mode())
1534.7.192 by Aaron Bentley
Record hashes produced by merges
756
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
757
    @needs_write_lock # because merge pulls data into the branch.
1551.15.69 by Aaron Bentley
Add merge_type to merge_from_branch
758
    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.
759
                          merge_type=None, force=False):
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
760
        """Merge from a branch into this working tree.
761
762
        :param branch: The branch to merge from.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
763
        :param to_revision: If non-None, the merge will merge to to_revision,
764
            but not beyond it. to_revision does not need to be in the history
2206.1.7 by Marius Kruger
* errors
765
            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.
766
            branch.last_revision().
767
        """
768
        from bzrlib.merge import Merger, Merge3Merger
4961.2.10 by Martin Pool
No longer need to pass pb in to Merger
769
        merger = Merger(self.branch, this_tree=self)
770
        # check that there are no local alterations
771
        if not force and self.has_changes():
772
            raise errors.UncommittedChanges(self)
773
        if to_revision is None:
774
            to_revision = _mod_revision.ensure_null(branch.last_revision())
775
        merger.other_rev_id = to_revision
776
        if _mod_revision.is_null(merger.other_rev_id):
777
            raise errors.NoCommits(branch)
778
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
779
        merger.other_basis = merger.other_rev_id
780
        merger.other_tree = self.branch.repository.revision_tree(
781
            merger.other_rev_id)
782
        merger.other_branch = branch
783
        if from_revision is None:
784
            merger.find_base()
785
        else:
786
            merger.set_base_revision(from_revision, branch)
787
        if merger.base_rev_id == merger.other_rev_id:
788
            raise errors.PointlessMerge
789
        merger.backup_files = False
790
        if merge_type is None:
791
            merger.merge_type = Merge3Merger
792
        else:
793
            merger.merge_type = merge_type
794
        merger.set_interesting_files(None)
795
        merger.show_base = False
796
        merger.reprocess = False
797
        conflicts = merger.do_merge()
798
        merger.set_pending()
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
799
        return conflicts
800
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
801
    def merge_modified(self):
2298.1.1 by Martin Pool
Add test for merge_modified
802
        """Return a dictionary of files modified by a merge.
803
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
804
        The list is initialized by WorkingTree.set_merge_modified, which is
2298.1.1 by Martin Pool
Add test for merge_modified
805
        typically called after we make some automatic updates to the tree
806
        because of a merge.
807
808
        This returns a map of file_id->sha1, containing only files which are
809
        still in the working inventory and have that text hash.
810
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
811
        raise NotImplementedError(self.merge_modified)
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
812
813
    @needs_write_lock
814
    def mkdir(self, path, file_id=None):
815
        """See MutableTree.mkdir()."""
816
        if file_id is None:
817
            file_id = generate_ids.gen_file_id(os.path.basename(path))
818
        os.mkdir(self.abspath(path))
819
        self.add(path, file_id, 'directory')
820
        return file_id
821
5858.1.1 by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target.
822
    def get_symlink_target(self, file_id, path=None):
823
        if path is not None:
824
            abspath = self.abspath(path)
825
        else:
826
            abspath = self.id2abspath(file_id)
4241.14.18 by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs.
827
        target = osutils.readlink(abspath)
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
828
        return target
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
829
1731.2.1 by Aaron Bentley
Initial subsume implementation
830
    def subsume(self, other_tree):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
831
        raise NotImplementedError(self.subsume)
1731.2.1 by Aaron Bentley
Initial subsume implementation
832
2974.2.2 by John Arbash Meinel
Only one test failed, because it was incorrectly succeeding.
833
    def _setup_directory_is_tree_reference(self):
834
        if self._branch.repository._format.supports_tree_reference:
835
            self._directory_is_tree_reference = \
836
                self._directory_may_be_tree_reference
837
        else:
838
            self._directory_is_tree_reference = \
839
                self._directory_is_never_tree_reference
840
841
    def _directory_is_never_tree_reference(self, relpath):
842
        return False
843
844
    def _directory_may_be_tree_reference(self, relpath):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
845
        # 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
846
        # it's a tree reference, except that the root of the tree is not
847
        return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
848
        # TODO: We could ask all the control formats whether they
849
        # recognize this directory, but at the moment there's no cheap api
850
        # to do that.  Since we probably can only nest bzr checkouts and
851
        # they always use this name it's ok for now.  -- mbp 20060306
852
        #
853
        # FIXME: There is an unhandled case here of a subdirectory
854
        # containing .bzr but not a branch; that will probably blow up
855
        # when you try to commit it.  It might happen if there is a
856
        # checkout in a subdirectory.  This can be avoided by not adding
857
        # it.  mbp 20070306
858
1731.2.17 by Aaron Bentley
Support extracting with checkouts
859
    def extract(self, file_id, format=None):
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
860
        """Extract a subtree from this tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
861
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
862
        A new branch will be created, relative to the path for this tree.
863
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
864
        raise NotImplementedError(self.extract)
453 by Martin Pool
- Split WorkingTree into its own file
865
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
866
    def flush(self):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
867
        """Write the in memory meta data to disk."""
868
        raise NotImplementedError(self.flush)
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
869
1551.10.29 by Aaron Bentley
Fix tree.list_files when file kind changes
870
    def _kind(self, relpath):
871
        return osutils.file_kind(self.abspath(relpath))
872
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
873
    def list_files(self, include_root=False, from_dir=None, recursive=True):
874
        """List all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
875
876
        Lists, but does not descend into unversioned directories.
877
        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
878
        tree. Skips the control directory.
453 by Martin Pool
- Split WorkingTree into its own file
879
5128.1.1 by Vincent Ladeuil
Uncontroversial cleanups, mostly comments
880
        :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
881
        :param from_dir: start from this directory or None for the root
882
        :param recursive: whether to recurse into subdirectories or not
453 by Martin Pool
- Split WorkingTree into its own file
883
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
884
        raise NotImplementedError(self.list_files)
885
5346.1.5 by Vincent Ladeuil
Delete the to_name parameter from WorkingTree.move()
886
    def move(self, from_paths, to_dir=None, after=False):
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
887
        """Rename files.
888
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
889
        to_dir must be known to the working tree.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
890
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
        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
892
        it, keeping their old names.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
893
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
        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.
895
        this doesn't change the directory.
896
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
897
        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
898
        independently.
899
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
900
        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
901
        working tree metadata. The second mode only updates the working tree
902
        metadata without touching the file on the filesystem.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
903
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
904
        move uses the second mode if 'after == True' and the target is not
905
        versioned but present in the working tree.
906
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
907
        move uses the second mode if 'after == False' and the source is
908
        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
909
        versioned but present in the working tree.
910
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
911
        move uses the first mode if 'after == False' and the source is
912
        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
913
        versioned and not present in the working tree.
914
915
        Everything else results in an error.
916
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
917
        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
918
        entry that is moved.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
919
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
920
        raise NotImplementedError(self.move)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
921
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
922
    @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
923
    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).
924
        """Rename one file.
925
926
        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
927
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
928
        rename_one has several 'modes' to work. First, it can rename a physical
929
        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
930
        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
931
5911.1.4 by Benoît Pierre
Update docstrings for WorkingTree.move() and WorkingTree.rename_one().
932
        rename_one uses the second mode if 'after == True' and 'to_rel' is
933
        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
934
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
935
        rename_one uses the second mode if 'after == False' and 'from_rel' is
936
        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
937
        versioned but present in the working tree.
938
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
939
        rename_one uses the first mode if 'after == False' and 'from_rel' is
940
        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
941
        versioned and not present in the working tree.
942
943
        Everything else results in an error.
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
944
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
945
        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
946
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
947
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
948
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
949
        """Return all unknown files.
950
951
        These are files in the working directory that are not versioned or
952
        control files or ignored.
953
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
954
        # 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.
955
        # prevent race conditions with the lock
956
        return iter(
957
            [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
958
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
959
    def unversion(self, file_ids):
960
        """Remove the file ids in file_ids from the current versioned set.
961
962
        When a file_id is unversioned, all of its children are automatically
963
        unversioned.
964
965
        :param file_ids: The file ids to stop versioning.
966
        :raises: NoSuchId if any fileid is not currently versioned.
967
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
968
        raise NotImplementedError(self.unversion)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
969
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
970
    @needs_write_lock
1551.11.10 by Aaron Bentley
Add change reporting to pull
971
    def pull(self, source, overwrite=False, stop_revision=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
972
             change_reporter=None, possible_transports=None, local=False,
973
             show_base=False):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
974
        source.lock_read()
975
        try:
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
976
            old_revision_info = self.branch.last_revision_info()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
977
            basis_tree = self.basis_tree()
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
978
            count = self.branch.pull(source, overwrite, stop_revision,
4056.6.4 by Gary van der Merwe
Implement pull --local.
979
                                     possible_transports=possible_transports,
980
                                     local=local)
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
981
            new_revision_info = self.branch.last_revision_info()
982
            if new_revision_info != old_revision_info:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
983
                repository = self.branch.repository
5847.2.1 by John Arbash Meinel
Bug #780677, use a RevisionTree for pull
984
                if repository._format.fast_deltas:
5847.2.2 by John Arbash Meinel
Forgot that sometimes we don't have any parents during pull.
985
                    parent_ids = self.get_parent_ids()
986
                    if parent_ids:
987
                        basis_id = parent_ids[0]
988
                        basis_tree = repository.revision_tree(basis_id)
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
989
                basis_tree.lock_read()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
990
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
991
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
992
                    merge.merge_inner(
993
                                self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
994
                                new_basis_tree,
995
                                basis_tree,
996
                                this_tree=self,
4961.2.11 by Martin Pool
Pull out pbs and ProgressPhases stored in object state; just use them in single functions
997
                                pb=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
998
                                change_reporter=change_reporter,
999
                                show_base=show_base)
4634.123.11 by John Arbash Meinel
fix 'pull' to also set the root id.
1000
                    basis_root_id = basis_tree.get_root_id()
1001
                    new_root_id = new_basis_tree.get_root_id()
1002
                    if basis_root_id != new_root_id:
1003
                        self.set_root_id(new_root_id)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1004
                finally:
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1005
                    basis_tree.unlock()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1006
                # 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.
1007
                # reuse the revisiontree we merged against to set the new
1008
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1009
                parent_trees = [(self.branch.last_revision(), new_basis_tree)]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1010
                # we have to pull the merge trees out again, because
1011
                # 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.
1012
                # layered well enough to prevent double handling.
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1013
                # XXX TODO: Fix the double handling: telling the tree about
1014
                # 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.
1015
                merges = self.get_parent_ids()[1:]
1016
                parent_trees.extend([
1017
                    (parent, repository.revision_tree(parent)) for
1018
                     parent in merges])
1019
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1020
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1021
        finally:
1022
            source.unlock()
1023
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1024
    @needs_write_lock
1025
    def put_file_bytes_non_atomic(self, file_id, bytes):
1026
        """See MutableTree.put_file_bytes_non_atomic."""
1027
        stream = file(self.id2abspath(file_id), 'wb')
1028
        try:
1029
            stream.write(bytes)
1030
        finally:
1031
            stream.close()
1032
453 by Martin Pool
- Split WorkingTree into its own file
1033
    def extras(self):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1034
        """Yield all unversioned files in this WorkingTree.
453 by Martin Pool
- Split WorkingTree into its own file
1035
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1036
        If there are any unversioned directories then only the directory is
1037
        returned, not all its children.  But if there are unversioned files
453 by Martin Pool
- Split WorkingTree into its own file
1038
        under a versioned subdirectory, they are returned.
1039
1040
        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.
1041
        This is the same order used by 'osutils.walkdirs'.
453 by Martin Pool
- Split WorkingTree into its own file
1042
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1043
        raise NotImplementedError(self.extras)
453 by Martin Pool
- Split WorkingTree into its own file
1044
1045
    def ignored_files(self):
1046
        """Yield list of PATH, IGNORE_PATTERN"""
1047
        for subp in self.extras():
1048
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1049
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1050
                yield subp, pat
1051
1052
    def get_ignore_list(self):
1053
        """Return list of ignore patterns.
1054
1055
        Cached in the Tree object after the first call.
1056
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1057
        ignoreset = getattr(self, '_ignoreset', None)
1058
        if ignoreset is not None:
1059
            return ignoreset
1060
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
1061
        ignore_globs = set()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1062
        ignore_globs.update(ignores.get_runtime_ignores())
1063
        ignore_globs.update(ignores.get_user_ignores())
453 by Martin Pool
- Split WorkingTree into its own file
1064
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1065
            f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1066
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1067
                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
1068
            finally:
1069
                f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1070
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1071
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1072
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1073
    def _flush_ignore_list_cache(self):
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1074
        """Resets the cached ignore list to force a cache rebuild."""
1075
        self._ignoreset = None
1076
        self._ignoreglobster = None
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1077
453 by Martin Pool
- Split WorkingTree into its own file
1078
    def is_ignored(self, filename):
1079
        r"""Check whether the filename matches an ignore pattern.
1080
1081
        Patterns containing '/' or '\' need to match the whole path;
4948.5.1 by John Whitley
Implementation of ignore exclusions and basic tests for same.
1082
        others match against only the last component.  Patterns starting
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
1083
        with '!' are ignore exceptions.  Exceptions take precedence
4948.5.1 by John Whitley
Implementation of ignore exclusions and basic tests for same.
1084
        over regular patterns and cause the filename to not be ignored.
453 by Martin Pool
- Split WorkingTree into its own file
1085
1086
        If the file is ignored, returns the pattern which caused it to
1087
        be ignored, otherwise None.  So this can simply be used as a
1088
        boolean if desired."""
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1089
        if getattr(self, '_ignoreglobster', None) is None:
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
1090
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
1091
        return self._ignoreglobster.match(filename)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1092
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1093
    def kind(self, file_id):
1094
        return file_kind(self.id2abspath(file_id))
1095
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
1096
    def stored_kind(self, file_id):
1097
        """See Tree.stored_kind"""
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1098
        raise NotImplementedError(self.stored_kind)
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
1099
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1100
    def _comparison_data(self, entry, path):
1101
        abspath = self.abspath(path)
1102
        try:
1103
            stat_value = os.lstat(abspath)
1104
        except OSError, e:
1105
            if getattr(e, 'errno', None) == errno.ENOENT:
1106
                stat_value = None
1107
                kind = None
1108
                executable = False
1109
            else:
1110
                raise
1111
        else:
1112
            mode = stat_value.st_mode
1113
            kind = osutils.file_kind_from_stat_mode(mode)
1114
            if not supports_executable():
2409.1.2 by Dmitry Vasiliev
Used one-line conditional expression instead of the multi-line one
1115
                executable = entry is not None and entry.executable
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1116
            else:
1117
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1118
        return kind, executable, stat_value
1119
1120
    def _file_size(self, entry, stat_value):
1121
        return stat_value.st_size
1122
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1123
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1124
        """Return the last revision of the branch for this tree.
1125
1126
        This format tree does not support a separate marker for last-revision
1127
        compared to the branch.
1128
1129
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1130
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1131
        return self._last_revision()
1132
1133
    @needs_read_lock
1134
    def _last_revision(self):
1135
        """helper for get_parent_ids."""
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
1136
        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()
1137
1694.2.6 by Martin Pool
[merge] bzr.dev
1138
    def is_locked(self):
1139
        return self._control_files.is_locked()
1140
2298.1.1 by Martin Pool
Add test for merge_modified
1141
    def _must_be_locked(self):
1142
        if not self.is_locked():
1143
            raise errors.ObjectNotLocked(self)
1144
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1145
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1146
        """Lock the tree for reading.
1147
1148
        This also locks the branch, and can be unlocked via self.unlock().
1149
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1150
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1151
        """
2255.2.204 by Robert Collins
Fix info and status again.
1152
        if not self.is_locked():
1153
            self._reset_data()
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.
1154
        self.branch.lock_read()
1155
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1156
            self._control_files.lock_read()
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1157
            return LogicalLockResult(self.unlock)
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.
1158
        except:
1159
            self.branch.unlock()
1160
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1161
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1162
    def lock_tree_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1163
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1164
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1165
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1166
        """
2255.2.204 by Robert Collins
Fix info and status again.
1167
        if not self.is_locked():
1168
            self._reset_data()
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1169
        self.branch.lock_read()
1170
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1171
            self._control_files.lock_write()
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1172
            return LogicalLockResult(self.unlock)
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1173
        except:
1174
            self.branch.unlock()
1175
            raise
1176
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1177
    def lock_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1178
        """See MutableTree.lock_write, and WorkingTree.unlock.
1179
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1180
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1181
        """
2255.2.204 by Robert Collins
Fix info and status again.
1182
        if not self.is_locked():
1183
            self._reset_data()
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.
1184
        self.branch.lock_write()
1185
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1186
            self._control_files.lock_write()
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1187
            return LogicalLockResult(self.unlock)
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.
1188
        except:
1189
            self.branch.unlock()
1190
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1191
1694.2.6 by Martin Pool
[merge] bzr.dev
1192
    def get_physical_lock_status(self):
1193
        return self._control_files.get_physical_lock_status()
1194
2255.2.204 by Robert Collins
Fix info and status again.
1195
    def _reset_data(self):
1196
        """Reset transient data that cannot be revalidated."""
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1197
        raise NotImplementedError(self._reset_data)
2255.2.204 by Robert Collins
Fix info and status again.
1198
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1199
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1200
        """Change the last revision in the working tree."""
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1201
        raise NotImplementedError(self.set_last_revision)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1202
1203
    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.
1204
        """Template method part of set_last_revision to perform the change.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1205
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1206
        This is used to allow WorkingTree3 instances to not affect branch
1207
        when their last revision is set.
1208
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1209
        if _mod_revision.is_null(new_revision):
5718.7.13 by Jelmer Vernooij
Avoid using set_revision_history.
1210
            self.branch.set_last_revision_info(0, new_revision)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1211
            return False
5718.8.14 by Jelmer Vernooij
Check for reserved revids.
1212
        _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()
1213
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1214
            self.branch.generate_revision_history(new_revision)
1215
        except errors.NoSuchRevision:
1216
            # not present in the repo - dont try to set it deeper than the tip
5807.6.1 by Jelmer Vernooij
Use undeprecated wrappers.
1217
            self.branch._set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1218
        return True
1219
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1220
    @needs_tree_write_lock
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1221
    def remove(self, files, verbose=False, to_file=None, keep_files=True,
2292.1.10 by Marius Kruger
* workingtree.remove
1222
        force=False):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1223
        """Remove nominated files from the working tree metadata.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1224
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1225
        :files: File paths relative to the basedir.
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
1226
        :keep_files: If true, the files will also be kept.
2292.1.10 by Marius Kruger
* workingtree.remove
1227
        :force: Delete files and directories, even if they are changed and
1228
            even if the directories are not empty.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1229
        """
1230
        if isinstance(files, basestring):
1231
            files = [files]
1232
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1233
        inv_delta = []
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1234
5340.8.3 by Marius Kruger
new_files => all_files
1235
        all_files = set() # specified and nested files 
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1236
        unknown_nested_files=set()
4792.5.2 by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user
1237
        if to_file is None:
1238
            to_file = sys.stdout
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1239
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1240
        files_to_backup = []
1241
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1242
        def recurse_directory_to_add_files(directory):
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1243
            # 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()
1244
            # so we can check if they have changed.
5160.2.2 by Marius Kruger
check if changed file isStillInDirToBeRemoved before bailing out
1245
            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
1246
                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
1247
                    # Is it versioned or ignored?
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1248
                    if self.path2id(relpath):
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1249
                        # Add nested content for deletion.
5340.8.3 by Marius Kruger
new_files => all_files
1250
                        all_files.add(relpath)
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1251
                    else:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1252
                        # Files which are not versioned
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1253
                        # should be treated as unknown.
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1254
                        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()
1255
1256
        for filename in files:
1257
            # Get file name into canonical form.
1551.15.11 by Aaron Bentley
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees
1258
            abspath = self.abspath(filename)
1259
            filename = self.relpath(abspath)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1260
            if len(filename) > 0:
5340.8.3 by Marius Kruger
new_files => all_files
1261
                all_files.add(filename)
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1262
                recurse_directory_to_add_files(filename)
2655.2.4 by Marius Kruger
* workingtree.remove
1263
5340.8.3 by Marius Kruger
new_files => all_files
1264
        files = list(all_files)
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1265
2475.5.2 by Marius Kruger
* blackbox/test_remove
1266
        if len(files) == 0:
1267
            return # nothing to do
1268
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1269
        # Sort needed to first handle directory content before the directory
1270
        files.sort(reverse=True)
2655.2.6 by Marius Kruger
* workingtree.remove
1271
2655.2.4 by Marius Kruger
* workingtree.remove
1272
        # Bail out if we are going to delete files we shouldn't
2292.1.11 by Marius Kruger
* workingtree.remove
1273
        if not keep_files and not force:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1274
            for (file_id, path, content_change, versioned, parent_id, name,
1275
                 kind, executable) in self.iter_changes(self.basis_tree(),
1276
                     include_unchanged=True, require_versioned=False,
1277
                     want_unversioned=True, specific_files=files):
1278
                if versioned[0] == False:
1279
                    # The record is unknown or newly added
1280
                    files_to_backup.append(path[1])
1281
                elif (content_change and (kind[1] is not None) and
1282
                        osutils.is_inside_any(files, path[1])):
1283
                    # Versioned and changed, but not deleted, and still
1284
                    # in one of the dirs to be deleted.
1285
                    files_to_backup.append(path[1])
2475.5.2 by Marius Kruger
* blackbox/test_remove
1286
5340.8.5 by Marius Kruger
* extract backup_files
1287
        def backup(file_to_backup):
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
1288
            backup_name = self.bzrdir._available_backup_name(file_to_backup)
5340.8.5 by Marius Kruger
* extract backup_files
1289
            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.
1290
            return "removed %s (but kept a copy: %s)" % (file_to_backup,
1291
                                                         backup_name)
5340.8.5 by Marius Kruger
* extract backup_files
1292
4031.3.1 by Frank Aspell
Fixing various typos
1293
        # Build inv_delta and delete files where applicable,
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1294
        # do this before any modifications to meta data.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1295
        for f in files:
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1296
            fid = self.path2id(f)
2655.2.4 by Marius Kruger
* workingtree.remove
1297
            message = None
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1298
            if not fid:
2655.2.4 by Marius Kruger
* workingtree.remove
1299
                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.
1300
            else:
1301
                if verbose:
2292.1.10 by Marius Kruger
* workingtree.remove
1302
                    # 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.
1303
                    if self.is_ignored(f):
1304
                        new_status = 'I'
1305
                    else:
1306
                        new_status = '?'
4792.5.2 by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user
1307
                    # XXX: Really should be a more abstract reporter interface
4792.5.3 by Martin Pool
Further cleanup of removal reporting code
1308
                    kind_ch = osutils.kind_marker(self.kind(fid))
1309
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1310
                # Unversion file
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1311
                inv_delta.append((f, None, fid, None))
2655.2.4 by Marius Kruger
* workingtree.remove
1312
                message = "removed %s" % (f,)
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
1313
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
1314
            if not keep_files:
2292.1.30 by Marius Kruger
* Minor text fixes.
1315
                abs_path = self.abspath(f)
1316
                if osutils.lexists(abs_path):
1317
                    if (osutils.isdir(abs_path) and
1318
                        len(os.listdir(abs_path)) > 0):
2655.2.4 by Marius Kruger
* workingtree.remove
1319
                        if force:
1320
                            osutils.rmtree(abs_path)
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1321
                            message = "deleted %s" % (f,)
2655.2.4 by Marius Kruger
* workingtree.remove
1322
                        else:
5340.8.5 by Marius Kruger
* extract backup_files
1323
                            message = backup(f)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1324
                    else:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1325
                        if f in files_to_backup:
5340.8.5 by Marius Kruger
* extract backup_files
1326
                            message = backup(f)
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
1327
                        else:
1328
                            osutils.delete_any(abs_path)
1329
                            message = "deleted %s" % (f,)
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
1330
                elif message is not None:
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1331
                    # Only care if we haven't done anything yet.
1332
                    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()
1333
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1334
            # 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.
1335
            if message is not None:
1336
                note(message)
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1337
        self.apply_inventory_delta(inv_delta)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1338
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1339
    @needs_tree_write_lock
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
1340
    def revert(self, filenames=None, old_tree=None, backups=True,
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
1341
               pb=None, report_changes=False):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1342
        from bzrlib.conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1343
        if old_tree is None:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
1344
            basis_tree = self.basis_tree()
1345
            basis_tree.lock_read()
1346
            old_tree = basis_tree
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1347
        else:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
1348
            basis_tree = None
1349
        try:
1350
            conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1351
                                         report_changes)
2949.2.2 by Robert Collins
Avoid dirstate parent resetting when it is not needed during revert.
1352
            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
1353
                parent_trees = []
1354
                last_revision = self.last_revision()
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
1355
                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
1356
                    if basis_tree is None:
1357
                        basis_tree = self.basis_tree()
1358
                        basis_tree.lock_read()
1359
                    parent_trees.append((last_revision, basis_tree))
1360
                self.set_parent_trees(parent_trees)
1361
                resolve(self)
1362
            else:
3017.2.1 by Aaron Bentley
Revert now resolves conflicts recursively (#102739)
1363
                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
1364
        finally:
1365
            if basis_tree is not None:
1366
                basis_tree.unlock()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1367
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1368
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
1369
    def revision_tree(self, revision_id):
1370
        """See Tree.revision_tree.
1371
1372
        WorkingTree can supply revision_trees for the basis revision only
1373
        because there is only one cached inventory in the bzr directory.
1374
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1375
        raise NotImplementedError(self.revision_tree)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1376
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1377
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1378
    def set_root_id(self, file_id):
1379
        """Set the root id for this tree."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1380
        # for compatability
2858.2.4 by Martin Pool
Restore deprecated behaviour of accepting None for WorkingTree.set_root_id (thanks igc)
1381
        if file_id is None:
3400.3.6 by Martin Pool
Remove code deprecated prior to 1.1 and its tests
1382
            raise ValueError(
1383
                'WorkingTree.set_root_id with fileid=None')
1384
        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.
1385
        self._set_root_id(file_id)
1386
1387
    def _set_root_id(self, file_id):
1388
        """Set the root id for this tree, in a format specific manner.
1389
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1390
        :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.
1391
            present in the current inventory or an error will occur. It must
1392
            not be None, but rather a valid file id.
1393
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1394
        raise NotImplementedError(self._set_root_id)
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1395
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1396
    def unlock(self):
1397
        """See Branch.unlock.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1398
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1399
        WorkingTree locking just uses the Branch locking facilities.
1400
        This is current because all working trees have an embedded branch
1401
        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
1402
        between multiple working trees, i.e. via shared storage, then we
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1403
        would probably want to lock both the local tree, and the branch.
1404
        """
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.
1405
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1406
1907.5.7 by Matthieu Moy
Coding style fixes thanks to jam.
1407
    _marker = object()
1408
2009.1.4 by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are
1409
    def update(self, change_reporter=None, possible_transports=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1410
               revision=None, old_tip=_marker, show_base=False):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1411
        """Update a working tree along its branch.
1412
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1413
        This will update the branch if its bound too, which means we have
1414
        multiple trees involved:
1415
1416
        - The new basis tree of the master.
1417
        - The old basis tree of the branch.
1418
        - The old basis tree of the working tree.
1419
        - The current working tree state.
1420
1421
        Pathologically, all three may be different, and non-ancestors of each
1422
        other.  Conceptually we want to:
1423
1424
        - Preserve the wt.basis->wt.state changes
1425
        - Transform the wt.basis to the new master basis.
1426
        - Apply a merge of the old branch basis to get any 'local' changes from
1427
          it into the tree.
1428
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1429
1430
        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.
1431
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1432
        - Merge current state -> basis tree of the master w.r.t. the old tree
1433
          basis.
1434
        - 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.
1435
2009.1.2 by John Arbash Meinel
minor whitespace cleanup.
1436
        :param revision: The target revision to update to. Must be in the
1437
            revision history.
1438
        :param old_tip: If branch.update() has already been run, the value it
1439
            returned (old tip of the branch or None). _marker is used
1440
            otherwise.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1441
        """
3280.5.1 by John Arbash Meinel
Avoid opening the master branch when we won't use it.
1442
        if self.branch.get_bound_location() is not None:
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1443
            self.lock_write()
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
1444
            update_branch = (old_tip is self._marker)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1445
        else:
1446
            self.lock_tree_write()
1447
            update_branch = False
1448
        try:
1449
            if update_branch:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1450
                old_tip = self.branch.update(possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1451
            else:
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
1452
                if old_tip is self._marker:
1453
                    old_tip = None
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1454
            return self._update_tree(old_tip, change_reporter, revision, show_base)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1455
        finally:
1456
            self.unlock()
1457
1458
    @needs_tree_write_lock
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1459
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
1460
                     show_base=False):
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1461
        """Update a tree to the master branch.
1462
1463
        :param old_tip: if supplied, the previous tip revision the branch,
1464
            before it was changed to the master branch's tip.
1465
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1466
        # here if old_tip is not None, it is the old tip of the branch before
1467
        # it was updated from the master branch. This should become a pending
1468
        # merge in the working tree to preserve the user existing work.  we
1469
        # cant set that until we update the working trees last revision to be
1470
        # one from the new branch, because it will just get absorbed by the
1471
        # parent de-duplication logic.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1472
        #
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1473
        # We MUST save it even if an error occurs, because otherwise the users
1474
        # local work is unreferenced and will appear to have been lost.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1475
        #
4985.3.17 by Vincent Ladeuil
Some cleanup.
1476
        nb_conflicts = 0
1907.5.13 by Matthieu Moy
Fixed bad conflict resolution.
1477
        try:
1478
            last_rev = self.get_parent_ids()[0]
1479
        except IndexError:
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1480
            last_rev = _mod_revision.NULL_REVISION
1907.5.8 by Matthieu Moy
merge (with conflicts)
1481
        if revision is None:
1907.5.13 by Matthieu Moy
Fixed bad conflict resolution.
1482
            revision = self.branch.last_revision()
4985.3.17 by Vincent Ladeuil
Some cleanup.
1483
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
1484
        old_tip = old_tip or _mod_revision.NULL_REVISION
4985.3.17 by Vincent Ladeuil
Some cleanup.
1485
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
1486
        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.
1487
            # the branch we are bound to was updated
1488
            # merge those changes in first
1489
            base_tree  = self.basis_tree()
4985.3.1 by Gerard Krol
Werkt wel ok
1490
            other_tree = self.branch.repository.revision_tree(old_tip)
4985.3.17 by Vincent Ladeuil
Some cleanup.
1491
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
1492
                                             base_tree, this_tree=self,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1493
                                             change_reporter=change_reporter,
1494
                                             show_base=show_base)
4985.3.17 by Vincent Ladeuil
Some cleanup.
1495
            if nb_conflicts:
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
1496
                self.add_parent_tree((old_tip, other_tree))
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
1497
                note('Rerun update after fixing the conflicts.')
4985.3.17 by Vincent Ladeuil
Some cleanup.
1498
                return nb_conflicts
4985.3.1 by Gerard Krol
Werkt wel ok
1499
2009.1.4 by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are
1500
        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)
1501
            # the working tree is up to date with the branch
1502
            # we can merge the specified revision from master
1503
            to_tree = self.branch.repository.revision_tree(revision)
1504
            to_root_id = to_tree.get_root_id()
1505
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1506
            basis = self.basis_tree()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
1507
            basis.lock_read()
1508
            try:
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1509
                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.
1510
                    self.set_root_id(to_root_id)
2255.6.6 by Aaron Bentley
Fix update to set unique roots, and work with dirstate
1511
                    self.flush()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
1512
            finally:
1513
                basis.unlock()
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
1514
1515
            # determine the branch point
1516
            graph = self.branch.repository.get_graph()
4985.3.17 by Vincent Ladeuil
Some cleanup.
1517
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
1518
                                                last_rev)
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
1519
            base_tree = self.branch.repository.revision_tree(base_rev_id)
1520
4985.3.17 by Vincent Ladeuil
Some cleanup.
1521
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
1522
                                             this_tree=self,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1523
                                             change_reporter=change_reporter,
1524
                                             show_base=show_base)
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
1525
            self.set_last_revision(revision)
1908.6.6 by Robert Collins
Merge updated set_parents api.
1526
            # TODO - dedup parents list with things merged by pull ?
1527
            # 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)
1528
            parent_trees = [(revision, to_tree)]
1908.6.6 by Robert Collins
Merge updated set_parents api.
1529
            merges = self.get_parent_ids()[1:]
1530
            # Ideally we ask the tree for the trees here, that way the working
1907.5.12 by Matthieu Moy
Manage InvalidRevisionSpec in update command.
1531
            # 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.
1532
            # lazy initialised tree. dirstate for instance will have the trees
1533
            # in ram already, whereas a last-revision + basis-inventory tree
1534
            # will not, but also does not need them when setting parents.
1535
            for parent in merges:
1536
                parent_trees.append(
1537
                    (parent, self.branch.repository.revision_tree(parent)))
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
1538
            if not _mod_revision.is_null(old_tip):
1539
                parent_trees.append(
1540
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
1908.6.6 by Robert Collins
Merge updated set_parents api.
1541
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1542
            last_rev = parent_trees[0][0]
4985.3.17 by Vincent Ladeuil
Some cleanup.
1543
        return nb_conflicts
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1544
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1545
    def set_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1546
        raise errors.UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1547
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1548
    def add_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1549
        raise errors.UnsupportedOperation(self.add_conflicts, self)
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1550
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1551
    def conflicts(self):
5582.10.47 by Jelmer Vernooij
Move some upgrade tests that rely on bzrdirformat 0.0.4.
1552
        raise NotImplementedError(self.conflicts)
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1553
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
1554
    def walkdirs(self, prefix=""):
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
1555
        """Walk the directories of this tree.
1556
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1557
        returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
1558
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1559
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
1560
                   file1_kind), ... ])
1561
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
1562
        This API returns a generator, which is only valid during the current
1563
        tree transaction - within a single lock_read or lock_write duration.
1564
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1565
        If the tree is not locked, it may cause an error to be raised,
1566
        depending on the tree implementation.
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
1567
        """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1568
        disk_top = self.abspath(prefix)
1569
        if disk_top.endswith('/'):
1570
            disk_top = disk_top[:-1]
1571
        top_strip_len = len(disk_top) + 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1572
        inventory_iterator = self._walkdirs(prefix)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1573
        disk_iterator = osutils.walkdirs(disk_top, prefix)
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1574
        try:
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1575
            current_disk = disk_iterator.next()
1576
            disk_finished = False
1577
        except OSError, e:
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
1578
            if not (e.errno == errno.ENOENT or
1579
                (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1580
                raise
1581
            current_disk = None
1582
            disk_finished = True
1583
        try:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1584
            current_inv = inventory_iterator.next()
1585
            inv_finished = False
1586
        except StopIteration:
1587
            current_inv = None
1588
            inv_finished = True
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1589
        while not inv_finished or not disk_finished:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
1590
            if current_disk:
1591
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
1592
                    cur_disk_dir_content) = current_disk
1593
            else:
1594
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
1595
                    cur_disk_dir_content) = ((None, None), None)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1596
            if not disk_finished:
1597
                # strip out .bzr dirs
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
1598
                if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
1599
                    len(cur_disk_dir_content) > 0):
1600
                    # osutils.walkdirs can be made nicer -
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1601
                    # yield the path-from-prefix rather than the pathjoined
1602
                    # value.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
1603
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
1604
                        ('.bzr', '.bzr'))
3719.1.1 by Vincent Ladeuil
Fix bug #272648
1605
                    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.'
1606
                        and self.bzrdir.is_control_filename(
1607
                            cur_disk_dir_content[bzrdir_loc][0])):
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1608
                        # we dont yield the contents of, or, .bzr itself.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
1609
                        del cur_disk_dir_content[bzrdir_loc]
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1610
            if inv_finished:
1611
                # 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.
1612
                direction = 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1613
            elif disk_finished:
1614
                # 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.
1615
                direction = -1
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1616
            else:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
1617
                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.
1618
            if direction > 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1619
                # disk is before inventory - unknown
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1620
                dirblock = [(relpath, basename, kind, stat, None, None) for
2457.2.7 by Marius Kruger
extract method as per review request
1621
                    relpath, basename, kind, stat, top_path in
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
1622
                    cur_disk_dir_content]
1623
                yield (cur_disk_dir_relpath, None), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1624
                try:
1625
                    current_disk = disk_iterator.next()
1626
                except StopIteration:
1627
                    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.
1628
            elif direction < 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1629
                # inventory is before disk - missing.
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1630
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2457.2.7 by Marius Kruger
extract method as per review request
1631
                    for relpath, basename, dkind, stat, fileid, kind in
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1632
                    current_inv[1]]
1633
                yield (current_inv[0][0], current_inv[0][1]), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1634
                try:
1635
                    current_inv = inventory_iterator.next()
1636
                except StopIteration:
1637
                    inv_finished = True
1638
            else:
1639
                # versioned present directory
1640
                # merge the inventory and disk data together
1641
                dirblock = []
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1642
                for relpath, subiterator in itertools.groupby(sorted(
2457.2.7 by Marius Kruger
extract method as per review request
1643
                    current_inv[1] + cur_disk_dir_content,
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
1644
                    key=operator.itemgetter(0)), operator.itemgetter(1)):
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1645
                    path_elements = list(subiterator)
1646
                    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.
1647
                        inv_row, disk_row = path_elements
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1648
                        # 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.
1649
                        dirblock.append((inv_row[0],
1650
                            inv_row[1], disk_row[2],
1651
                            disk_row[3], inv_row[4],
1652
                            inv_row[5]))
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1653
                    elif len(path_elements[0]) == 5:
1654
                        # unknown disk file
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1655
                        dirblock.append((path_elements[0][0],
1656
                            path_elements[0][1], path_elements[0][2],
1657
                            path_elements[0][3], None, None))
1658
                    elif len(path_elements[0]) == 6:
1659
                        # versioned, absent file.
1660
                        dirblock.append((path_elements[0][0],
1661
                            path_elements[0][1], 'unknown', None,
1662
                            path_elements[0][4], path_elements[0][5]))
1663
                    else:
1664
                        raise NotImplementedError('unreachable code')
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1665
                yield current_inv[0], dirblock
1666
                try:
1667
                    current_inv = inventory_iterator.next()
1668
                except StopIteration:
1669
                    inv_finished = True
1670
                try:
1671
                    current_disk = disk_iterator.next()
1672
                except StopIteration:
1673
                    disk_finished = True
1674
1675
    def _walkdirs(self, prefix=""):
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1676
        """Walk the directories of this tree.
1677
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1678
        :param prefix: is used as the directrory to start with.
1679
        :returns: a generator which yields items in the form::
1680
1681
            ((curren_directory_path, fileid),
1682
             [(file1_path, file1_name, file1_kind, None, file1_id,
1683
               file1_kind), ... ])
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1684
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1685
        raise NotImplementedError(self._walkdirs)
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
1686
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
1687
    @needs_tree_write_lock
1688
    def auto_resolve(self):
1689
        """Automatically resolve text conflicts according to contents.
1690
1691
        Only text conflicts are auto_resolvable. Files with no conflict markers
1692
        are considered 'resolved', because bzr always puts conflict markers
1693
        into files that have text conflicts.  The corresponding .THIS .BASE and
1694
        .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.
1695
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
1696
        :return: a tuple of ConflictLists: (un_resolved, resolved).
1697
        """
1698
        un_resolved = _mod_conflicts.ConflictList()
1699
        resolved = _mod_conflicts.ConflictList()
1700
        conflict_re = re.compile('^(<{7}|={7}|>{7})')
1701
        for conflict in self.conflicts():
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
1702
            if (conflict.typestring != 'text conflict' or
1703
                self.kind(conflict.file_id) != 'file'):
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
1704
                un_resolved.append(conflict)
1705
                continue
1706
            my_file = open(self.id2abspath(conflict.file_id), 'rb')
1707
            try:
1708
                for line in my_file:
1709
                    if conflict_re.search(line):
1710
                        un_resolved.append(conflict)
1711
                        break
1712
                else:
1713
                    resolved.append(conflict)
1714
            finally:
1715
                my_file.close()
1716
        resolved.remove_files(self)
1717
        self.set_conflicts(un_resolved)
1718
        return un_resolved, resolved
1719
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
1720
    def _validate(self):
1721
        """Validate internal structures.
1722
1723
        This is meant mostly for the test suite. To give it a chance to detect
1724
        corruption after actions have occurred. The default implementation is a
1725
        just a no-op.
1726
1727
        :return: None. An exception should be raised if there is an error.
1728
        """
1729
        return
1730
5630.2.3 by John Arbash Meinel
Looks like it was a stale experimental .pyd file causing trouble. Tests pass again now.
1731
    def check_state(self):
1732
        """Check that the working state is/isn't valid."""
5850.1.2 by Jelmer Vernooij
Move inventory tree specific check implementation to InventoryWorkingTree.
1733
        raise NotImplementedError(self.check_state)
5630.2.4 by John Arbash Meinel
Basically works in the case where the dirstate isn't corrupted.
1734
1735
    def reset_state(self, revision_ids=None):
1736
        """Reset the state of the working tree.
1737
1738
        This does a hard-reset to a last-known-good state. This is a way to
1739
        fix if something got corrupted (like the .bzr/checkout/dirstate file)
1740
        """
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1741
        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.
1742
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
1743
    def _get_rules_searcher(self, default_searcher):
1744
        """See Tree._get_rules_searcher."""
1745
        if self._rules_searcher is None:
1746
            self._rules_searcher = super(WorkingTree,
1747
                self)._get_rules_searcher(default_searcher)
1748
        return self._rules_searcher
1749
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
1750
    def get_shelf_manager(self):
1751
        """Return the ShelfManager for this WorkingTree."""
1752
        from bzrlib.shelf import ShelfManager
1753
        return ShelfManager(self, self._transport)
1754
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1755
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1756
class InventoryWorkingTree(WorkingTree,
1757
        bzrlib.mutabletree.MutableInventoryTree):
1758
    """Base class for working trees that are inventory-oriented.
1759
1760
    The inventory is held in the `Branch` working-inventory, and the
1761
    files are in a directory on disk.
1762
1763
    It is possible for a `WorkingTree` to have a filename which is
1764
    not listed in the Inventory and vice versa.
1765
    """
1766
1767
    def __init__(self, basedir='.',
1768
                 branch=DEPRECATED_PARAMETER,
1769
                 _inventory=None,
1770
                 _control_files=None,
1771
                 _internal=False,
1772
                 _format=None,
1773
                 _bzrdir=None):
1774
        """Construct a InventoryWorkingTree instance. This is not a public API.
1775
1776
        :param branch: A branch to override probing for the branch.
1777
        """
1778
        super(InventoryWorkingTree, self).__init__(basedir=basedir,
1779
            branch=branch, _control_files=_control_files, _internal=_internal,
1780
            _format=_format, _bzrdir=_bzrdir)
1781
6110.4.1 by Jelmer Vernooij
Move hashcache to InventoryWorkingTree.
1782
        self._detect_case_handling()
1783
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1784
        if _inventory is None:
1785
            # This will be acquired on lock_read() or lock_write()
1786
            self._inventory_is_modified = False
1787
            self._inventory = None
1788
        else:
1789
            # the caller of __init__ has provided an inventory,
1790
            # we assume they know what they are doing - as its only
1791
            # the Format factory and creation methods that are
1792
            # permitted to do this.
1793
            self._set_inventory(_inventory, dirty=False)
1794
1795
    def _set_inventory(self, inv, dirty):
1796
        """Set the internal cached inventory.
1797
1798
        :param inv: The inventory to set.
1799
        :param dirty: A boolean indicating whether the inventory is the same
1800
            logical inventory as whats on disk. If True the inventory is not
1801
            the same and should be written to disk or data will be lost, if
1802
            False then the inventory is the same as that on disk and any
1803
            serialisation would be unneeded overhead.
1804
        """
1805
        self._inventory = inv
1806
        self._inventory_is_modified = dirty
1807
6110.4.1 by Jelmer Vernooij
Move hashcache to InventoryWorkingTree.
1808
    def _detect_case_handling(self):
1809
        wt_trans = self.bzrdir.get_workingtree_transport(None)
1810
        try:
1811
            wt_trans.stat(self._format.case_sensitive_filename)
1812
        except errors.NoSuchFile:
1813
            self.case_sensitive = True
1814
        else:
1815
            self.case_sensitive = False
1816
1817
        self._setup_directory_is_tree_reference()
1818
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1819
    def _serialize(self, inventory, out_file):
1820
        xml5.serializer_v5.write_inventory(self._inventory, out_file,
1821
            working=True)
1822
1823
    def _deserialize(selt, in_file):
1824
        return xml5.serializer_v5.read_inventory(in_file)
1825
1826
    @needs_tree_write_lock
1827
    def _write_inventory(self, inv):
1828
        """Write inventory as the current inventory."""
1829
        self._set_inventory(inv, dirty=True)
1830
        self.flush()
1831
1832
    # XXX: This method should be deprecated in favour of taking in a proper
1833
    # new Inventory object.
1834
    @needs_tree_write_lock
1835
    def set_inventory(self, new_inventory_list):
1836
        from bzrlib.inventory import (Inventory,
1837
                                      InventoryDirectory,
1838
                                      InventoryFile,
1839
                                      InventoryLink)
1840
        inv = Inventory(self.get_root_id())
1841
        for path, file_id, parent, kind in new_inventory_list:
1842
            name = os.path.basename(path)
1843
            if name == "":
1844
                continue
1845
            # fixme, there should be a factory function inv,add_??
1846
            if kind == 'directory':
1847
                inv.add(InventoryDirectory(file_id, name, parent))
1848
            elif kind == 'file':
1849
                inv.add(InventoryFile(file_id, name, parent))
1850
            elif kind == 'symlink':
1851
                inv.add(InventoryLink(file_id, name, parent))
1852
            else:
1853
                raise errors.BzrError("unknown kind %r" % kind)
1854
        self._write_inventory(inv)
1855
1856
    def _write_basis_inventory(self, xml):
1857
        """Write the basis inventory XML to the basis-inventory file"""
1858
        path = self._basis_inventory_name()
1859
        sio = StringIO(xml)
1860
        self._transport.put_file(path, sio,
1861
            mode=self.bzrdir._get_file_mode())
1862
1863
    def _reset_data(self):
1864
        """Reset transient data that cannot be revalidated."""
1865
        self._inventory_is_modified = False
1866
        f = self._transport.get('inventory')
1867
        try:
1868
            result = self._deserialize(f)
1869
        finally:
1870
            f.close()
1871
        self._set_inventory(result, dirty=False)
1872
1873
    def _set_root_id(self, file_id):
1874
        """Set the root id for this tree, in a format specific manner.
1875
1876
        :param file_id: The file id to assign to the root. It must not be
1877
            present in the current inventory or an error will occur. It must
1878
            not be None, but rather a valid file id.
1879
        """
1880
        inv = self._inventory
1881
        orig_root_id = inv.root.file_id
1882
        # TODO: it might be nice to exit early if there was nothing
1883
        # to do, saving us from trigger a sync on unlock.
1884
        self._inventory_is_modified = True
1885
        # we preserve the root inventory entry object, but
1886
        # unlinkit from the byid index
1887
        del inv._byid[inv.root.file_id]
1888
        inv.root.file_id = file_id
1889
        # and link it into the index with the new changed id.
1890
        inv._byid[inv.root.file_id] = inv.root
1891
        # and finally update all children to reference the new id.
1892
        # XXX: this should be safe to just look at the root.children
1893
        # list, not the WHOLE INVENTORY.
1894
        for fid in inv:
1895
            entry = inv[fid]
1896
            if entry.parent_id == orig_root_id:
1897
                entry.parent_id = inv.root.file_id
1898
1899
    def all_file_ids(self):
1900
        """See Tree.iter_all_file_ids"""
1901
        return set(self.inventory)
1902
5807.1.1 by Jelmer Vernooij
Move inventory-specific method to InventoryWorkingTree.
1903
    @needs_tree_write_lock
1904
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1905
        """See MutableTree.set_parent_trees."""
1906
        parent_ids = [rev for (rev, tree) in parents_list]
1907
        for revision_id in parent_ids:
1908
            _mod_revision.check_not_reserved_id(revision_id)
1909
1910
        self._check_parents_for_ghosts(parent_ids,
1911
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1912
1913
        parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
1914
1915
        if len(parent_ids) == 0:
1916
            leftmost_parent_id = _mod_revision.NULL_REVISION
1917
            leftmost_parent_tree = None
1918
        else:
1919
            leftmost_parent_id, leftmost_parent_tree = parents_list[0]
1920
1921
        if self._change_last_revision(leftmost_parent_id):
1922
            if leftmost_parent_tree is None:
1923
                # If we don't have a tree, fall back to reading the
1924
                # parent tree from the repository.
1925
                self._cache_basis_inventory(leftmost_parent_id)
1926
            else:
1927
                inv = leftmost_parent_tree.inventory
1928
                xml = self._create_basis_xml_from_inventory(
1929
                                        leftmost_parent_id, inv)
1930
                self._write_basis_inventory(xml)
1931
        self._set_merges_from_parent_ids(parent_ids)
1932
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1933
    def _cache_basis_inventory(self, new_revision):
1934
        """Cache new_revision as the basis inventory."""
1935
        # TODO: this should allow the ready-to-use inventory to be passed in,
1936
        # as commit already has that ready-to-use [while the format is the
1937
        # same, that is].
1938
        try:
1939
            # this double handles the inventory - unpack and repack -
1940
            # but is easier to understand. We can/should put a conditional
1941
            # in here based on whether the inventory is in the latest format
1942
            # - perhaps we should repack all inventories on a repository
1943
            # upgrade ?
1944
            # the fast path is to copy the raw xml from the repository. If the
1945
            # xml contains 'revision_id="', then we assume the right
1946
            # revision_id is set. We must check for this full string, because a
1947
            # root node id can legitimately look like 'revision_id' but cannot
1948
            # contain a '"'.
1949
            xml = self.branch.repository._get_inventory_xml(new_revision)
1950
            firstline = xml.split('\n', 1)[0]
1951
            if (not 'revision_id="' in firstline or
1952
                'format="7"' not in firstline):
1953
                inv = self.branch.repository._serializer.read_inventory_from_string(
1954
                    xml, new_revision)
1955
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1956
            self._write_basis_inventory(xml)
1957
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1958
            pass
1959
1960
    def _basis_inventory_name(self):
1961
        return 'basis-inventory-cache'
1962
1963
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1964
        """Create the text that will be saved in basis-inventory"""
1965
        inventory.revision_id = revision_id
1966
        return xml7.serializer_v7.write_inventory_to_string(inventory)
1967
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
1968
    @needs_tree_write_lock
1969
    def set_conflicts(self, conflicts):
1970
        self._put_rio('conflicts', conflicts.to_stanzas(),
1971
                      CONFLICT_HEADER_1)
1972
1973
    @needs_tree_write_lock
1974
    def add_conflicts(self, new_conflicts):
1975
        conflict_set = set(self.conflicts())
1976
        conflict_set.update(set(list(new_conflicts)))
1977
        self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
1978
                                       key=_mod_conflicts.Conflict.sort_key)))
1979
1980
    @needs_read_lock
1981
    def conflicts(self):
1982
        try:
1983
            confile = self._transport.get('conflicts')
1984
        except errors.NoSuchFile:
1985
            return _mod_conflicts.ConflictList()
1986
        try:
1987
            try:
1988
                if confile.next() != CONFLICT_HEADER_1 + '\n':
1989
                    raise errors.ConflictFormatError()
1990
            except StopIteration:
1991
                raise errors.ConflictFormatError()
1992
            reader = _mod_rio.RioReader(confile)
1993
            return _mod_conflicts.ConflictList.from_stanzas(reader)
1994
        finally:
1995
            confile.close()
1996
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
1997
    def read_basis_inventory(self):
1998
        """Read the cached basis inventory."""
1999
        path = self._basis_inventory_name()
2000
        return self._transport.get_bytes(path)
2001
2002
    @needs_read_lock
2003
    def read_working_inventory(self):
2004
        """Read the working inventory.
2005
2006
        :raises errors.InventoryModified: read_working_inventory will fail
2007
            when the current in memory inventory has been modified.
2008
        """
2009
        # conceptually this should be an implementation detail of the tree.
2010
        # XXX: Deprecate this.
2011
        # ElementTree does its own conversion from UTF-8, so open in
2012
        # binary.
2013
        if self._inventory_is_modified:
2014
            raise errors.InventoryModified(self)
2015
        f = self._transport.get('inventory')
2016
        try:
2017
            result = self._deserialize(f)
2018
        finally:
2019
            f.close()
2020
        self._set_inventory(result, dirty=False)
2021
        return result
2022
2023
    @needs_read_lock
2024
    def get_root_id(self):
2025
        """Return the id of this trees root"""
2026
        return self._inventory.root.file_id
2027
2028
    def has_id(self, file_id):
2029
        # files that have been deleted are excluded
2030
        inv = self.inventory
2031
        if not inv.has_id(file_id):
2032
            return False
2033
        path = inv.id2path(file_id)
2034
        return osutils.lexists(self.abspath(path))
2035
2036
    def has_or_had_id(self, file_id):
2037
        if file_id == self.inventory.root.file_id:
2038
            return True
2039
        return self.inventory.has_id(file_id)
2040
5837.2.1 by Jelmer Vernooij
Deprecate Tree.__iter__.
2041
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2042
    def __iter__(self):
2043
        """Iterate through file_ids for this tree.
2044
2045
        file_ids are in a WorkingTree if they are in the working inventory
2046
        and the working file exists.
2047
        """
2048
        inv = self._inventory
2049
        for path, ie in inv.iter_entries():
2050
            if osutils.lexists(self.abspath(path)):
2051
                yield ie.file_id
2052
2053
    @needs_tree_write_lock
2054
    def set_last_revision(self, new_revision):
2055
        """Change the last revision in the working tree."""
2056
        if self._change_last_revision(new_revision):
2057
            self._cache_basis_inventory(new_revision)
2058
5850.1.2 by Jelmer Vernooij
Move inventory tree specific check implementation to InventoryWorkingTree.
2059
    def _get_check_refs(self):
2060
        """Return the references needed to perform a check of this tree.
2061
        
2062
        The default implementation returns no refs, and is only suitable for
2063
        trees that have no local caching and can commit on ghosts at any time.
2064
2065
        :seealso: bzrlib.check for details about check_refs.
2066
        """
2067
        return []
2068
2069
    @needs_read_lock
2070
    def _check(self, references):
2071
        """Check the tree for consistency.
2072
2073
        :param references: A dict with keys matching the items returned by
2074
            self._get_check_refs(), and values from looking those keys up in
2075
            the repository.
2076
        """
2077
        tree_basis = self.basis_tree()
2078
        tree_basis.lock_read()
2079
        try:
2080
            repo_basis = references[('trees', self.last_revision())]
2081
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2082
                raise errors.BzrCheckError(
2083
                    "Mismatched basis inventory content.")
2084
            self._validate()
2085
        finally:
2086
            tree_basis.unlock()
2087
2088
    @needs_read_lock
2089
    def check_state(self):
2090
        """Check that the working state is/isn't valid."""
2091
        check_refs = self._get_check_refs()
2092
        refs = {}
2093
        for ref in check_refs:
2094
            kind, value = ref
2095
            if kind == 'trees':
2096
                refs[ref] = self.branch.repository.revision_tree(value)
2097
        self._check(refs)
2098
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2099
    @needs_tree_write_lock
2100
    def reset_state(self, revision_ids=None):
2101
        """Reset the state of the working tree.
2102
2103
        This does a hard-reset to a last-known-good state. This is a way to
2104
        fix if something got corrupted (like the .bzr/checkout/dirstate file)
2105
        """
2106
        if revision_ids is None:
2107
            revision_ids = self.get_parent_ids()
2108
        if not revision_ids:
2109
            rt = self.branch.repository.revision_tree(
2110
                _mod_revision.NULL_REVISION)
2111
        else:
2112
            rt = self.branch.repository.revision_tree(revision_ids[0])
2113
        self._write_inventory(rt.inventory)
2114
        self.set_parent_ids(revision_ids)
2115
2116
    def flush(self):
2117
        """Write the in memory inventory to disk."""
2118
        # TODO: Maybe this should only write on dirty ?
2119
        if self._control_files._lock_mode != 'w':
2120
            raise errors.NotWriteLocked(self)
2121
        sio = StringIO()
2122
        self._serialize(self._inventory, sio)
2123
        sio.seek(0)
2124
        self._transport.put_file('inventory', sio,
2125
            mode=self.bzrdir._get_file_mode())
2126
        self._inventory_is_modified = False
2127
2128
    def get_file_mtime(self, file_id, path=None):
2129
        """See Tree.get_file_mtime."""
2130
        if not path:
2131
            path = self.inventory.id2path(file_id)
2132
        return os.lstat(self.abspath(path)).st_mtime
2133
2134
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2135
        file_id = self.path2id(path)
2136
        if file_id is None:
2137
            # For unversioned files on win32, we just assume they are not
2138
            # executable
2139
            return False
2140
        return self._inventory[file_id].executable
2141
2142
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
2143
        mode = stat_result.st_mode
2144
        return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2145
2146
    if not supports_executable():
2147
        def is_executable(self, file_id, path=None):
2148
            return self._inventory[file_id].executable
2149
2150
        _is_executable_from_path_and_stat = \
2151
            _is_executable_from_path_and_stat_from_basis
2152
    else:
2153
        def is_executable(self, file_id, path=None):
2154
            if not path:
2155
                path = self.id2path(file_id)
2156
            mode = os.lstat(self.abspath(path)).st_mode
2157
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
2158
2159
        _is_executable_from_path_and_stat = \
2160
            _is_executable_from_path_and_stat_from_stat
2161
2162
    @needs_tree_write_lock
2163
    def _add(self, files, ids, kinds):
2164
        """See MutableTree._add."""
2165
        # TODO: Re-adding a file that is removed in the working copy
2166
        # should probably put it back with the previous ID.
2167
        # the read and write working inventory should not occur in this
2168
        # function - they should be part of lock_write and unlock.
2169
        inv = self.inventory
2170
        for f, file_id, kind in zip(files, ids, kinds):
2171
            if file_id is None:
2172
                inv.add_path(f, kind=kind)
2173
            else:
2174
                inv.add_path(f, kind=kind, file_id=file_id)
2175
            self._inventory_is_modified = True
2176
2177
    def revision_tree(self, revision_id):
2178
        """See WorkingTree.revision_id."""
2179
        if revision_id == self.last_revision():
2180
            try:
2181
                xml = self.read_basis_inventory()
2182
            except errors.NoSuchFile:
2183
                pass
2184
            else:
2185
                try:
2186
                    inv = xml7.serializer_v7.read_inventory_from_string(xml)
2187
                    # dont use the repository revision_tree api because we want
2188
                    # to supply the inventory.
2189
                    if inv.revision_id == revision_id:
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
2190
                        return revisiontree.InventoryRevisionTree(
2191
                            self.branch.repository, inv, revision_id)
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2192
                except errors.BadInventoryFormat:
2193
                    pass
2194
        # raise if there was no inventory, or if we read the wrong inventory.
2195
        raise errors.NoSuchRevisionInTree(self, revision_id)
2196
2197
    @needs_read_lock
2198
    def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
2199
        """See Tree.annotate_iter
2200
2201
        This implementation will use the basis tree implementation if possible.
2202
        Lines not in the basis are attributed to CURRENT_REVISION
2203
2204
        If there are pending merges, lines added by those merges will be
2205
        incorrectly attributed to CURRENT_REVISION (but after committing, the
2206
        attribution will be correct).
2207
        """
2208
        maybe_file_parent_keys = []
2209
        for parent_id in self.get_parent_ids():
2210
            try:
2211
                parent_tree = self.revision_tree(parent_id)
2212
            except errors.NoSuchRevisionInTree:
2213
                parent_tree = self.branch.repository.revision_tree(parent_id)
2214
            parent_tree.lock_read()
2215
            try:
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
2216
                if not parent_tree.has_id(file_id):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2217
                    continue
2218
                ie = parent_tree.inventory[file_id]
2219
                if ie.kind != 'file':
2220
                    # Note: this is slightly unnecessary, because symlinks and
2221
                    # directories have a "text" which is the empty text, and we
2222
                    # know that won't mess up annotations. But it seems cleaner
2223
                    continue
2224
                parent_text_key = (file_id, ie.revision)
2225
                if parent_text_key not in maybe_file_parent_keys:
2226
                    maybe_file_parent_keys.append(parent_text_key)
2227
            finally:
2228
                parent_tree.unlock()
2229
        graph = _mod_graph.Graph(self.branch.repository.texts)
2230
        heads = graph.heads(maybe_file_parent_keys)
2231
        file_parent_keys = []
2232
        for key in maybe_file_parent_keys:
2233
            if key in heads:
2234
                file_parent_keys.append(key)
2235
2236
        # Now we have the parents of this content
2237
        annotator = self.branch.repository.texts.get_annotator()
2238
        text = self.get_file_text(file_id)
2239
        this_key =(file_id, default_revision)
2240
        annotator.add_special_text(this_key, file_parent_keys, text)
2241
        annotations = [(key[-1], line)
2242
                       for key, line in annotator.annotate_flat(this_key)]
2243
        return annotations
2244
2245
    @needs_read_lock
2246
    def merge_modified(self):
2247
        """Return a dictionary of files modified by a merge.
2248
2249
        The list is initialized by WorkingTree.set_merge_modified, which is
2250
        typically called after we make some automatic updates to the tree
2251
        because of a merge.
2252
2253
        This returns a map of file_id->sha1, containing only files which are
2254
        still in the working inventory and have that text hash.
2255
        """
2256
        try:
2257
            hashfile = self._transport.get('merge-hashes')
2258
        except errors.NoSuchFile:
2259
            return {}
2260
        try:
2261
            merge_hashes = {}
2262
            try:
2263
                if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2264
                    raise errors.MergeModifiedFormatError()
2265
            except StopIteration:
2266
                raise errors.MergeModifiedFormatError()
2267
            for s in _mod_rio.RioReader(hashfile):
2268
                # RioReader reads in Unicode, so convert file_ids back to utf8
2269
                file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
2270
                if not self.inventory.has_id(file_id):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2271
                    continue
2272
                text_hash = s.get("hash")
2273
                if text_hash == self.get_file_sha1(file_id):
2274
                    merge_hashes[file_id] = text_hash
2275
            return merge_hashes
2276
        finally:
2277
            hashfile.close()
2278
2279
    @needs_write_lock
2280
    def subsume(self, other_tree):
2281
        def add_children(inventory, entry):
2282
            for child_entry in entry.children.values():
2283
                inventory._byid[child_entry.file_id] = child_entry
2284
                if child_entry.kind == 'directory':
2285
                    add_children(inventory, child_entry)
2286
        if other_tree.get_root_id() == self.get_root_id():
2287
            raise errors.BadSubsumeSource(self, other_tree,
2288
                                          'Trees have the same root')
2289
        try:
2290
            other_tree_path = self.relpath(other_tree.basedir)
2291
        except errors.PathNotChild:
2292
            raise errors.BadSubsumeSource(self, other_tree,
2293
                'Tree is not contained by the other')
2294
        new_root_parent = self.path2id(osutils.dirname(other_tree_path))
2295
        if new_root_parent is None:
2296
            raise errors.BadSubsumeSource(self, other_tree,
2297
                'Parent directory is not versioned.')
2298
        # We need to ensure that the result of a fetch will have a
2299
        # versionedfile for the other_tree root, and only fetching into
2300
        # RepositoryKnit2 guarantees that.
2301
        if not self.branch.repository.supports_rich_root():
2302
            raise errors.SubsumeTargetNeedsUpgrade(other_tree)
2303
        other_tree.lock_tree_write()
2304
        try:
2305
            new_parents = other_tree.get_parent_ids()
2306
            other_root = other_tree.inventory.root
2307
            other_root.parent_id = new_root_parent
2308
            other_root.name = osutils.basename(other_tree_path)
2309
            self.inventory.add(other_root)
2310
            add_children(self.inventory, other_root)
2311
            self._write_inventory(self.inventory)
2312
            # normally we don't want to fetch whole repositories, but i think
2313
            # here we really do want to consolidate the whole thing.
2314
            for parent_id in other_tree.get_parent_ids():
2315
                self.branch.fetch(other_tree.branch, parent_id)
2316
                self.add_parent_tree_id(parent_id)
2317
        finally:
2318
            other_tree.unlock()
2319
        other_tree.bzrdir.retire_bzrdir()
2320
2321
    @needs_tree_write_lock
2322
    def extract(self, file_id, format=None):
2323
        """Extract a subtree from this tree.
2324
2325
        A new branch will be created, relative to the path for this tree.
2326
        """
2327
        self.flush()
2328
        def mkdirs(path):
2329
            segments = osutils.splitpath(path)
2330
            transport = self.branch.bzrdir.root_transport
2331
            for name in segments:
2332
                transport = transport.clone(name)
2333
                transport.ensure_base()
2334
            return transport
2335
2336
        sub_path = self.id2path(file_id)
2337
        branch_transport = mkdirs(sub_path)
2338
        if format is None:
2339
            format = self.bzrdir.cloning_metadir()
2340
        branch_transport.ensure_base()
2341
        branch_bzrdir = format.initialize_on_transport(branch_transport)
2342
        try:
2343
            repo = branch_bzrdir.find_repository()
2344
        except errors.NoRepositoryPresent:
2345
            repo = branch_bzrdir.create_repository()
2346
        if not repo.supports_rich_root():
2347
            raise errors.RootNotRich()
2348
        new_branch = branch_bzrdir.create_branch()
2349
        new_branch.pull(self.branch)
2350
        for parent_id in self.get_parent_ids():
2351
            new_branch.fetch(self.branch, parent_id)
2352
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
2353
        if tree_transport.base != branch_transport.base:
2354
            tree_bzrdir = format.initialize_on_transport(tree_transport)
2355
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
2356
                target_branch=new_branch)
2357
        else:
2358
            tree_bzrdir = branch_bzrdir
2359
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2360
        wt.set_parent_ids(self.get_parent_ids())
2361
        my_inv = self.inventory
2362
        child_inv = inventory.Inventory(root_id=None)
2363
        new_root = my_inv[file_id]
2364
        my_inv.remove_recursive_id(file_id)
2365
        new_root.parent_id = None
2366
        child_inv.add(new_root)
2367
        self._write_inventory(my_inv)
2368
        wt._write_inventory(child_inv)
2369
        return wt
2370
2371
    def list_files(self, include_root=False, from_dir=None, recursive=True):
2372
        """List all files as (path, class, kind, id, entry).
2373
2374
        Lists, but does not descend into unversioned directories.
2375
        This does not include files that have been deleted in this
2376
        tree. Skips the control directory.
2377
2378
        :param include_root: if True, return an entry for the root
2379
        :param from_dir: start from this directory or None for the root
2380
        :param recursive: whether to recurse into subdirectories or not
2381
        """
2382
        # list_files is an iterator, so @needs_read_lock doesn't work properly
2383
        # with it. So callers should be careful to always read_lock the tree.
2384
        if not self.is_locked():
2385
            raise errors.ObjectNotLocked(self)
2386
2387
        inv = self.inventory
2388
        if from_dir is None and include_root is True:
2389
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
2390
        # Convert these into local objects to save lookup times
2391
        pathjoin = osutils.pathjoin
2392
        file_kind = self._kind
2393
2394
        # transport.base ends in a slash, we want the piece
2395
        # between the last two slashes
2396
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
2397
2398
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
2399
2400
        # directory file_id, relative path, absolute path, reverse sorted children
2401
        if from_dir is not None:
2402
            from_dir_id = inv.path2id(from_dir)
2403
            if from_dir_id is None:
2404
                # Directory not versioned
2405
                return
2406
            from_dir_abspath = pathjoin(self.basedir, from_dir)
2407
        else:
2408
            from_dir_id = inv.root.file_id
2409
            from_dir_abspath = self.basedir
2410
        children = os.listdir(from_dir_abspath)
2411
        children.sort()
2412
        # jam 20060527 The kernel sized tree seems equivalent whether we
2413
        # use a deque and popleft to keep them sorted, or if we use a plain
2414
        # list and just reverse() them.
2415
        children = collections.deque(children)
2416
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
2417
        while stack:
2418
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
2419
2420
            while children:
2421
                f = children.popleft()
2422
                ## TODO: If we find a subdirectory with its own .bzr
2423
                ## directory, then that is a separate tree and we
2424
                ## should exclude it.
2425
2426
                # the bzrdir for this tree
2427
                if transport_base_dir == f:
2428
                    continue
2429
2430
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
2431
                # and 'f' doesn't begin with one, we can do a string op, rather
2432
                # than the checks of pathjoin(), all relative paths will have an extra slash
2433
                # at the beginning
2434
                fp = from_dir_relpath + '/' + f
2435
2436
                # absolute path
2437
                fap = from_dir_abspath + '/' + f
2438
2439
                dir_ie = inv[from_dir_id]
2440
                if dir_ie.kind == 'directory':
2441
                    f_ie = dir_ie.children.get(f)
2442
                else:
2443
                    f_ie = None
2444
                if f_ie:
2445
                    c = 'V'
2446
                elif self.is_ignored(fp[1:]):
2447
                    c = 'I'
2448
                else:
2449
                    # we may not have found this file, because of a unicode
2450
                    # issue, or because the directory was actually a symlink.
2451
                    f_norm, can_access = osutils.normalized_filename(f)
2452
                    if f == f_norm or not can_access:
2453
                        # No change, so treat this file normally
2454
                        c = '?'
2455
                    else:
2456
                        # this file can be accessed by a normalized path
2457
                        # check again if it is versioned
2458
                        # these lines are repeated here for performance
2459
                        f = f_norm
2460
                        fp = from_dir_relpath + '/' + f
2461
                        fap = from_dir_abspath + '/' + f
2462
                        f_ie = inv.get_child(from_dir_id, f)
2463
                        if f_ie:
2464
                            c = 'V'
2465
                        elif self.is_ignored(fp[1:]):
2466
                            c = 'I'
2467
                        else:
2468
                            c = '?'
2469
2470
                fk = file_kind(fap)
2471
2472
                # make a last minute entry
2473
                if f_ie:
2474
                    yield fp[1:], c, fk, f_ie.file_id, f_ie
2475
                else:
2476
                    try:
2477
                        yield fp[1:], c, fk, None, fk_entries[fk]()
2478
                    except KeyError:
2479
                        yield fp[1:], c, fk, None, TreeEntry()
2480
                    continue
2481
2482
                if fk != 'directory':
2483
                    continue
2484
2485
                # But do this child first if recursing down
2486
                if recursive:
2487
                    new_children = os.listdir(fap)
2488
                    new_children.sort()
2489
                    new_children = collections.deque(new_children)
2490
                    stack.append((f_ie.file_id, fp, fap, new_children))
2491
                    # Break out of inner loop,
2492
                    # so that we start outer loop with child
2493
                    break
2494
            else:
2495
                # if we finished all children, pop it off the stack
2496
                stack.pop()
2497
2498
    @needs_tree_write_lock
2499
    def move(self, from_paths, to_dir=None, after=False):
2500
        """Rename files.
2501
2502
        to_dir must exist in the inventory.
2503
2504
        If to_dir exists and is a directory, the files are moved into
2505
        it, keeping their old names.
2506
2507
        Note that to_dir is only the last component of the new name;
2508
        this doesn't change the directory.
2509
2510
        For each entry in from_paths the move mode will be determined
2511
        independently.
2512
2513
        The first mode moves the file in the filesystem and updates the
2514
        inventory. The second mode only updates the inventory without
2515
        touching the file on the filesystem.
2516
5911.1.4 by Benoît Pierre
Update docstrings for WorkingTree.move() and WorkingTree.rename_one().
2517
        move uses the second mode if 'after == True' and the target is
2518
        either not versioned or newly added, and present in the working tree.
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2519
2520
        move uses the second mode if 'after == False' and the source is
2521
        versioned but no longer in the working tree, and the target is not
2522
        versioned but present in the working tree.
2523
2524
        move uses the first mode if 'after == False' and the source is
2525
        versioned and present in the working tree, and the target is not
2526
        versioned and not present in the working tree.
2527
2528
        Everything else results in an error.
2529
2530
        This returns a list of (from_path, to_path) pairs for each
2531
        entry that is moved.
2532
        """
2533
        rename_entries = []
2534
        rename_tuples = []
2535
2536
        # check for deprecated use of signature
2537
        if to_dir is None:
2538
            raise TypeError('You must supply a target directory')
2539
        # check destination directory
2540
        if isinstance(from_paths, basestring):
2541
            raise ValueError()
2542
        inv = self.inventory
2543
        to_abs = self.abspath(to_dir)
2544
        if not isdir(to_abs):
2545
            raise errors.BzrMoveFailedError('',to_dir,
2546
                errors.NotADirectory(to_abs))
2547
        if not self.has_filename(to_dir):
2548
            raise errors.BzrMoveFailedError('',to_dir,
2549
                errors.NotInWorkingDirectory(to_dir))
2550
        to_dir_id = inv.path2id(to_dir)
2551
        if to_dir_id is None:
2552
            raise errors.BzrMoveFailedError('',to_dir,
2553
                errors.NotVersionedError(path=to_dir))
2554
2555
        to_dir_ie = inv[to_dir_id]
2556
        if to_dir_ie.kind != 'directory':
2557
            raise errors.BzrMoveFailedError('',to_dir,
2558
                errors.NotADirectory(to_abs))
2559
2560
        # create rename entries and tuples
2561
        for from_rel in from_paths:
2562
            from_tail = splitpath(from_rel)[-1]
2563
            from_id = inv.path2id(from_rel)
2564
            if from_id is None:
2565
                raise errors.BzrMoveFailedError(from_rel,to_dir,
2566
                    errors.NotVersionedError(path=from_rel))
2567
2568
            from_entry = inv[from_id]
2569
            from_parent_id = from_entry.parent_id
2570
            to_rel = pathjoin(to_dir, from_tail)
2571
            rename_entry = InventoryWorkingTree._RenameEntry(
2572
                from_rel=from_rel,
2573
                from_id=from_id,
2574
                from_tail=from_tail,
2575
                from_parent_id=from_parent_id,
2576
                to_rel=to_rel, to_tail=from_tail,
2577
                to_parent_id=to_dir_id)
2578
            rename_entries.append(rename_entry)
2579
            rename_tuples.append((from_rel, to_rel))
2580
2581
        # determine which move mode to use. checks also for movability
2582
        rename_entries = self._determine_mv_mode(rename_entries, after)
2583
2584
        original_modified = self._inventory_is_modified
2585
        try:
2586
            if len(from_paths):
2587
                self._inventory_is_modified = True
2588
            self._move(rename_entries)
2589
        except:
2590
            # restore the inventory on error
2591
            self._inventory_is_modified = original_modified
2592
            raise
2593
        self._write_inventory(inv)
2594
        return rename_tuples
2595
2596
    @needs_tree_write_lock
2597
    def rename_one(self, from_rel, to_rel, after=False):
2598
        """Rename one file.
2599
2600
        This can change the directory or the filename or both.
2601
2602
        rename_one has several 'modes' to work. First, it can rename a physical
2603
        file and change the file_id. That is the normal mode. Second, it can
2604
        only change the file_id without touching any physical file.
2605
2606
        rename_one uses the second mode if 'after == True' and 'to_rel' is not
2607
        versioned but present in the working tree.
2608
2609
        rename_one uses the second mode if 'after == False' and 'from_rel' is
2610
        versioned but no longer in the working tree, and 'to_rel' is not
2611
        versioned but present in the working tree.
2612
2613
        rename_one uses the first mode if 'after == False' and 'from_rel' is
2614
        versioned and present in the working tree, and 'to_rel' is not
2615
        versioned and not present in the working tree.
2616
2617
        Everything else results in an error.
2618
        """
2619
        inv = self.inventory
2620
        rename_entries = []
2621
2622
        # create rename entries and tuples
2623
        from_tail = splitpath(from_rel)[-1]
2624
        from_id = inv.path2id(from_rel)
2625
        if from_id is None:
2626
            # if file is missing in the inventory maybe it's in the basis_tree
2627
            basis_tree = self.branch.basis_tree()
2628
            from_id = basis_tree.path2id(from_rel)
2629
            if from_id is None:
2630
                raise errors.BzrRenameFailedError(from_rel,to_rel,
2631
                    errors.NotVersionedError(path=from_rel))
2632
            # put entry back in the inventory so we can rename it
2633
            from_entry = basis_tree.inventory[from_id].copy()
2634
            inv.add(from_entry)
2635
        else:
2636
            from_entry = inv[from_id]
2637
        from_parent_id = from_entry.parent_id
2638
        to_dir, to_tail = os.path.split(to_rel)
2639
        to_dir_id = inv.path2id(to_dir)
2640
        rename_entry = InventoryWorkingTree._RenameEntry(from_rel=from_rel,
2641
                                     from_id=from_id,
2642
                                     from_tail=from_tail,
2643
                                     from_parent_id=from_parent_id,
2644
                                     to_rel=to_rel, to_tail=to_tail,
2645
                                     to_parent_id=to_dir_id)
2646
        rename_entries.append(rename_entry)
2647
2648
        # determine which move mode to use. checks also for movability
2649
        rename_entries = self._determine_mv_mode(rename_entries, after)
2650
2651
        # check if the target changed directory and if the target directory is
2652
        # versioned
2653
        if to_dir_id is None:
2654
            raise errors.BzrMoveFailedError(from_rel,to_rel,
2655
                errors.NotVersionedError(path=to_dir))
2656
2657
        # all checks done. now we can continue with our actual work
2658
        mutter('rename_one:\n'
2659
               '  from_id   {%s}\n'
2660
               '  from_rel: %r\n'
2661
               '  to_rel:   %r\n'
2662
               '  to_dir    %r\n'
2663
               '  to_dir_id {%s}\n',
2664
               from_id, from_rel, to_rel, to_dir, to_dir_id)
2665
2666
        self._move(rename_entries)
2667
        self._write_inventory(inv)
2668
2669
    class _RenameEntry(object):
2670
        def __init__(self, from_rel, from_id, from_tail, from_parent_id,
5911.1.2 by Benoît Pierre
Implement new 'mv --after' behaviour.
2671
                     to_rel, to_tail, to_parent_id, only_change_inv=False,
2672
                     change_id=False):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2673
            self.from_rel = from_rel
2674
            self.from_id = from_id
2675
            self.from_tail = from_tail
2676
            self.from_parent_id = from_parent_id
2677
            self.to_rel = to_rel
2678
            self.to_tail = to_tail
2679
            self.to_parent_id = to_parent_id
5911.1.2 by Benoît Pierre
Implement new 'mv --after' behaviour.
2680
            self.change_id = change_id
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2681
            self.only_change_inv = only_change_inv
2682
2683
    def _determine_mv_mode(self, rename_entries, after=False):
2684
        """Determines for each from-to pair if both inventory and working tree
2685
        or only the inventory has to be changed.
2686
2687
        Also does basic plausability tests.
2688
        """
2689
        inv = self.inventory
2690
2691
        for rename_entry in rename_entries:
2692
            # store to local variables for easier reference
2693
            from_rel = rename_entry.from_rel
2694
            from_id = rename_entry.from_id
2695
            to_rel = rename_entry.to_rel
2696
            to_id = inv.path2id(to_rel)
2697
            only_change_inv = False
5911.1.2 by Benoît Pierre
Implement new 'mv --after' behaviour.
2698
            change_id = False
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2699
2700
            # check the inventory for source and destination
2701
            if from_id is None:
2702
                raise errors.BzrMoveFailedError(from_rel,to_rel,
2703
                    errors.NotVersionedError(path=from_rel))
2704
            if to_id is not None:
5911.1.2 by Benoît Pierre
Implement new 'mv --after' behaviour.
2705
                allowed = False
5911.1.3 by Benoît Pierre
Unlock on errors as per Vincent Ladeuil recommendation.
2706
                # allow it with --after but only if dest is newly added
5911.1.2 by Benoît Pierre
Implement new 'mv --after' behaviour.
2707
                if after:
2708
                    basis = self.basis_tree()
2709
                    basis.lock_read()
5911.1.3 by Benoît Pierre
Unlock on errors as per Vincent Ladeuil recommendation.
2710
                    try:
2711
                        if not basis.has_id(to_id):
2712
                            rename_entry.change_id = True
2713
                            allowed = True
2714
                    finally:
2715
                        basis.unlock()
5911.1.2 by Benoît Pierre
Implement new 'mv --after' behaviour.
2716
                if not allowed:
2717
                    raise errors.BzrMoveFailedError(from_rel,to_rel,
2718
                        errors.AlreadyVersionedError(path=to_rel))
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2719
2720
            # try to determine the mode for rename (only change inv or change
2721
            # inv and file system)
2722
            if after:
2723
                if not self.has_filename(to_rel):
2724
                    raise errors.BzrMoveFailedError(from_id,to_rel,
2725
                        errors.NoSuchFile(path=to_rel,
2726
                        extra="New file has not been created yet"))
2727
                only_change_inv = True
2728
            elif not self.has_filename(from_rel) and self.has_filename(to_rel):
2729
                only_change_inv = True
2730
            elif self.has_filename(from_rel) and not self.has_filename(to_rel):
2731
                only_change_inv = False
2732
            elif (not self.case_sensitive
2733
                  and from_rel.lower() == to_rel.lower()
2734
                  and self.has_filename(from_rel)):
2735
                only_change_inv = False
2736
            else:
2737
                # something is wrong, so lets determine what exactly
2738
                if not self.has_filename(from_rel) and \
2739
                   not self.has_filename(to_rel):
2740
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
2741
                        errors.PathsDoNotExist(paths=(str(from_rel),
2742
                        str(to_rel))))
2743
                else:
2744
                    raise errors.RenameFailedFilesExist(from_rel, to_rel)
2745
            rename_entry.only_change_inv = only_change_inv
2746
        return rename_entries
2747
2748
    def _move(self, rename_entries):
2749
        """Moves a list of files.
2750
2751
        Depending on the value of the flag 'only_change_inv', the
2752
        file will be moved on the file system or not.
2753
        """
2754
        inv = self.inventory
2755
        moved = []
2756
2757
        for entry in rename_entries:
2758
            try:
2759
                self._move_entry(entry)
2760
            except:
2761
                self._rollback_move(moved)
2762
                raise
2763
            moved.append(entry)
2764
2765
    def _rollback_move(self, moved):
2766
        """Try to rollback a previous move in case of an filesystem error."""
2767
        inv = self.inventory
2768
        for entry in moved:
2769
            try:
2770
                self._move_entry(WorkingTree._RenameEntry(
2771
                    entry.to_rel, entry.from_id,
2772
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
2773
                    entry.from_tail, entry.from_parent_id,
2774
                    entry.only_change_inv))
2775
            except errors.BzrMoveFailedError, e:
2776
                raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2777
                        " The working tree is in an inconsistent state."
2778
                        " Please consider doing a 'bzr revert'."
2779
                        " Error message is: %s" % e)
2780
2781
    def _move_entry(self, entry):
2782
        inv = self.inventory
2783
        from_rel_abs = self.abspath(entry.from_rel)
2784
        to_rel_abs = self.abspath(entry.to_rel)
2785
        if from_rel_abs == to_rel_abs:
2786
            raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2787
                "Source and target are identical.")
2788
2789
        if not entry.only_change_inv:
2790
            try:
2791
                osutils.rename(from_rel_abs, to_rel_abs)
2792
            except OSError, e:
2793
                raise errors.BzrMoveFailedError(entry.from_rel,
2794
                    entry.to_rel, e[1])
5911.1.2 by Benoît Pierre
Implement new 'mv --after' behaviour.
2795
        if entry.change_id:
2796
            to_id = inv.path2id(entry.to_rel)
2797
            inv.remove_recursive_id(to_id)
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2798
        inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
2799
2800
    @needs_tree_write_lock
2801
    def unversion(self, file_ids):
2802
        """Remove the file ids in file_ids from the current versioned set.
2803
2804
        When a file_id is unversioned, all of its children are automatically
2805
        unversioned.
2806
2807
        :param file_ids: The file ids to stop versioning.
2808
        :raises: NoSuchId if any fileid is not currently versioned.
2809
        """
2810
        for file_id in file_ids:
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
2811
            if not self._inventory.has_id(file_id):
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2812
                raise errors.NoSuchId(self, file_id)
2813
        for file_id in file_ids:
2814
            if self._inventory.has_id(file_id):
2815
                self._inventory.remove_recursive_id(file_id)
2816
        if len(file_ids):
2817
            # in the future this should just set a dirty bit to wait for the
2818
            # final unlock. However, until all methods of workingtree start
2819
            # with the current in -memory inventory rather than triggering
2820
            # a read, it is more complex - we need to teach read_inventory
2821
            # to know when to read, and when to not read first... and possibly
2822
            # to save first when the in memory one may be corrupted.
2823
            # so for now, we just only write it if it is indeed dirty.
2824
            # - RBC 20060907
2825
            self._write_inventory(self._inventory)
2826
2827
    def stored_kind(self, file_id):
2828
        """See Tree.stored_kind"""
2829
        return self.inventory[file_id].kind
2830
2831
    def extras(self):
2832
        """Yield all unversioned files in this WorkingTree.
2833
2834
        If there are any unversioned directories then only the directory is
2835
        returned, not all its children.  But if there are unversioned files
2836
        under a versioned subdirectory, they are returned.
2837
2838
        Currently returned depth-first, sorted by name within directories.
2839
        This is the same order used by 'osutils.walkdirs'.
2840
        """
2841
        ## TODO: Work from given directory downwards
2842
        for path, dir_entry in self.inventory.directories():
2843
            # mutter("search for unknowns in %r", path)
2844
            dirabs = self.abspath(path)
2845
            if not isdir(dirabs):
2846
                # e.g. directory deleted
2847
                continue
2848
2849
            fl = []
2850
            for subf in os.listdir(dirabs):
2851
                if self.bzrdir.is_control_filename(subf):
2852
                    continue
2853
                if subf not in dir_entry.children:
2854
                    try:
2855
                        (subf_norm,
2856
                         can_access) = osutils.normalized_filename(subf)
2857
                    except UnicodeDecodeError:
2858
                        path_os_enc = path.encode(osutils._fs_enc)
2859
                        relpath = path_os_enc + '/' + subf
2860
                        raise errors.BadFilenameEncoding(relpath,
2861
                                                         osutils._fs_enc)
2862
                    if subf_norm != subf and can_access:
2863
                        if subf_norm not in dir_entry.children:
2864
                            fl.append(subf_norm)
2865
                    else:
2866
                        fl.append(subf)
2867
2868
            fl.sort()
2869
            for subf in fl:
2870
                subp = pathjoin(path, subf)
2871
                yield subp
2872
2873
    def _walkdirs(self, prefix=""):
2874
        """Walk the directories of this tree.
2875
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
2876
        :param prefix: is used as the directrory to start with.
2877
        :returns: a generator which yields items in the form::
2878
2879
            ((curren_directory_path, fileid),
2880
             [(file1_path, file1_name, file1_kind, None, file1_id,
2881
               file1_kind), ... ])
5777.5.2 by Jelmer Vernooij
Split inventory-specific methods and WorkingTree interface method
2882
        """
2883
        _directory = 'directory'
2884
        # get the root in the inventory
2885
        inv = self.inventory
2886
        top_id = inv.path2id(prefix)
2887
        if top_id is None:
2888
            pending = []
2889
        else:
2890
            pending = [(prefix, '', _directory, None, top_id, None)]
2891
        while pending:
2892
            dirblock = []
2893
            currentdir = pending.pop()
2894
            # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2895
            top_id = currentdir[4]
2896
            if currentdir[0]:
2897
                relroot = currentdir[0] + '/'
2898
            else:
2899
                relroot = ""
2900
            # FIXME: stash the node in pending
2901
            entry = inv[top_id]
2902
            if entry.kind == 'directory':
2903
                for name, child in entry.sorted_children():
2904
                    dirblock.append((relroot + name, name, child.kind, None,
2905
                        child.file_id, child.kind
2906
                        ))
2907
            yield (currentdir[0], entry.file_id), dirblock
2908
            # push the user specified dirs from dirblock
2909
            for dir in reversed(dirblock):
2910
                if dir[2] == _directory:
2911
                    pending.append(dir)
2912
2913
5669.3.9 by Jelmer Vernooij
Consistent naming.
2914
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2915
    """Registry for working tree formats."""
2916
2917
    def __init__(self, other_registry=None):
2918
        super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2919
        self._default_format = None
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2920
        self._default_format_key = None
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2921
2922
    def get_default(self):
2923
        """Return the current default format."""
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2924
        if (self._default_format_key is not None and
2925
            self._default_format is None):
2926
            self._default_format = self.get(self._default_format_key)
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2927
        return self._default_format
2928
2929
    def set_default(self, format):
5816.2.3 by Jelmer Vernooij
Add docstrings.
2930
        """Set the default format."""
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2931
        self._default_format = format
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2932
        self._default_format_key = None
2933
2934
    def set_default_key(self, format_string):
5816.2.3 by Jelmer Vernooij
Add docstrings.
2935
        """Set the default format by its format string."""
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2936
        self._default_format_key = format_string
2937
        self._default_format = None
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2938
2939
2940
format_registry = WorkingTreeFormatRegistry()
2941
2942
5669.3.10 by Jelmer Vernooij
Use ControlComponentFormat.
2943
class WorkingTreeFormat(controldir.ControlComponentFormat):
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2944
    """An encapsulation of the initialization and open routines for a format.
2945
2946
    Formats provide three things:
2947
     * An initialization routine,
2948
     * a format string,
2949
     * an open routine.
2950
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2951
    Formats are placed in an dict by their format string for reference
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2952
    during workingtree opening. Its not required that these be instances, they
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2953
    can be classes themselves with class methods - it simply depends on
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2954
    whether state is needed for a given format or not.
2955
2956
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2957
    methods on the format class. Do not deprecate the object, as the
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2958
    object will be created every time regardless.
2959
    """
2960
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
2961
    requires_rich_root = False
2962
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2963
    upgrade_recommended = False
2964
5582.10.29 by Jelmer Vernooij
Add requires_normalized_unicode_filenames
2965
    requires_normalized_unicode_filenames = False
2966
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
2967
    case_sensitive_filename = "FoRMaT"
2968
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
2969
    missing_parent_conflicts = False
2970
    """If this format supports missing parent conflicts."""
2971
5993.3.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_versioned_directories attribute.
2972
    supports_versioned_directories = None
2973
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2974
    @classmethod
5816.3.3 by Jelmer Vernooij
Add tariff test to make sure working tree isn't opened by 'bzr serve'
2975
    def find_format_string(klass, a_bzrdir):
2976
        """Return format name for the working tree object in a_bzrdir."""
2977
        try:
2978
            transport = a_bzrdir.get_workingtree_transport(None)
2979
            return transport.get_bytes("format")
2980
        except errors.NoSuchFile:
2981
            raise errors.NoWorkingTree(base=transport.base)
2982
2983
    @classmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2984
    def find_format(klass, a_bzrdir):
2985
        """Return the format for the working tree object in a_bzrdir."""
2986
        try:
5816.3.3 by Jelmer Vernooij
Add tariff test to make sure working tree isn't opened by 'bzr serve'
2987
            format_string = klass.find_format_string(a_bzrdir)
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2988
            return format_registry.get(format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2989
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
2990
            raise errors.UnknownFormatError(format=format_string,
2991
                                            kind="working tree")
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2992
5683.1.1 by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize().
2993
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2994
                   accelerator_tree=None, hardlink=False):
2995
        """Initialize a new working tree in a_bzrdir.
2996
2997
        :param a_bzrdir: BzrDir to initialize the working tree in.
2998
        :param revision_id: allows creating a working tree at a different
2999
            revision than the branch is at.
3000
        :param from_branch: Branch to checkout
3001
        :param accelerator_tree: A tree which can be used for retrieving file
3002
            contents more quickly than the revision tree, i.e. a workingtree.
3003
            The revision tree will be used for cases where accelerator_tree's
3004
            content is different.
3005
        :param hardlink: If true, hard-link files from accelerator_tree,
3006
            where possible.
3007
        """
3008
        raise NotImplementedError(self.initialize)
3009
2100.3.35 by Aaron Bentley
equality operations on bzrdir
3010
    def __eq__(self, other):
3011
        return self.__class__ is other.__class__
3012
3013
    def __ne__(self, other):
3014
        return not (self == other)
3015
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3016
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3017
    @symbol_versioning.deprecated_method(
3018
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3019
    def get_default_format(klass):
3020
        """Return the current default format."""
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3021
        return format_registry.get_default()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3022
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3023
    def get_format_string(self):
3024
        """Return the ASCII format string that identifies this format."""
3025
        raise NotImplementedError(self.get_format_string)
3026
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
3027
    def get_format_description(self):
3028
        """Return the short description for this format."""
3029
        raise NotImplementedError(self.get_format_description)
3030
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3031
    def is_supported(self):
3032
        """Is this format supported?
3033
3034
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3035
        Unsupported formats may not support initialization or committing or
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3036
        some other features depending on the reason for not being supported.
3037
        """
3038
        return True
3039
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
3040
    def supports_content_filtering(self):
3041
        """True if this format supports content filtering."""
3042
        return False
3043
3586.1.4 by Ian Clatworthy
first cut at tree-level view tests
3044
    def supports_views(self):
3045
        """True if this format supports stored views."""
3046
        return False
3047
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3048
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3049
    @symbol_versioning.deprecated_method(
3050
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3051
    def register_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3052
        format_registry.register(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3053
3054
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3055
    @symbol_versioning.deprecated_method(
3056
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3057
    def register_extra_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3058
        format_registry.register_extra(format)
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3059
3060
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3061
    @symbol_versioning.deprecated_method(
3062
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3063
    def unregister_extra_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3064
        format_registry.unregister_extra(format)
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3065
3066
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3067
    @symbol_versioning.deprecated_method(
3068
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3069
    def get_formats(klass):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3070
        return format_registry._get_all()
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3071
3072
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3073
    @symbol_versioning.deprecated_method(
3074
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3075
    def set_default_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3076
        format_registry.set_default(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3077
3078
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3079
    @symbol_versioning.deprecated_method(
3080
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3081
    def unregister_format(klass, format):
5662.3.3 by Jelmer Vernooij
add tests
3082
        format_registry.remove(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3083
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3084
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3085
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3086
    "bzrlib.workingtree_4", "WorkingTreeFormat4")
3087
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3088
    "bzrlib.workingtree_4", "WorkingTreeFormat5")
3089
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3090
    "bzrlib.workingtree_4", "WorkingTreeFormat6")
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
3091
format_registry.register_lazy("Bazaar-NG Working Tree format 3",
3092
    "bzrlib.workingtree_3", "WorkingTreeFormat3")
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
3093
format_registry.set_default_key("Bazaar Working Tree Format 6 (bzr 1.14)\n")