/brz/remove-bazaar

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