~bzr-pqm/bzr/bzr.dev

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