/brz/remove-bazaar

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