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