/brz/remove-bazaar

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