~bzr-pqm/bzr/bzr.dev

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