/brz/remove-bazaar

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