~bzr-pqm/bzr/bzr.dev

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