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