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