/brz/remove-bazaar

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