/brz/remove-bazaar

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