/brz/remove-bazaar

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