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