~bzr-pqm/bzr/bzr.dev

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