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