/brz/remove-bazaar

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