/brz/remove-bazaar

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