/brz/remove-bazaar

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