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