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