/brz/remove-bazaar

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