/brz/remove-bazaar

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