/brz/remove-bazaar

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