~bzr-pqm/bzr/bzr.dev

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