/brz/remove-bazaar

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