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