/brz/remove-bazaar

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