/brz/remove-bazaar

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