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