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