/brz/remove-bazaar

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