/brz/remove-bazaar

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