/brz/remove-bazaar

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