/brz/remove-bazaar

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