~bzr-pqm/bzr/bzr.dev

1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1
# Copyright (C) 2005, 2006 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(), """
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
44
import collections
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
45
from copy import deepcopy
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
46
import errno
1398 by Robert Collins
integrate in Gustavos x-bit patch
47
import stat
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
48
from time import time
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
49
import warnings
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
50
1836.1.21 by John Arbash Meinel
Restore the ability to ignore items by modifying DEFAULT_IGNORE
51
import bzrlib
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
52
from bzrlib import (
53
    bzrdir,
54
    conflicts as _mod_conflicts,
55
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
56
    generate_ids,
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
57
    globbing,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
58
    ignores,
59
    merge,
60
    osutils,
61
    textui,
62
    transform,
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
63
    urlutils,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
64
    xml5,
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
65
    xml6,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
66
    )
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
67
import bzrlib.branch
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
68
from bzrlib.transport import get_transport
69
import bzrlib.ui
70
""")
71
1986.5.6 by Robert Collins
Merge bzr.dev.
72
from bzrlib import symbol_versioning
1534.4.28 by Robert Collins
first cut at merge from integration.
73
from bzrlib.decorators import needs_read_lock, needs_write_lock
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
74
from bzrlib.errors import (BzrCheckError,
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
75
                           BzrError,
1534.10.7 by Aaron Bentley
Added tests for bad conflict lists
76
                           ConflictFormatError,
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
77
                           WeaveRevisionNotPresent,
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
78
                           NotBranchError,
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
79
                           NoSuchFile,
1558.3.3 by Aaron Bentley
Fix error handling for merge_modified
80
                           NotVersionedError,
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
81
                           MergeModifiedFormatError,
82
                           UnsupportedOperation,
83
                           )
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
84
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
85
from bzrlib.lockable_files import LockableFiles, TransportLock
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
86
from bzrlib.lockdir import LockDir
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
87
import bzrlib.mutabletree
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
88
from bzrlib.mutabletree import needs_tree_write_lock
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
89
from bzrlib.osutils import (
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
90
    compact_date,
91
    file_kind,
92
    isdir,
93
    pathjoin,
94
    safe_unicode,
95
    splitpath,
96
    rand_chars,
97
    normpath,
98
    realpath,
99
    supports_executable,
100
    )
101
from bzrlib.trace import mutter, note
102
from bzrlib.transport.local import LocalTransport
103
import bzrlib.tree
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
104
from bzrlib.progress import DummyProgress, ProgressPhase
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
105
from bzrlib.revision import NULL_REVISION
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
106
import bzrlib.revisiontree
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
107
from bzrlib.rio import RioReader, rio_file, Stanza
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
108
from bzrlib.symbol_versioning import (deprecated_passed,
109
        deprecated_method,
110
        deprecated_function,
111
        DEPRECATED_PARAMETER,
112
        zero_eight,
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
113
        zero_eleven,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
114
        zero_thirteen,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
115
        )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
116
117
118
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
119
CONFLICT_HEADER_1 = "BZR conflict list format 1"
1685.1.30 by John Arbash Meinel
PEP8 for workingtree.py
120
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
121
122
@deprecated_function(zero_thirteen)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
123
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'.
124
    """Return new file id for the basename 'name'.
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
125
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
126
    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.
127
    """
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
128
    return generate_ids.gen_file_id(name)
129
130
131
@deprecated_function(zero_thirteen)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
132
def gen_root_id():
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
133
    """Return a new tree-root file id.
134
135
    This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
136
    """
137
    return generate_ids.gen_root_id()
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
138
139
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
140
class TreeEntry(object):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
141
    """An entry that implements the minimum interface used by commands.
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
142
143
    This needs further inspection, it may be better to have 
144
    InventoryEntries without ids - though that seems wrong. For now,
145
    this is a parallel hierarchy to InventoryEntry, and needs to become
146
    one of several things: decorates to that hierarchy, children of, or
147
    parents of it.
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
148
    Another note is that these objects are currently only used when there is
149
    no InventoryEntry available - i.e. for unversioned objects.
150
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
151
    """
152
 
153
    def __eq__(self, other):
154
        # yes, this us ugly, TODO: best practice __eq__ style.
155
        return (isinstance(other, TreeEntry)
156
                and other.__class__ == self.__class__)
157
 
158
    def kind_character(self):
159
        return "???"
160
161
162
class TreeDirectory(TreeEntry):
163
    """See TreeEntry. This is a directory in a working tree."""
164
165
    def __eq__(self, other):
166
        return (isinstance(other, TreeDirectory)
167
                and other.__class__ == self.__class__)
168
169
    def kind_character(self):
170
        return "/"
171
172
173
class TreeFile(TreeEntry):
174
    """See TreeEntry. This is a regular file in a working tree."""
175
176
    def __eq__(self, other):
177
        return (isinstance(other, TreeFile)
178
                and other.__class__ == self.__class__)
179
180
    def kind_character(self):
181
        return ''
182
183
184
class TreeLink(TreeEntry):
185
    """See TreeEntry. This is a symlink in a working tree."""
186
187
    def __eq__(self, other):
188
        return (isinstance(other, TreeLink)
189
                and other.__class__ == self.__class__)
190
191
    def kind_character(self):
192
        return ''
193
194
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
195
class WorkingTree(bzrlib.mutabletree.MutableTree):
453 by Martin Pool
- Split WorkingTree into its own file
196
    """Working copy tree.
197
198
    The inventory is held in the `Branch` working-inventory, and the
199
    files are in a directory on disk.
200
201
    It is possible for a `WorkingTree` to have a filename which is
202
    not listed in the Inventory and vice versa.
203
    """
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
204
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
205
    def __init__(self, basedir='.',
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
206
                 branch=DEPRECATED_PARAMETER,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
207
                 _inventory=None,
208
                 _control_files=None,
209
                 _internal=False,
210
                 _format=None,
211
                 _bzrdir=None):
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
212
        """Construct a WorkingTree for basedir.
213
214
        If the branch is not supplied, it is opened automatically.
215
        If the branch is supplied, it must be the branch for this basedir.
216
        (branch.base is not cross checked, because for remote branches that
217
        would be meaningless).
218
        """
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.
219
        self._format = _format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
220
        self.bzrdir = _bzrdir
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
221
        if not _internal:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
222
            # not created via open etc.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
223
            warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
224
                 "Please use bzrdir.open_workingtree or WorkingTree.open().",
225
                 DeprecationWarning,
226
                 stacklevel=2)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
227
            wt = WorkingTree.open(basedir)
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
228
            self._branch = wt.branch
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
229
            self.basedir = wt.basedir
230
            self._control_files = wt._control_files
231
            self._hashcache = wt._hashcache
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
232
            self._set_inventory(wt._inventory, dirty=False)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
233
            self._format = wt._format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
234
            self.bzrdir = wt.bzrdir
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
235
        from bzrlib.hashcache import HashCache
236
        from bzrlib.trace import note, mutter
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
237
        assert isinstance(basedir, basestring), \
238
            "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.
239
        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.
240
        mutter("opening working tree %r", basedir)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
241
        if deprecated_passed(branch):
242
            if not _internal:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
243
                warnings.warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
244
                     " Please use bzrdir.open_workingtree() or"
245
                     " WorkingTree.open().",
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
246
                     DeprecationWarning,
247
                     stacklevel=2
248
                     )
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
249
            self._branch = branch
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
250
        else:
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
251
            self._branch = self.bzrdir.open_branch()
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
252
        self.basedir = realpath(basedir)
1534.4.28 by Robert Collins
first cut at merge from integration.
253
        # 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.
254
        if isinstance(self._format, WorkingTreeFormat2):
255
            # share control object
1534.4.28 by Robert Collins
first cut at merge from integration.
256
            self._control_files = self.branch.control_files
257
        else:
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
258
            # assume all other formats have their own control files.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
259
            assert isinstance(_control_files, LockableFiles), \
260
                    "_control_files must be a LockableFiles, not %r" \
261
                    % _control_files
262
            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.
263
        # update the whole cache up front and write to disk if anything changed;
264
        # in the future we might want to do this more selectively
1467 by Robert Collins
WorkingTree.__del__ has been removed.
265
        # two possible ways offer themselves : in self._unlock, write the cache
266
        # if needed, or, when the cache sees a change, append it to the hash
267
        # cache file, and have the parser take the most recent entry for a
268
        # given path only.
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
269
        cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
270
        hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
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.
271
        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.
272
        # 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
273
        #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.
274
275
        if hc.needs_write:
276
            mutter("write hc")
277
            hc.write()
453 by Martin Pool
- Split WorkingTree into its own file
278
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
279
        if _inventory is None:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
280
            self._inventory_is_modified = False
281
            self.read_working_inventory()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
282
        else:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
283
            # the caller of __init__ has provided an inventory,
284
            # we assume they know what they are doing - as its only
285
            # the Format factory and creation methods that are
286
            # permitted to do this.
287
            self._set_inventory(_inventory, dirty=False)
1185.60.6 by Aaron Bentley
Fixed hashcache
288
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
289
    branch = property(
290
        fget=lambda self: self._branch,
291
        doc="""The branch this WorkingTree is connected to.
292
293
            This cannot be set - it is reflective of the actual disk structure
294
            the working tree has been constructed from.
295
            """)
296
1687.1.9 by Robert Collins
Teach WorkingTree about break-lock.
297
    def break_lock(self):
298
        """Break a lock if one is present from another instance.
299
300
        Uses the ui factory to ask for confirmation if the lock may be from
301
        an active process.
302
303
        This will probe the repository for its lock as well.
304
        """
305
        self._control_files.break_lock()
306
        self.branch.break_lock()
307
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
308
    def _set_inventory(self, inv, dirty):
309
        """Set the internal cached inventory.
310
311
        :param inv: The inventory to set.
312
        :param dirty: A boolean indicating whether the inventory is the same
313
            logical inventory as whats on disk. If True the inventory is not
314
            the same and should be written to disk or data will be lost, if
315
            False then the inventory is the same as that on disk and any
316
            serialisation would be unneeded overhead.
317
        """
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
318
        assert inv.root is not None
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
319
        self._inventory = inv
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
320
        self._inventory_is_modified = dirty
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
321
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
322
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
323
    def open(path=None, _unsupported=False):
324
        """Open an existing working tree at path.
325
326
        """
327
        if path is None:
328
            path = os.path.getcwdu()
329
        control = bzrdir.BzrDir.open(path, _unsupported)
330
        return control.open_workingtree(_unsupported)
331
        
332
    @staticmethod
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
333
    def open_containing(path=None):
334
        """Open an existing working tree which has its root about path.
335
        
336
        This probes for a working tree at path and searches upwards from there.
337
338
        Basically we keep looking up until we find the control directory or
339
        run into /.  If there isn't one, raises NotBranchError.
340
        TODO: give this a new exception.
341
        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
342
343
        :return: The WorkingTree that contains 'path', and the rest of path
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
344
        """
345
        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
346
            path = osutils.getcwd()
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
347
        control, relpath = bzrdir.BzrDir.open_containing(path)
1685.1.27 by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths
348
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
349
        return control.open_workingtree(), relpath
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
350
351
    @staticmethod
352
    def open_downlevel(path=None):
353
        """Open an unsupported working tree.
354
355
        Only intended for advanced situations like upgrading part of a bzrdir.
356
        """
357
        return WorkingTree.open(path, _unsupported=True)
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
358
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
359
    def __iter__(self):
360
        """Iterate through file_ids for this tree.
361
362
        file_ids are in a WorkingTree if they are in the working inventory
363
        and the working file exists.
364
        """
365
        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.
366
        for path, ie in inv.iter_entries():
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
367
            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.
368
                yield ie.file_id
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
369
453 by Martin Pool
- Split WorkingTree into its own file
370
    def __repr__(self):
371
        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
372
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
373
374
    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 \
375
        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()
376
    
377
    def basis_tree(self):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
378
        """Return RevisionTree for the current last revision.
379
        
380
        If the left most parent is a ghost then the returned tree will be an
381
        empty tree - one obtained by calling repository.revision_tree(None).
382
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
383
        try:
384
            revision_id = self.get_parent_ids()[0]
385
        except IndexError:
386
            # no parents, return an empty revision tree.
387
            # in the future this should return the tree for
388
            # 'empty:' - the implicit root empty tree.
389
            return self.branch.repository.revision_tree(None)
390
        else:
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
391
            try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
392
                xml = self.read_basis_inventory()
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
393
                inv = xml6.serializer_v6.read_inventory_from_string(xml)
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
394
                if inv is not None and inv.revision_id == revision_id:
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
395
                    return bzrlib.revisiontree.RevisionTree(
396
                        self.branch.repository, inv, revision_id)
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
397
            except (NoSuchFile, errors.BadInventoryFormat):
398
                pass
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
399
        # No cached copy available, retrieve from the repository.
400
        # FIXME? RBC 20060403 should we cache the inventory locally
401
        # 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.
402
        try:
403
            return self.branch.repository.revision_tree(revision_id)
404
        except errors.RevisionNotPresent:
405
            # the basis tree *may* be a ghost or a low level error may have
406
            # occured. If the revision is present, its a problem, if its not
407
            # its a ghost.
408
            if self.branch.repository.has_revision(revision_id):
409
                raise
1927.2.3 by Robert Collins
review comment application - paired with Martin.
410
            # 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.
411
            return self.branch.repository.revision_tree(None)
453 by Martin Pool
- Split WorkingTree into its own file
412
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
413
    @staticmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
414
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
415
    def create(branch, directory):
416
        """Create a workingtree for branch at directory.
417
418
        If existing_directory already exists it must have a .bzr directory.
419
        If it does not exist, it will be created.
420
421
        This returns a new WorkingTree object for the new checkout.
422
423
        TODO FIXME RBC 20060124 when we have checkout formats in place this
424
        should accept an optional revisionid to checkout [and reject this if
425
        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
426
427
        XXX: When BzrDir is present, these should be created through that 
428
        interface instead.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
429
        """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
430
        warnings.warn('delete WorkingTree.create', stacklevel=3)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
431
        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.
432
        if branch.bzrdir.root_transport.base == transport.base:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
433
            # same dir 
434
            return branch.bzrdir.create_workingtree()
435
        # different directory, 
436
        # create a branch reference
437
        # and now a working tree.
438
        raise NotImplementedError
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
439
 
440
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
441
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
442
    def create_standalone(directory):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
443
        """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.
444
445
        Directory must exist and be empty.
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
446
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
447
        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.
448
        """
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
449
        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.
450
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
451
    def relpath(self, path):
452
        """Return the local path portion from a given path.
453
        
454
        The path may be absolute or relative. If its a relative path it is 
455
        interpreted relative to the python current working directory.
456
        """
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
457
        return osutils.relpath(self.basedir, path)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
458
453 by Martin Pool
- Split WorkingTree into its own file
459
    def has_filename(self, filename):
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
460
        return osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
461
462
    def get_file(self, file_id):
463
        return self.get_file_byname(self.id2path(file_id))
464
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
465
    def get_file_text(self, file_id):
466
        return self.get_file(file_id).read()
467
453 by Martin Pool
- Split WorkingTree into its own file
468
    def get_file_byname(self, filename):
469
        return file(self.abspath(filename), 'rb')
470
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
471
    def get_parent_ids(self):
472
        """See Tree.get_parent_ids.
473
        
474
        This implementation reads the pending merges list and last_revision
475
        value and uses that to decide what the parents list should be.
476
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
477
        last_rev = self._last_revision()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
478
        if last_rev is None:
479
            parents = []
480
        else:
481
            parents = [last_rev]
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
482
        try:
483
            merges_file = self._control_files.get_utf8('pending-merges')
484
        except NoSuchFile:
485
            pass
486
        else:
487
            for l in merges_file.readlines():
488
                parents.append(l.rstrip('\n'))
489
        return parents
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
490
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.
491
    @needs_read_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
492
    def get_root_id(self):
493
        """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.
494
        return self._inventory.root.file_id
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
495
        
453 by Martin Pool
- Split WorkingTree into its own file
496
    def _get_store_filename(self, file_id):
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
497
        ## XXX: badly named; this is not in the store at all
453 by Martin Pool
- Split WorkingTree into its own file
498
        return self.abspath(self.id2path(file_id))
499
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
500
    @needs_read_lock
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
501
    def clone(self, to_bzrdir, revision_id=None, basis=None):
502
        """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()
503
        
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.
504
        Specifically modified files are kept as modified, but
505
        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()
506
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.
507
        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()
508
509
        revision
510
            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.
511
            revision, and and difference between the source trees last revision
512
            and this one merged in.
513
514
        basis
515
            If not None, a closer copy of a tree which may have some files in
516
            common, and which file content should be preferentially copied from.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
517
        """
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.
518
        # assumes the target bzr dir format is compatible.
519
        result = self._format.initialize(to_bzrdir)
520
        self.copy_content_into(result, revision_id)
521
        return result
522
523
    @needs_read_lock
524
    def copy_content_into(self, tree, revision_id=None):
525
        """Copy the current content and user files of this tree into tree."""
1731.1.33 by Aaron Bentley
Revert no-special-root changes
526
        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.
527
        if revision_id is None:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
528
            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.
529
        else:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
530
            # TODO now merge from tree.last_revision to revision (to preserve
531
            # user local changes)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
532
            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.
533
            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()
534
1248 by Martin Pool
- new weave based cleanup [broken]
535
    def id2abspath(self, file_id):
536
        return self.abspath(self.id2path(file_id))
537
1185.12.39 by abentley
Propogated has_or_had_id to Tree
538
    def has_id(self, file_id):
453 by Martin Pool
- Split WorkingTree into its own file
539
        # files that have been deleted are excluded
1185.12.39 by abentley
Propogated has_or_had_id to Tree
540
        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.
541
        if not inv.has_id(file_id):
453 by Martin Pool
- Split WorkingTree into its own file
542
            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.
543
        path = inv.id2path(file_id)
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
544
        return osutils.lexists(self.abspath(path))
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
545
1185.12.39 by abentley
Propogated has_or_had_id to Tree
546
    def has_or_had_id(self, file_id):
547
        if file_id == self.inventory.root.file_id:
548
            return True
549
        return self.inventory.has_id(file_id)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
550
551
    __contains__ = has_id
552
453 by Martin Pool
- Split WorkingTree into its own file
553
    def get_file_size(self, file_id):
1248 by Martin Pool
- new weave based cleanup [broken]
554
        return os.path.getsize(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
555
1185.60.6 by Aaron Bentley
Fixed hashcache
556
    @needs_read_lock
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
557
    def get_file_sha1(self, file_id, path=None):
558
        if not path:
559
            path = self._inventory.id2path(file_id)
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.
560
        return self._hashcache.get_sha1(path)
453 by Martin Pool
- Split WorkingTree into its own file
561
1740.2.5 by Aaron Bentley
Merge from bzr.dev
562
    def get_file_mtime(self, file_id, path=None):
563
        if not path:
564
            path = self._inventory.id2path(file_id)
565
        return os.lstat(self.abspath(path)).st_mtime
566
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
567
    if not supports_executable():
568
        def is_executable(self, file_id, path=None):
1398 by Robert Collins
integrate in Gustavos x-bit patch
569
            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
570
    else:
571
        def is_executable(self, file_id, path=None):
572
            if not path:
573
                path = self._inventory.id2path(file_id)
1398 by Robert Collins
integrate in Gustavos x-bit patch
574
            mode = os.lstat(self.abspath(path)).st_mode
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
575
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1398 by Robert Collins
integrate in Gustavos x-bit patch
576
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
577
    @needs_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
578
    def _add(self, files, ids, kinds):
579
        """See MutableTree._add."""
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
580
        # TODO: Re-adding a file that is removed in the working copy
581
        # 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
582
        # the read and write working inventory should not occur in this 
583
        # function - they should be part of lock_write and unlock.
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
584
        inv = self.read_working_inventory()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
585
        for f, file_id, kind in zip(files, ids, kinds):
586
            assert kind is not None
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
587
            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'.
588
                inv.add_path(f, kind=kind)
589
            else:
590
                inv.add_path(f, kind=kind, file_id=file_id)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
591
        self._write_inventory(inv)
592
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
593
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
594
    def _gather_kinds(self, files, kinds):
595
        """See MutableTree._gather_kinds."""
596
        for pos, f in enumerate(files):
597
            if kinds[pos] is None:
598
                fullpath = normpath(self.abspath(f))
599
                try:
600
                    kinds[pos] = file_kind(fullpath)
601
                except OSError, e:
602
                    if e.errno == errno.ENOENT:
603
                        raise NoSuchFile(fullpath)
604
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
605
    @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.
606
    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.
607
        """Add revision_id as a parent.
608
609
        This is equivalent to retrieving the current list of parent ids
610
        and setting the list to its value plus revision_id.
611
612
        :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.
613
        be a ghost revision as long as its not the first parent to be added,
614
        or the allow_leftmost_as_ghost parameter is set True.
615
        :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.
616
        """
1908.5.13 by Robert Collins
Adding a parent when the first is a ghost already should not require forcing it.
617
        parents = self.get_parent_ids() + [revision_id]
618
        self.set_parent_ids(parents,
619
            allow_leftmost_as_ghost=len(parents) > 1 or allow_leftmost_as_ghost)
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
620
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
621
    @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.
622
    def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
623
        """Add revision_id, tree tuple as a parent.
624
625
        This is equivalent to retrieving the current list of parent trees
626
        and setting the list to its value plus parent_tuple. See also
627
        add_parent_tree_id - if you only have a parent id available it will be
628
        simpler to use that api. If you have the parent already available, using
629
        this api is preferred.
630
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
631
        :param parent_tuple: The (revision id, tree) to add to the parent list.
632
            If the revision_id is a ghost, pass None for the tree.
633
        :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.
634
        """
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
635
        parent_ids = self.get_parent_ids() + [parent_tuple[0]]
636
        if len(parent_ids) > 1:
637
            # the leftmost may have already been a ghost, preserve that if it
638
            # was.
639
            allow_leftmost_as_ghost = True
640
        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.
641
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
642
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
643
    @needs_tree_write_lock
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
644
    def add_pending_merge(self, *revision_ids):
645
        # TODO: Perhaps should check at this point that the
646
        # 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.
647
        parents = self.get_parent_ids()
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
648
        updated = False
649
        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.
650
            if rev_id in parents:
651
                continue
652
            parents.append(rev_id)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
653
            updated = True
654
        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.
655
            self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
656
1908.7.7 by Robert Collins
Deprecated WorkingTree.pending_merges.
657
    @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
658
    @needs_read_lock
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
659
    def pending_merges(self):
660
        """Return a list of pending merges.
661
662
        These are revisions that have been merged into the working
663
        directory but not yet committed.
1908.7.9 by Robert Collins
WorkingTree.last_revision and WorkingTree.pending_merges are deprecated.
664
665
        As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
666
        instead - which is available on all tree objects.
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
667
        """
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
668
        return self.get_parent_ids()[1:]
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
669
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
670
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
671
        """Common ghost checking functionality from set_parent_*.
672
673
        This checks that the left hand-parent exists if there are any
674
        revisions present.
675
        """
676
        if len(revision_ids) > 0:
677
            leftmost_id = revision_ids[0]
678
            if (not allow_leftmost_as_ghost and not
679
                self.branch.repository.has_revision(leftmost_id)):
680
                raise errors.GhostRevisionUnusableHere(leftmost_id)
681
682
    def _set_merges_from_parent_ids(self, parent_ids):
683
        merges = parent_ids[1:]
684
        self._control_files.put_utf8('pending-merges', '\n'.join(merges))
685
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
686
    @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.
687
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
688
        """Set the parent ids to revision_ids.
689
        
690
        See also set_parent_trees. This api will try to retrieve the tree data
691
        for each element of revision_ids from the trees repository. If you have
692
        tree data already available, it is more efficient to use
693
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
694
        an easier API to use.
695
696
        :param revision_ids: The revision_ids to set as the parent ids of this
697
            working tree. Any of these may be ghosts.
698
        """
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
699
        self._check_parents_for_ghosts(revision_ids,
700
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
701
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
702
        if len(revision_ids) > 0:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
703
            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.
704
        else:
705
            self.set_last_revision(None)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
706
707
        self._set_merges_from_parent_ids(revision_ids)
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
708
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
709
    @needs_tree_write_lock
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
710
    def 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
711
        """See MutableTree.set_parent_trees."""
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
712
        parent_ids = [rev for (rev, tree) in parents_list]
713
714
        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.
715
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.2 by Robert Collins
Create and test set_parent_trees.
716
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
717
        if len(parent_ids) == 0:
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
718
            leftmost_parent_id = None
719
            leftmost_parent_tree = None
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
720
        else:
721
            leftmost_parent_id, leftmost_parent_tree = parents_list[0]
722
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
723
        if self._change_last_revision(leftmost_parent_id):
724
            if leftmost_parent_tree is None:
2041.1.4 by John Arbash Meinel
NEWS and documentation
725
                # If we don't have a tree, fall back to reading the
726
                # parent tree from the repository.
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
727
                self._cache_basis_inventory(leftmost_parent_id)
728
            else:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
729
                inv = leftmost_parent_tree.inventory
730
                xml = self._create_basis_xml_from_inventory(
731
                                        leftmost_parent_id, inv)
732
                self._write_basis_inventory(xml)
733
        self._set_merges_from_parent_ids(parent_ids)
734
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
735
    @needs_tree_write_lock
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
736
    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.
737
        parents = self.get_parent_ids()
738
        leftmost = parents[:1]
739
        new_parents = leftmost + rev_list
740
        self.set_parent_ids(new_parents)
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
741
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
742
    @needs_tree_write_lock
1534.7.192 by Aaron Bentley
Record hashes produced by merges
743
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
744
        def iter_stanzas():
745
            for file_id, hash in modified_hashes.iteritems():
746
                yield Stanza(file_id=file_id, hash=hash)
747
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
748
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
749
    @needs_tree_write_lock
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
750
    def _put_rio(self, filename, stanzas, header):
751
        my_file = rio_file(stanzas, header)
752
        self._control_files.put(filename, my_file)
1534.7.192 by Aaron Bentley
Record hashes produced by merges
753
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
754
    @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.
755
    def merge_from_branch(self, branch, to_revision=None):
756
        """Merge from a branch into this working tree.
757
758
        :param branch: The branch to merge from.
759
        :param to_revision: If non-None, the merge will merge to to_revision, but 
760
            not beyond it. to_revision does not need to be in the history of
761
            the branch when it is supplied. If None, to_revision defaults to
762
            branch.last_revision().
763
        """
764
        from bzrlib.merge import Merger, Merge3Merger
765
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
766
        try:
767
            merger = Merger(self.branch, this_tree=self, pb=pb)
768
            merger.pp = ProgressPhase("Merge phase", 5, pb)
769
            merger.pp.next_phase()
770
            # check that there are no
771
            # local alterations
772
            merger.check_basis(check_clean=True, require_commits=False)
773
            if to_revision is None:
774
                to_revision = branch.last_revision()
775
            merger.other_rev_id = to_revision
776
            if merger.other_rev_id is None:
777
                raise error.NoCommits(branch)
778
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
779
            merger.other_basis = merger.other_rev_id
780
            merger.other_tree = self.branch.repository.revision_tree(
781
                merger.other_rev_id)
782
            merger.pp.next_phase()
783
            merger.find_base()
784
            if merger.base_rev_id == merger.other_rev_id:
785
                raise errors.PointlessMerge
786
            merger.backup_files = False
787
            merger.merge_type = Merge3Merger
788
            merger.set_interesting_files(None)
789
            merger.show_base = False
790
            merger.reprocess = False
791
            conflicts = merger.do_merge()
792
            merger.set_pending()
793
        finally:
794
            pb.finished()
795
        return conflicts
796
1534.7.192 by Aaron Bentley
Record hashes produced by merges
797
    @needs_read_lock
798
    def merge_modified(self):
799
        try:
800
            hashfile = self._control_files.get('merge-hashes')
801
        except NoSuchFile:
802
            return {}
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
803
        merge_hashes = {}
804
        try:
805
            if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
806
                raise MergeModifiedFormatError()
807
        except StopIteration:
808
            raise MergeModifiedFormatError()
809
        for s in RioReader(hashfile):
1534.7.198 by Aaron Bentley
Removed spurious encode/decode
810
            file_id = s.get("file_id")
1558.12.10 by Aaron Bentley
Be robust when merge_hash file_id not in inventory
811
            if file_id not in self.inventory:
812
                continue
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
813
            hash = s.get("hash")
814
            if hash == self.get_file_sha1(file_id):
815
                merge_hashes[file_id] = hash
816
        return merge_hashes
1534.7.192 by Aaron Bentley
Record hashes produced by merges
817
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
818
    @needs_write_lock
819
    def mkdir(self, path, file_id=None):
820
        """See MutableTree.mkdir()."""
821
        if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
822
            file_id = generate_ids.gen_file_id(os.path.basename(path))
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
823
        os.mkdir(self.abspath(path))
824
        self.add(path, file_id, 'directory')
825
        return file_id
826
1092.2.6 by Robert Collins
symlink support updated to work
827
    def get_symlink_target(self, file_id):
1185.15.10 by Scott James Remnant
Fix WorkingTree.get_symlink_target() to read the absolute path of the
828
        return os.readlink(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
829
830
    def file_class(self, filename):
831
        if self.path2id(filename):
832
            return 'V'
833
        elif self.is_ignored(filename):
834
            return 'I'
835
        else:
836
            return '?'
837
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
838
    def flush(self):
839
        """Write the in memory inventory to disk."""
840
        # TODO: Maybe this should only write on dirty ?
841
        if self._control_files._lock_mode != 'w':
842
            raise errors.NotWriteLocked(self)
843
        sio = StringIO()
1986.5.6 by Robert Collins
Merge bzr.dev.
844
        xml5.serializer_v5.write_inventory(self._inventory, sio)
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
845
        sio.seek(0)
846
        self._control_files.put('inventory', sio)
847
        self._inventory_is_modified = False
848
1731.1.33 by Aaron Bentley
Revert no-special-root changes
849
    def list_files(self, include_root=False):
1732.1.6 by John Arbash Meinel
Fix documentation bug in workingtree.list_files
850
        """Recursively list all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
851
852
        Lists, but does not descend into unversioned directories.
853
854
        This does not include files that have been deleted in this
855
        tree.
856
857
        Skips the control directory.
858
        """
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.
859
        inv = self._inventory
1910.2.56 by Aaron Bentley
More work on bundles
860
        if include_root is True:
861
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
862
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
863
        pathjoin = osutils.pathjoin
864
        file_kind = osutils.file_kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
865
866
        # transport.base ends in a slash, we want the piece
867
        # between the last two slashes
868
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
869
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
870
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
871
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
872
        # directory file_id, relative path, absolute path, reverse sorted children
873
        children = os.listdir(self.basedir)
874
        children.sort()
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
875
        # jam 20060527 The kernel sized tree seems equivalent whether we 
876
        # use a deque and popleft to keep them sorted, or if we use a plain
877
        # 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.
878
        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
879
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
880
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
881
            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
882
883
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
884
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
885
                ## TODO: If we find a subdirectory with its own .bzr
886
                ## directory, then that is a separate tree and we
887
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
888
889
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
890
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
891
                    continue
892
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
893
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
894
                # 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
895
                # than the checks of pathjoin(), all relative paths will have an extra slash
896
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
897
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
898
899
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
900
                fap = from_dir_abspath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
901
                
902
                f_ie = inv.get_child(from_dir_id, f)
903
                if f_ie:
904
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
905
                elif self.is_ignored(fp[1:]):
906
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
907
                else:
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
908
                    # we may not have found this file, because of a unicode issue
909
                    f_norm, can_access = osutils.normalized_filename(f)
910
                    if f == f_norm or not can_access:
911
                        # No change, so treat this file normally
912
                        c = '?'
913
                    else:
914
                        # this file can be accessed by a normalized path
915
                        # check again if it is versioned
916
                        # these lines are repeated here for performance
917
                        f = f_norm
918
                        fp = from_dir_relpath + '/' + f
919
                        fap = from_dir_abspath + '/' + f
920
                        f_ie = inv.get_child(from_dir_id, f)
921
                        if f_ie:
922
                            c = 'V'
923
                        elif self.is_ignored(fp[1:]):
924
                            c = 'I'
925
                        else:
926
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
927
928
                fk = file_kind(fap)
929
930
                if f_ie:
931
                    if f_ie.kind != fk:
932
                        raise BzrCheckError("file %r entered as kind %r id %r, "
933
                                            "now of kind %r"
934
                                            % (fap, f_ie.kind, f_ie.file_id, fk))
935
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
936
                # make a last minute entry
937
                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
938
                    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
939
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
940
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
941
                        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
942
                    except KeyError:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
943
                        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.
944
                    continue
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
945
                
453 by Martin Pool
- Split WorkingTree into its own file
946
                if fk != 'directory':
947
                    continue
948
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
949
                # 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.
950
                new_children = os.listdir(fap)
951
                new_children.sort()
952
                new_children = collections.deque(new_children)
953
                stack.append((f_ie.file_id, fp, fap, new_children))
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
954
                # Break out of inner loop, so that we start outer loop with child
955
                break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
956
            else:
957
                # 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.
958
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
959
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
960
    @needs_tree_write_lock
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
961
    def move(self, from_paths, to_name):
962
        """Rename files.
963
964
        to_name must exist in the inventory.
965
966
        If to_name exists and is a directory, the files are moved into
967
        it, keeping their old names.  
968
969
        Note that to_name is only the last component of the new name;
970
        this doesn't change the directory.
971
972
        This returns a list of (from_path, to_path) pairs for each
973
        entry that is moved.
974
        """
975
        result = []
976
        ## TODO: Option to move IDs only
977
        assert not isinstance(from_paths, basestring)
978
        inv = self.inventory
979
        to_abs = self.abspath(to_name)
980
        if not isdir(to_abs):
981
            raise BzrError("destination %r is not a directory" % to_abs)
982
        if not self.has_filename(to_name):
983
            raise BzrError("destination %r not in working directory" % to_abs)
984
        to_dir_id = inv.path2id(to_name)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
985
        if to_dir_id is None and to_name != '':
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
986
            raise BzrError("destination %r is not a versioned directory" % to_name)
987
        to_dir_ie = inv[to_dir_id]
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
988
        if to_dir_ie.kind != 'directory':
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
989
            raise BzrError("destination %r is not a directory" % to_abs)
990
991
        to_idpath = inv.get_idpath(to_dir_id)
992
993
        for f in from_paths:
994
            if not self.has_filename(f):
995
                raise BzrError("%r does not exist in working tree" % f)
996
            f_id = inv.path2id(f)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
997
            if f_id is None:
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
998
                raise BzrError("%r is not versioned" % f)
999
            name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1000
            dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1001
            if self.has_filename(dest_path):
1002
                raise BzrError("destination %r already exists" % dest_path)
1003
            if f_id in to_idpath:
1004
                raise BzrError("can't move %r to a subdirectory of itself" % f)
1005
1006
        # OK, so there's a race here, it's possible that someone will
1007
        # create a file in this interval and then the rename might be
1008
        # left half-done.  But we should have caught most problems.
1009
        orig_inv = deepcopy(self.inventory)
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1010
        original_modified = self._inventory_is_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1011
        try:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1012
            if len(from_paths):
1013
                self._inventory_is_modified = True
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1014
            for f in from_paths:
1015
                name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1016
                dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1017
                result.append((f, dest_path))
1018
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
1019
                try:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1020
                    osutils.rename(self.abspath(f), self.abspath(dest_path))
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1021
                except OSError, e:
1022
                    raise BzrError("failed to rename %r to %r: %s" %
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1023
                                   (f, dest_path, e[1]))
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1024
        except:
1025
            # restore the inventory on error
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1026
            self._set_inventory(orig_inv, dirty=original_modified)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1027
            raise
1028
        self._write_inventory(inv)
1029
        return result
1030
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1031
    @needs_tree_write_lock
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1032
    def rename_one(self, from_rel, to_rel):
1033
        """Rename one file.
1034
1035
        This can change the directory or the filename or both.
1036
        """
1037
        inv = self.inventory
1038
        if not self.has_filename(from_rel):
1039
            raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1040
        if self.has_filename(to_rel):
1041
            raise BzrError("can't rename: new working file %r already exists" % to_rel)
1042
1043
        file_id = inv.path2id(from_rel)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1044
        if file_id is None:
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1045
            raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1046
1047
        entry = inv[file_id]
1048
        from_parent = entry.parent_id
1049
        from_name = entry.name
1050
        
1051
        if inv.path2id(to_rel):
1052
            raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1053
1054
        to_dir, to_tail = os.path.split(to_rel)
1055
        to_dir_id = inv.path2id(to_dir)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1056
        if to_dir_id is None and to_dir != '':
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1057
            raise BzrError("can't determine destination directory id for %r" % to_dir)
1058
1059
        mutter("rename_one:")
1060
        mutter("  file_id    {%s}" % file_id)
1061
        mutter("  from_rel   %r" % from_rel)
1062
        mutter("  to_rel     %r" % to_rel)
1063
        mutter("  to_dir     %r" % to_dir)
1064
        mutter("  to_dir_id  {%s}" % to_dir_id)
1065
1066
        inv.rename(file_id, to_dir_id, to_tail)
1067
1068
        from_abs = self.abspath(from_rel)
1069
        to_abs = self.abspath(to_rel)
1070
        try:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1071
            osutils.rename(from_abs, to_abs)
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1072
        except OSError, e:
1073
            inv.rename(file_id, from_parent, from_name)
1074
            raise BzrError("failed to rename %r to %r: %s"
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1075
                    % (from_abs, to_abs, e[1]))
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1076
        self._write_inventory(inv)
1077
1078
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
1079
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
1080
        """Return all unknown files.
1081
1082
        These are files in the working directory that are not versioned or
1083
        control files or ignored.
1084
        """
453 by Martin Pool
- Split WorkingTree into its own file
1085
        for subp in self.extras():
1086
            if not self.is_ignored(subp):
1087
                yield subp
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1088
    
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1089
    @needs_tree_write_lock
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1090
    def unversion(self, file_ids):
1091
        """Remove the file ids in file_ids from the current versioned set.
1092
1093
        When a file_id is unversioned, all of its children are automatically
1094
        unversioned.
1095
1096
        :param file_ids: The file ids to stop versioning.
1097
        :raises: NoSuchId if any fileid is not currently versioned.
1098
        """
1099
        for file_id in file_ids:
1100
            if self._inventory.has_id(file_id):
1988.2.6 by Robert Collins
Review feedback.
1101
                self._inventory.remove_recursive_id(file_id)
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1102
            else:
1103
                raise errors.NoSuchId(self, file_id)
1104
        if len(file_ids):
1105
            # in the future this should just set a dirty bit to wait for the 
1106
            # final unlock. However, until all methods of workingtree start
1107
            # with the current in -memory inventory rather than triggering 
1108
            # a read, it is more complex - we need to teach read_inventory
1109
            # to know when to read, and when to not read first... and possibly
1110
            # to save first when the in memory one may be corrupted.
1111
            # so for now, we just only write it if it is indeed dirty.
1112
            # - RBC 20060907
1113
            self._write_inventory(self._inventory)
1114
    
1534.10.16 by Aaron Bentley
Small tweaks
1115
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1116
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
1117
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1118
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
1119
        return self._iter_conflicts()
1120
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1121
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1122
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1123
        for info in self.list_files():
1124
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1125
            stem = get_conflicted_stem(path)
1126
            if stem is None:
1127
                continue
1128
            if stem not in conflicted:
1129
                conflicted.add(stem)
1130
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
1131
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1132
    @needs_write_lock
1185.76.1 by Erik Bågfors
Support for --revision in pull
1133
    def pull(self, source, overwrite=False, stop_revision=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1134
        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().
1135
        source.lock_read()
1136
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1137
            pp = ProgressPhase("Pull phase", 2, top_pb)
1138
            pp.next_phase()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1139
            old_revision_history = self.branch.revision_history()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
1140
            basis_tree = self.basis_tree()
1534.4.54 by Robert Collins
Merge from integration.
1141
            count = self.branch.pull(source, overwrite, stop_revision)
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1142
            new_revision_history = self.branch.revision_history()
1143
            if new_revision_history != old_revision_history:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1144
                pp.next_phase()
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
1145
                if len(old_revision_history):
1146
                    other_revision = old_revision_history[-1]
1147
                else:
1148
                    other_revision = None
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1149
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1150
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1151
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1152
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1153
                    merge.merge_inner(
1154
                                self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1155
                                new_basis_tree,
1156
                                basis_tree,
1157
                                this_tree=self,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1158
                                pb=pb)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1159
                    if (basis_tree.inventory.root is None and
1731.1.47 by Aaron Bentley
Merge bzr.dev
1160
                        new_basis_tree.inventory.root is not None):
1161
                        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.
1162
                finally:
1163
                    pb.finished()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1164
                # 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.
1165
                # reuse the revisiontree we merged against to set the new
1166
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1167
                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.
1168
                # we have to pull the merge trees out again, because 
1169
                # merge_inner has set the ids. - this corner is not yet 
1170
                # layered well enough to prevent double handling.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1171
                merges = self.get_parent_ids()[1:]
1172
                parent_trees.extend([
1173
                    (parent, repository.revision_tree(parent)) for
1174
                     parent in merges])
1175
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1176
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1177
        finally:
1178
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1179
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1180
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1181
    @needs_write_lock
1182
    def put_file_bytes_non_atomic(self, file_id, bytes):
1183
        """See MutableTree.put_file_bytes_non_atomic."""
1184
        stream = file(self.id2abspath(file_id), 'wb')
1185
        try:
1186
            stream.write(bytes)
1187
        finally:
1188
            stream.close()
1189
        # TODO: update the hashcache here ?
1190
453 by Martin Pool
- Split WorkingTree into its own file
1191
    def extras(self):
1192
        """Yield all unknown files in this WorkingTree.
1193
1194
        If there are any unknown directories then only the directory is
1195
        returned, not all its children.  But if there are unknown files
1196
        under a versioned subdirectory, they are returned.
1197
1198
        Currently returned depth-first, sorted by name within directories.
1199
        """
1200
        ## TODO: Work from given directory downwards
1201
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1202
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1203
            dirabs = self.abspath(path)
1204
            if not isdir(dirabs):
1205
                # e.g. directory deleted
1206
                continue
1207
1208
            fl = []
1209
            for subf in os.listdir(dirabs):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1210
                if subf == '.bzr':
1211
                    continue
1212
                if subf not in dir_entry.children:
1213
                    subf_norm, can_access = osutils.normalized_filename(subf)
1214
                    if subf_norm != subf and can_access:
1215
                        if subf_norm not in dir_entry.children:
1216
                            fl.append(subf_norm)
1217
                    else:
1218
                        fl.append(subf)
453 by Martin Pool
- Split WorkingTree into its own file
1219
            
1220
            fl.sort()
1221
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1222
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1223
                yield subp
1224
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1225
453 by Martin Pool
- Split WorkingTree into its own file
1226
    def ignored_files(self):
1227
        """Yield list of PATH, IGNORE_PATTERN"""
1228
        for subp in self.extras():
1229
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1230
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1231
                yield subp, pat
1232
1233
    def get_ignore_list(self):
1234
        """Return list of ignore patterns.
1235
1236
        Cached in the Tree object after the first call.
1237
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1238
        ignoreset = getattr(self, '_ignoreset', None)
1239
        if ignoreset is not None:
1240
            return ignoreset
1241
1242
        ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1243
        ignore_globs.update(ignores.get_runtime_ignores())
1244
        ignore_globs.update(ignores.get_user_ignores())
453 by Martin Pool
- Split WorkingTree into its own file
1245
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1246
            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
1247
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1248
                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
1249
            finally:
1250
                f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1251
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1252
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1253
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1254
    def _flush_ignore_list_cache(self):
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1255
        """Resets the cached ignore list to force a cache rebuild."""
1256
        self._ignoreset = None
1257
        self._ignoreglobster = None
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1258
453 by Martin Pool
- Split WorkingTree into its own file
1259
    def is_ignored(self, filename):
1260
        r"""Check whether the filename matches an ignore pattern.
1261
1262
        Patterns containing '/' or '\' need to match the whole path;
1263
        others match against only the last component.
1264
1265
        If the file is ignored, returns the pattern which caused it to
1266
        be ignored, otherwise None.  So this can simply be used as a
1267
        boolean if desired."""
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1268
        if getattr(self, '_ignoreglobster', None) is None:
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1269
            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)
1270
        return self._ignoreglobster.match(filename)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1271
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1272
    def kind(self, file_id):
1273
        return file_kind(self.id2abspath(file_id))
1274
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1275
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1276
        """Return the last revision of the branch for this tree.
1277
1278
        This format tree does not support a separate marker for last-revision
1279
        compared to the branch.
1280
1281
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1282
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1283
        return self._last_revision()
1284
1285
    @needs_read_lock
1286
    def _last_revision(self):
1287
        """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()
1288
        return self.branch.last_revision()
1289
1694.2.6 by Martin Pool
[merge] bzr.dev
1290
    def is_locked(self):
1291
        return self._control_files.is_locked()
1292
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1293
    def lock_read(self):
1294
        """See Branch.lock_read, and WorkingTree.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.
1295
        self.branch.lock_read()
1296
        try:
1297
            return self._control_files.lock_read()
1298
        except:
1299
            self.branch.unlock()
1300
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1301
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1302
    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.
1303
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1304
        self.branch.lock_read()
1305
        try:
1306
            return self._control_files.lock_write()
1307
        except:
1308
            self.branch.unlock()
1309
            raise
1310
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1311
    def lock_write(self):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1312
        """See MutableTree.lock_write, and WorkingTree.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.
1313
        self.branch.lock_write()
1314
        try:
1315
            return self._control_files.lock_write()
1316
        except:
1317
            self.branch.unlock()
1318
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1319
1694.2.6 by Martin Pool
[merge] bzr.dev
1320
    def get_physical_lock_status(self):
1321
        return self._control_files.get_physical_lock_status()
1322
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1323
    def _basis_inventory_name(self):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1324
        return 'basis-inventory-cache'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1325
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1326
    @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.
1327
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1328
        """Change the last revision in the working tree."""
1329
        if self._change_last_revision(new_revision):
1330
            self._cache_basis_inventory(new_revision)
1331
1332
    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.
1333
        """Template method part of set_last_revision to perform the change.
1334
        
1335
        This is used to allow WorkingTree3 instances to not affect branch
1336
        when their last revision is set.
1337
        """
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1338
        if new_revision is None:
1339
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1340
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1341
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1342
            self.branch.generate_revision_history(new_revision)
1343
        except errors.NoSuchRevision:
1344
            # not present in the repo - dont try to set it deeper than the tip
1345
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1346
        return True
1347
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1348
    def _write_basis_inventory(self, xml):
1349
        """Write the basis inventory XML to the basis-inventory file"""
1350
        assert isinstance(xml, str), 'serialised xml must be bytestring.'
1351
        path = self._basis_inventory_name()
1352
        sio = StringIO(xml)
1353
        self._control_files.put(path, sio)
1354
1355
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1356
        """Create the text that will be saved in basis-inventory"""
1357
        inventory.revision_id = revision_id
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
1358
        return xml6.serializer_v6.write_inventory_to_string(inventory)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1359
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1360
    def _cache_basis_inventory(self, new_revision):
1361
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1362
        # TODO: this should allow the ready-to-use inventory to be passed in,
1363
        # as commit already has that ready-to-use [while the format is the
1364
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1365
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1366
            # this double handles the inventory - unpack and repack - 
1367
            # but is easier to understand. We can/should put a conditional
1368
            # in here based on whether the inventory is in the latest format
1369
            # - perhaps we should repack all inventories on a repository
1370
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1371
            # the fast path is to copy the raw xml from the repository. If the
1372
            # xml contains 'revision_id="', then we assume the right 
1373
            # revision_id is set. We must check for this full string, because a
1374
            # root node id can legitimately look like 'revision_id' but cannot
1375
            # contain a '"'.
1376
            xml = self.branch.repository.get_inventory_xml(new_revision)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1377
            firstline = xml.split('\n', 1)[0]
1378
            if (not 'revision_id="' in firstline or 
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1379
                'format="6"' not in firstline):
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1380
                inv = self.branch.repository.deserialise_inventory(
1381
                    new_revision, xml)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1382
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1383
            self._write_basis_inventory(xml)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1384
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1385
            pass
1386
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1387
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1388
        """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.
1389
        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.
1390
        return self._control_files.get(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1391
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1392
    @needs_read_lock
1393
    def read_working_inventory(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1394
        """Read the working inventory.
1395
        
1986.5.7 by Robert Collins
Merge reviews.
1396
        :raises errors.InventoryModified: read_working_inventory will fail
1397
            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
1398
        """
1399
        # conceptually this should be an implementation detail of the tree. 
1400
        # XXX: Deprecate this.
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1401
        # ElementTree does its own conversion from UTF-8, so open in
1402
        # binary.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1403
        if self._inventory_is_modified:
1404
            raise errors.InventoryModified(self)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1405
        result = xml5.serializer_v5.read_inventory(
1534.4.28 by Robert Collins
first cut at merge from integration.
1406
            self._control_files.get('inventory'))
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1407
        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()
1408
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1409
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1410
    @needs_tree_write_lock
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1411
    def remove(self, files, verbose=False, to_file=None):
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1412
        """Remove nominated files from the working inventory..
1413
1414
        This does not remove their text.  This does not run on XXX on what? RBC
1415
1416
        TODO: Refuse to remove modified files unless --force is given?
1417
1418
        TODO: Do something useful with directories.
1419
1420
        TODO: Should this remove the text or not?  Tough call; not
1421
        removing may be useful and the user can just use use rm, and
1422
        is the opposite of add.  Removing it is consistent with most
1423
        other tools.  Maybe an option.
1424
        """
1425
        ## TODO: Normalize names
1426
        ## TODO: Remove nested loops; better scalability
1427
        if isinstance(files, basestring):
1428
            files = [files]
1429
1430
        inv = self.inventory
1431
1432
        # do this before any modifications
1433
        for f in files:
1434
            fid = inv.path2id(f)
1435
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
1436
                # TODO: Perhaps make this just a warning, and continue?
1437
                # This tends to happen when 
1438
                raise NotVersionedError(path=f)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1439
            if verbose:
1440
                # having remove it, it must be either ignored or unknown
1441
                if self.is_ignored(f):
1442
                    new_status = 'I'
1443
                else:
1444
                    new_status = '?'
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1445
                textui.show_status(new_status, inv[fid].kind, f,
1446
                                   to_file=to_file)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1447
            del inv[fid]
1448
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1449
        self._write_inventory(inv)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1450
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1451
    @needs_tree_write_lock
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1452
    def revert(self, filenames, old_tree=None, backups=True, 
1453
               pb=DummyProgress()):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1454
        from bzrlib.conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1455
        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()
1456
            old_tree = self.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1457
        conflicts = transform.revert(self, old_tree, filenames, backups, pb)
1457.1.8 by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner.
1458
        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.
1459
            self.set_parent_ids(self.get_parent_ids()[:1])
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1460
            resolve(self)
1461
        else:
1534.10.15 by Aaron Bentley
Revert does resolve
1462
            resolve(self, filenames, ignore_misses=True)
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1463
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1464
1658.1.3 by Martin Pool
Doc
1465
    # XXX: This method should be deprecated in favour of taking in a proper
1466
    # new Inventory object.
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1467
    @needs_tree_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1468
    def set_inventory(self, new_inventory_list):
1469
        from bzrlib.inventory import (Inventory,
1470
                                      InventoryDirectory,
1471
                                      InventoryEntry,
1472
                                      InventoryFile,
1473
                                      InventoryLink)
1474
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1475
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1476
            name = os.path.basename(path)
1477
            if name == "":
1478
                continue
1479
            # fixme, there should be a factory function inv,add_?? 
1480
            if kind == 'directory':
1481
                inv.add(InventoryDirectory(file_id, name, parent))
1482
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1483
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1484
            elif kind == 'symlink':
1485
                inv.add(InventoryLink(file_id, name, parent))
1486
            else:
1487
                raise BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1488
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1489
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1490
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1491
    def set_root_id(self, file_id):
1492
        """Set the root id for this tree."""
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
1493
        # for compatability 
1494
        if file_id is None:
1495
            symbol_versioning.warn(symbol_versioning.zero_twelve
1496
                % 'WorkingTree.set_root_id with fileid=None',
1497
                DeprecationWarning,
1498
                stacklevel=3)
1499
            file_id = ROOT_ID
1500
        inv = self._inventory
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1501
        orig_root_id = inv.root.file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1502
        # TODO: it might be nice to exit early if there was nothing
1503
        # to do, saving us from trigger a sync on unlock.
1504
        self._inventory_is_modified = True
1505
        # we preserve the root inventory entry object, but
1506
        # unlinkit from the byid index
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1507
        del inv._byid[inv.root.file_id]
1508
        inv.root.file_id = file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1509
        # and link it into the index with the new changed id.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1510
        inv._byid[inv.root.file_id] = inv.root
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1511
        # and finally update all children to reference the new id.
1512
        # XXX: this should be safe to just look at the root.children
1513
        # list, not the WHOLE INVENTORY.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1514
        for fid in inv:
1515
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1516
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1517
                entry.parent_id = inv.root.file_id
1518
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1519
    def unlock(self):
1520
        """See Branch.unlock.
1521
        
1522
        WorkingTree locking just uses the Branch locking facilities.
1523
        This is current because all working trees have an embedded branch
1524
        within them. IF in the future, we were to make branch data shareable
1525
        between multiple working trees, i.e. via shared storage, then we 
1526
        would probably want to lock both the local tree, and the branch.
1527
        """
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.
1528
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1529
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1530
    def update(self):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1531
        """Update a working tree along its branch.
1532
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1533
        This will update the branch if its bound too, which means we have
1534
        multiple trees involved:
1535
1536
        - The new basis tree of the master.
1537
        - The old basis tree of the branch.
1538
        - The old basis tree of the working tree.
1539
        - The current working tree state.
1540
1541
        Pathologically, all three may be different, and non-ancestors of each
1542
        other.  Conceptually we want to:
1543
1544
        - Preserve the wt.basis->wt.state changes
1545
        - Transform the wt.basis to the new master basis.
1546
        - Apply a merge of the old branch basis to get any 'local' changes from
1547
          it into the tree.
1548
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1549
1550
        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
1551
        - Merge current state -> basis tree of the master w.r.t. the old tree
1552
          basis.
1553
        - 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.
1554
        """
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1555
        if self.branch.get_master_branch() is not None:
1556
            self.lock_write()
1557
            update_branch = True
1558
        else:
1559
            self.lock_tree_write()
1560
            update_branch = False
1561
        try:
1562
            if update_branch:
1563
                old_tip = self.branch.update()
1564
            else:
1565
                old_tip = None
1566
            return self._update_tree(old_tip)
1567
        finally:
1568
            self.unlock()
1569
1570
    @needs_tree_write_lock
1571
    def _update_tree(self, old_tip=None):
1572
        """Update a tree to the master branch.
1573
1574
        :param old_tip: if supplied, the previous tip revision the branch,
1575
            before it was changed to the master branch's tip.
1576
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1577
        # here if old_tip is not None, it is the old tip of the branch before
1578
        # it was updated from the master branch. This should become a pending
1579
        # merge in the working tree to preserve the user existing work.  we
1580
        # cant set that until we update the working trees last revision to be
1581
        # one from the new branch, because it will just get absorbed by the
1582
        # parent de-duplication logic.
1583
        # 
1584
        # We MUST save it even if an error occurs, because otherwise the users
1585
        # local work is unreferenced and will appear to have been lost.
1586
        # 
1587
        result = 0
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1588
        try:
1589
            last_rev = self.get_parent_ids()[0]
1590
        except IndexError:
1591
            last_rev = None
1592
        if last_rev != self.branch.last_revision():
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1593
            # merge tree state up to new branch tip.
1594
            basis = self.basis_tree()
1595
            to_tree = self.branch.basis_tree()
1731.1.47 by Aaron Bentley
Merge bzr.dev
1596
            if basis.inventory.root is None:
1597
                self.set_root_id(to_tree.inventory.root.file_id)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1598
            result += merge.merge_inner(
1599
                                  self.branch,
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1600
                                  to_tree,
1601
                                  basis,
1602
                                  this_tree=self)
1908.6.6 by Robert Collins
Merge updated set_parents api.
1603
            # TODO - dedup parents list with things merged by pull ?
1604
            # reuse the tree we've updated to to set the basis:
1605
            parent_trees = [(self.branch.last_revision(), to_tree)]
1606
            merges = self.get_parent_ids()[1:]
1607
            # Ideally we ask the tree for the trees here, that way the working
1608
            # tree can decide whether to give us teh entire tree or give us a
1609
            # lazy initialised tree. dirstate for instance will have the trees
1610
            # in ram already, whereas a last-revision + basis-inventory tree
1611
            # will not, but also does not need them when setting parents.
1612
            for parent in merges:
1613
                parent_trees.append(
1614
                    (parent, self.branch.repository.revision_tree(parent)))
1615
            if old_tip is not None:
1616
                parent_trees.append(
1617
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
1618
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1619
            last_rev = parent_trees[0][0]
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1620
        else:
1621
            # the working tree had the same last-revision as the master
1622
            # branch did. We may still have pivot local work from the local
1623
            # 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.
1624
            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.
1625
                self.add_parent_tree_id(old_tip)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1626
        if old_tip and old_tip != last_rev:
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1627
            # our last revision was not the prior branch last revision
1628
            # and we have converted that last revision to a pending merge.
1629
            # base is somewhere between the branch tip now
1630
            # and the now pending merge
1631
            from bzrlib.revision import common_ancestor
1632
            try:
1633
                base_rev_id = common_ancestor(self.branch.last_revision(),
1634
                                              old_tip,
1635
                                              self.branch.repository)
1636
            except errors.NoCommonAncestor:
1637
                base_rev_id = None
1638
            base_tree = self.branch.repository.revision_tree(base_rev_id)
1639
            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.
1640
            result += merge.merge_inner(
1641
                                  self.branch,
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1642
                                  other_tree,
1643
                                  base_tree,
1644
                                  this_tree=self)
1645
        return result
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1646
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1647
    @needs_tree_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1648
    def _write_inventory(self, inv):
1649
        """Write inventory as the current inventory."""
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1650
        self._set_inventory(inv, dirty=True)
1651
        self.flush()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1652
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1653
    def set_conflicts(self, arg):
1654
        raise UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1655
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1656
    def add_conflicts(self, arg):
1657
        raise UnsupportedOperation(self.add_conflicts, self)
1658
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1659
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1660
    def conflicts(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1661
        conflicts = _mod_conflicts.ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1662
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1663
            text = True
1664
            try:
1665
                if file_kind(self.abspath(conflicted)) != "file":
1666
                    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.
1667
            except errors.NoSuchFile:
1668
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1669
            if text is True:
1670
                for suffix in ('.THIS', '.OTHER'):
1671
                    try:
1672
                        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.
1673
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1674
                            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.
1675
                    except errors.NoSuchFile:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1676
                        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.
1677
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1678
                        break
1679
            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.
1680
            conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1681
                             path=conflicted,
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1682
                             file_id=self.path2id(conflicted)))
1683
        return conflicts
1684
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1685
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.
1686
class WorkingTree2(WorkingTree):
1687
    """This is the Format 2 working tree.
1688
1689
    This was the first weave based working tree. 
1690
     - uses os locks for locking.
1691
     - uses the branch last-revision.
1692
    """
1693
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1694
    def lock_tree_write(self):
1695
        """See WorkingTree.lock_tree_write().
1696
1697
        In Format2 WorkingTrees we have a single lock for the branch and tree
1698
        so lock_tree_write() degrades to lock_write().
1699
        """
1700
        self.branch.lock_write()
1701
        try:
1702
            return self._control_files.lock_write()
1703
        except:
1704
            self.branch.unlock()
1705
            raise
1706
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.
1707
    def unlock(self):
1708
        # we share control files:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1709
        if self._control_files._lock_count == 3:
1710
            # _inventory_is_modified is always False during a read lock.
1711
            if self._inventory_is_modified:
1712
                self.flush()
1713
            if self._hashcache.needs_write:
1714
                self._hashcache.write()
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.
1715
        # reverse order of locking.
1716
        try:
1717
            return self._control_files.unlock()
1718
        finally:
1719
            self.branch.unlock()
1720
1721
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1722
class WorkingTree3(WorkingTree):
1723
    """This is the Format 3 working tree.
1724
1725
    This differs from the base WorkingTree by:
1726
     - having its own file lock
1727
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1728
1729
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1730
    """
1731
1732
    @needs_read_lock
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1733
    def _last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1734
        """See Mutable.last_revision."""
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1735
        try:
1736
            return self._control_files.get_utf8('last-revision').read()
1737
        except NoSuchFile:
1738
            return None
1739
1740
    def _change_last_revision(self, revision_id):
1741
        """See WorkingTree._change_last_revision."""
1742
        if revision_id is None or revision_id == NULL_REVISION:
1743
            try:
1744
                self._control_files._transport.delete('last-revision')
1745
            except errors.NoSuchFile:
1746
                pass
1747
            return False
1748
        else:
1749
            self._control_files.put_utf8('last-revision', revision_id)
1750
            return True
1751
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1752
    @needs_tree_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1753
    def set_conflicts(self, conflicts):
1754
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
1755
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1756
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1757
    @needs_tree_write_lock
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1758
    def add_conflicts(self, new_conflicts):
1759
        conflict_set = set(self.conflicts())
1760
        conflict_set.update(set(list(new_conflicts)))
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1761
        self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
1762
                                       key=_mod_conflicts.Conflict.sort_key)))
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1763
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1764
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1765
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1766
        try:
1767
            confile = self._control_files.get('conflicts')
1768
        except NoSuchFile:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1769
            return _mod_conflicts.ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1770
        try:
1771
            if confile.next() != CONFLICT_HEADER_1 + '\n':
1772
                raise ConflictFormatError()
1773
        except StopIteration:
1774
            raise ConflictFormatError()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1775
        return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1776
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.
1777
    def unlock(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1778
        if self._control_files._lock_count == 1:
1779
            # _inventory_is_modified is always False during a read lock.
1780
            if self._inventory_is_modified:
1781
                self.flush()
1782
            if self._hashcache.needs_write:
1783
                self._hashcache.write()
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.
1784
        # reverse order of locking.
1785
        try:
1786
            return self._control_files.unlock()
1787
        finally:
1788
            self.branch.unlock()
1789
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1790
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1791
def get_conflicted_stem(path):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1792
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1793
        if path.endswith(suffix):
1794
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1795
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1796
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1797
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1798
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1799
    ## FIXME: better check
1800
    filename = normpath(filename)
1801
    while filename != '':
1802
        head, tail = os.path.split(filename)
1803
        ## 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.
1804
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1805
            return True
1806
        if filename == head:
1807
            break
1808
        filename = head
1809
    return False
1810
1811
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1812
class WorkingTreeFormat(object):
1813
    """An encapsulation of the initialization and open routines for a format.
1814
1815
    Formats provide three things:
1816
     * An initialization routine,
1817
     * a format string,
1818
     * an open routine.
1819
1820
    Formats are placed in an dict by their format string for reference 
1821
    during workingtree opening. Its not required that these be instances, they
1822
    can be classes themselves with class methods - it simply depends on 
1823
    whether state is needed for a given format or not.
1824
1825
    Once a format is deprecated, just deprecate the initialize and open
1826
    methods on the format class. Do not deprecate the object, as the 
1827
    object will be created every time regardless.
1828
    """
1829
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1830
    _default_format = None
1831
    """The default format used for new trees."""
1832
1833
    _formats = {}
1834
    """The known formats."""
1835
1836
    @classmethod
1837
    def find_format(klass, a_bzrdir):
1838
        """Return the format for the working tree object in a_bzrdir."""
1839
        try:
1840
            transport = a_bzrdir.get_workingtree_transport(None)
1841
            format_string = transport.get("format").read()
1842
            return klass._formats[format_string]
1843
        except NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1844
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1845
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1846
            raise errors.UnknownFormatError(format=format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1847
1848
    @classmethod
1849
    def get_default_format(klass):
1850
        """Return the current default format."""
1851
        return klass._default_format
1852
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1853
    def get_format_string(self):
1854
        """Return the ASCII format string that identifies this format."""
1855
        raise NotImplementedError(self.get_format_string)
1856
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1857
    def get_format_description(self):
1858
        """Return the short description for this format."""
1859
        raise NotImplementedError(self.get_format_description)
1860
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1861
    def is_supported(self):
1862
        """Is this format supported?
1863
1864
        Supported formats can be initialized and opened.
1865
        Unsupported formats may not support initialization or committing or 
1866
        some other features depending on the reason for not being supported.
1867
        """
1868
        return True
1869
1870
    @classmethod
1871
    def register_format(klass, format):
1872
        klass._formats[format.get_format_string()] = format
1873
1874
    @classmethod
1875
    def set_default_format(klass, format):
1876
        klass._default_format = format
1877
1878
    @classmethod
1879
    def unregister_format(klass, format):
1880
        assert klass._formats[format.get_format_string()] is format
1881
        del klass._formats[format.get_format_string()]
1882
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1883
1884
1885
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1886
    """The second working tree format. 
1887
1888
    This format modified the hash cache from the format 1 hash cache.
1889
    """
1890
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1891
    def get_format_description(self):
1892
        """See WorkingTreeFormat.get_format_description()."""
1893
        return "Working tree format 2"
1894
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
1895
    def stub_initialize_remote(self, control_files):
1896
        """As a special workaround create critical control files for a remote working tree
1897
        
1898
        This ensures that it can later be updated and dealt with locally,
1899
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
1900
        no working tree.  (See bug #43064).
1901
        """
1902
        sio = StringIO()
1903
        inv = Inventory()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1904
        xml5.serializer_v5.write_inventory(inv, sio)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
1905
        sio.seek(0)
1906
        control_files.put('inventory', sio)
1907
1908
        control_files.put_utf8('pending-merges', '')
1909
        
1910
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1911
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1912
        """See WorkingTreeFormat.initialize()."""
1913
        if not isinstance(a_bzrdir.transport, LocalTransport):
1914
            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.
1915
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1916
        if revision_id is not None:
1917
            branch.lock_write()
1918
            try:
1919
                revision_history = branch.revision_history()
1920
                try:
1921
                    position = revision_history.index(revision_id)
1922
                except ValueError:
1923
                    raise errors.NoSuchRevision(branch, revision_id)
1924
                branch.set_revision_history(revision_history[:position + 1])
1925
            finally:
1926
                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.
1927
        revision = branch.last_revision()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1928
        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.
1929
        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.
1930
                         branch,
1931
                         inv,
1932
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1933
                         _format=self,
1934
                         _bzrdir=a_bzrdir)
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1935
        basis_tree = branch.repository.revision_tree(revision)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1936
        if basis_tree.inventory.root is not None:
1986.5.8 by Robert Collins
Merge bzr.dev.
1937
            wt.set_root_id(basis_tree.inventory.root.file_id)
1938
        # 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.
1939
        wt.set_parent_trees([(revision, basis_tree)])
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1940
        transform.build_tree(basis_tree, wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1941
        return wt
1942
1943
    def __init__(self):
1944
        super(WorkingTreeFormat2, self).__init__()
1945
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1946
1947
    def open(self, a_bzrdir, _found=False):
1948
        """Return the WorkingTree object for a_bzrdir
1949
1950
        _found is a private parameter, do not use it. It is used to indicate
1951
               if format probing has already been done.
1952
        """
1953
        if not _found:
1954
            # we are being called directly and must probe.
1955
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1956
        if not isinstance(a_bzrdir.transport, LocalTransport):
1957
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
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.
1958
        return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1959
                           _internal=True,
1960
                           _format=self,
1961
                           _bzrdir=a_bzrdir)
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1962
1963
1964
class WorkingTreeFormat3(WorkingTreeFormat):
1965
    """The second working tree format updated to record a format marker.
1966
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1967
    This format:
1968
        - exists within a metadir controlling .bzr
1969
        - includes an explicit version marker for the workingtree control
1970
          files, separate from the BzrDir format
1971
        - modifies the hash cache format
1972
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
1973
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1974
    """
1975
1976
    def get_format_string(self):
1977
        """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
1978
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1979
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1980
    def get_format_description(self):
1981
        """See WorkingTreeFormat.get_format_description()."""
1982
        return "Working tree format 3"
1983
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1984
    _lock_file_name = 'lock'
1985
    _lock_class = LockDir
1986
1987
    def _open_control_files(self, a_bzrdir):
1988
        transport = a_bzrdir.get_workingtree_transport(None)
1989
        return LockableFiles(transport, self._lock_file_name, 
1990
                             self._lock_class)
1991
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1992
    def initialize(self, a_bzrdir, revision_id=None):
1993
        """See WorkingTreeFormat.initialize().
1994
        
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1995
        revision_id allows creating a working tree at a different
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1996
        revision than the branch is at.
1997
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1998
        if not isinstance(a_bzrdir.transport, LocalTransport):
1999
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2000
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2001
        control_files = self._open_control_files(a_bzrdir)
2002
        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.
2003
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2004
        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.
2005
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2006
        if revision_id is None:
2007
            revision_id = branch.last_revision()
2084.1.1 by John Arbash Meinel
Don't create new working trees with unique roots, because it breaks older versions of bzr
2008
        # WorkingTree3 can handle an inventory which has a unique root id.
2009
        # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2010
        # those trees. And because there isn't a format bump inbetween, we
2011
        # are maintaining compatibility with older clients.
2012
        # inv = Inventory(root_id=gen_root_id())
2013
        inv = Inventory()
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
2014
        wt = WorkingTree3(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.
2015
                         branch,
2016
                         inv,
2017
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2018
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2019
                         _bzrdir=a_bzrdir,
2020
                         _control_files=control_files)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
2021
        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.
2022
        try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2023
            basis_tree = branch.repository.revision_tree(revision_id)
1986.5.8 by Robert Collins
Merge bzr.dev.
2024
            # only set an explicit root id if there is one to set.
2025
            if basis_tree.inventory.root is not None:
2026
                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.
2027
            if revision_id == NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
2028
                wt.set_parent_trees([])
2029
            else:
2030
                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.
2031
            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.
2032
        finally:
1986.5.7 by Robert Collins
Merge reviews.
2033
            # 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)
2034
            # WorkingTree is given a chance to fire.
2035
            control_files.unlock()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
2036
            wt.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2037
        return wt
2038
2039
    def __init__(self):
2040
        super(WorkingTreeFormat3, self).__init__()
2041
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2042
2043
    def open(self, a_bzrdir, _found=False):
2044
        """Return the WorkingTree object for a_bzrdir
2045
2046
        _found is a private parameter, do not use it. It is used to indicate
2047
               if format probing has already been done.
2048
        """
2049
        if not _found:
2050
            # we are being called directly and must probe.
2051
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2052
        if not isinstance(a_bzrdir.transport, LocalTransport):
2053
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2054
        return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2055
2056
    def _open(self, a_bzrdir, control_files):
2057
        """Open the tree itself.
2058
        
2059
        :param a_bzrdir: the dir for the tree.
2060
        :param control_files: the control files for the tree.
2061
        """
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
2062
        return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2063
                           _internal=True,
2064
                           _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2065
                           _bzrdir=a_bzrdir,
2066
                           _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2067
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
2068
    def __str__(self):
2069
        return self.get_format_string()
2070
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2071
2072
# formats which have no format string are not discoverable
2073
# and not independently creatable, so are not registered.
2074
__default_format = WorkingTreeFormat3()
2075
WorkingTreeFormat.register_format(__default_format)
2076
WorkingTreeFormat.set_default_format(__default_format)
2077
_legacy_formats = [WorkingTreeFormat2(),
2078
                   ]
2079
2080
2081
class WorkingTreeTestProviderAdapter(object):
2082
    """A tool to generate a suite testing multiple workingtree formats at once.
2083
2084
    This is done by copying the test once for each transport and injecting
2085
    the transport_server, transport_readonly_server, and workingtree_format
2086
    classes into each copy. Each copy is also given a new id() to make it
2087
    easy to identify.
2088
    """
2089
2090
    def __init__(self, transport_server, transport_readonly_server, formats):
2091
        self._transport_server = transport_server
2092
        self._transport_readonly_server = transport_readonly_server
2093
        self._formats = formats
2094
    
1852.6.1 by Robert Collins
Start tree implementation tests.
2095
    def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2096
        """Clone test for adaption."""
2097
        new_test = deepcopy(test)
2098
        new_test.transport_server = self._transport_server
2099
        new_test.transport_readonly_server = self._transport_readonly_server
2100
        new_test.bzrdir_format = bzrdir_format
2101
        new_test.workingtree_format = workingtree_format
2102
        def make_new_test_id():
2103
            new_id = "%s(%s)" % (test.id(), variation)
2104
            return lambda: new_id
2105
        new_test.id = make_new_test_id()
2106
        return new_test
2107
    
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2108
    def adapt(self, test):
2109
        from bzrlib.tests import TestSuite
2110
        result = TestSuite()
2111
        for workingtree_format, bzrdir_format in self._formats:
1852.6.1 by Robert Collins
Start tree implementation tests.
2112
            new_test = self._clone_test(
2113
                test,
2114
                bzrdir_format,
2115
                workingtree_format, workingtree_format.__class__.__name__)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2116
            result.addTest(new_test)
2117
        return result