/brz/remove-bazaar

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