/brz/remove-bazaar

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