~bzr-pqm/bzr/bzr.dev

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