/brz/remove-bazaar

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