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