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