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