~bzr-pqm/bzr/bzr.dev

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