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