/brz/remove-bazaar

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