/brz/remove-bazaar

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