/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)
1910.2.1 by Aaron Bentley
Ensure root entry always has a revision
402
                inv.root.revision = revision_id
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
403
            except NoSuchFile:
404
                inv = None
405
            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()
406
                return bzrlib.tree.RevisionTree(self.branch.repository, inv,
407
                                                revision_id)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
408
        # 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()
409
        return self.branch.repository.revision_tree(revision_id)
453 by Martin Pool
- Split WorkingTree into its own file
410
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
411
    @staticmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
412
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
413
    def create(branch, directory):
414
        """Create a workingtree for branch at directory.
415
416
        If existing_directory already exists it must have a .bzr directory.
417
        If it does not exist, it will be created.
418
419
        This returns a new WorkingTree object for the new checkout.
420
421
        TODO FIXME RBC 20060124 when we have checkout formats in place this
422
        should accept an optional revisionid to checkout [and reject this if
423
        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
424
425
        XXX: When BzrDir is present, these should be created through that 
426
        interface instead.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
427
        """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
428
        warnings.warn('delete WorkingTree.create', stacklevel=3)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
429
        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.
430
        if branch.bzrdir.root_transport.base == transport.base:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
431
            # same dir 
432
            return branch.bzrdir.create_workingtree()
433
        # different directory, 
434
        # create a branch reference
435
        # and now a working tree.
436
        raise NotImplementedError
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
437
 
438
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
439
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
440
    def create_standalone(directory):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
441
        """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.
442
443
        Directory must exist and be empty.
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
444
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
445
        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.
446
        """
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
447
        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.
448
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
449
    def relpath(self, path):
450
        """Return the local path portion from a given path.
451
        
452
        The path may be absolute or relative. If its a relative path it is 
453
        interpreted relative to the python current working directory.
454
        """
455
        return relpath(self.basedir, path)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
456
453 by Martin Pool
- Split WorkingTree into its own file
457
    def has_filename(self, filename):
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
458
        return osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
459
460
    def get_file(self, file_id):
461
        return self.get_file_byname(self.id2path(file_id))
462
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
463
    def get_file_text(self, file_id):
464
        return self.get_file(file_id).read()
465
453 by Martin Pool
- Split WorkingTree into its own file
466
    def get_file_byname(self, filename):
467
        return file(self.abspath(filename), 'rb')
468
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
469
    def get_parent_ids(self):
470
        """See Tree.get_parent_ids.
471
        
472
        This implementation reads the pending merges list and last_revision
473
        value and uses that to decide what the parents list should be.
474
        """
475
        last_rev = self.last_revision()
476
        if last_rev is None:
477
            parents = []
478
        else:
479
            parents = [last_rev]
480
        other_parents = self.pending_merges()
481
        return parents + other_parents
482
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
483
    def get_root_id(self):
484
        """Return the id of this trees root"""
485
        inv = self.read_working_inventory()
486
        return inv.root.file_id
487
        
453 by Martin Pool
- Split WorkingTree into its own file
488
    def _get_store_filename(self, file_id):
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
489
        ## XXX: badly named; this is not in the store at all
453 by Martin Pool
- Split WorkingTree into its own file
490
        return self.abspath(self.id2path(file_id))
491
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
492
    @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.
493
    def clone(self, to_bzrdir, revision_id=None, basis=None):
494
        """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()
495
        
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.
496
        Specifically modified files are kept as modified, but
497
        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()
498
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.
499
        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()
500
501
        revision
502
            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.
503
            revision, and and difference between the source trees last revision
504
            and this one merged in.
505
506
        basis
507
            If not None, a closer copy of a tree which may have some files in
508
            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()
509
        """
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.
510
        # assumes the target bzr dir format is compatible.
511
        result = self._format.initialize(to_bzrdir)
512
        self.copy_content_into(result, revision_id)
513
        return result
514
515
    @needs_read_lock
516
    def copy_content_into(self, tree, revision_id=None):
517
        """Copy the current content and user files of this tree into tree."""
518
        if revision_id is None:
519
            transform_tree(tree, self)
520
        else:
521
            # TODO now merge from tree.last_revision to revision
522
            transform_tree(tree, self)
523
            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()
524
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
525
    @needs_write_lock
1593.1.1 by Robert Collins
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
526
    def commit(self, message=None, revprops=None, *args, **kwargs):
527
        # avoid circular imports
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
528
        from bzrlib.commit import Commit
1593.1.1 by Robert Collins
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
529
        if revprops is None:
530
            revprops = {}
531
        if not 'branch-nick' in revprops:
532
            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.
533
        # args for wt.commit start at message from the Commit.commit method,
534
        # but with branch a kwarg now, passing in args as is results in the
535
        #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.
536
        args = (DEPRECATED_PARAMETER, message, ) + args
1773.1.1 by Robert Collins
Teach WorkingTree.commit to return the committed revision id.
537
        committed_id = Commit().commit( working_tree=self, revprops=revprops,
538
            *args, **kwargs)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
539
        self._set_inventory(self.read_working_inventory())
1773.1.1 by Robert Collins
Teach WorkingTree.commit to return the committed revision id.
540
        return committed_id
1248 by Martin Pool
- new weave based cleanup [broken]
541
542
    def id2abspath(self, file_id):
543
        return self.abspath(self.id2path(file_id))
544
1185.12.39 by abentley
Propogated has_or_had_id to Tree
545
    def has_id(self, file_id):
453 by Martin Pool
- Split WorkingTree into its own file
546
        # files that have been deleted are excluded
1185.12.39 by abentley
Propogated has_or_had_id to Tree
547
        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.
548
        if not inv.has_id(file_id):
453 by Martin Pool
- Split WorkingTree into its own file
549
            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.
550
        path = inv.id2path(file_id)
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
551
        return osutils.lexists(self.abspath(path))
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
552
1185.12.39 by abentley
Propogated has_or_had_id to Tree
553
    def has_or_had_id(self, file_id):
554
        if file_id == self.inventory.root.file_id:
555
            return True
556
        return self.inventory.has_id(file_id)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
557
558
    __contains__ = has_id
559
453 by Martin Pool
- Split WorkingTree into its own file
560
    def get_file_size(self, file_id):
1248 by Martin Pool
- new weave based cleanup [broken]
561
        return os.path.getsize(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
562
1185.60.6 by Aaron Bentley
Fixed hashcache
563
    @needs_read_lock
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
564
    def get_file_sha1(self, file_id, path=None):
565
        if not path:
566
            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.
567
        return self._hashcache.get_sha1(path)
453 by Martin Pool
- Split WorkingTree into its own file
568
1740.2.5 by Aaron Bentley
Merge from bzr.dev
569
    def get_file_mtime(self, file_id, path=None):
570
        if not path:
571
            path = self._inventory.id2path(file_id)
572
        return os.lstat(self.abspath(path)).st_mtime
573
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
574
    if not supports_executable():
575
        def is_executable(self, file_id, path=None):
1398 by Robert Collins
integrate in Gustavos x-bit patch
576
            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
577
    else:
578
        def is_executable(self, file_id, path=None):
579
            if not path:
580
                path = self._inventory.id2path(file_id)
1398 by Robert Collins
integrate in Gustavos x-bit patch
581
            mode = os.lstat(self.abspath(path)).st_mode
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
582
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1398 by Robert Collins
integrate in Gustavos x-bit patch
583
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
584
    @needs_write_lock
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
585
    def add(self, files, ids=None):
586
        """Make files versioned.
587
588
        Note that the command line normally calls smart_add instead,
589
        which can automatically recurse.
590
591
        This adds the files to the inventory, so that they will be
592
        recorded by the next commit.
593
594
        files
595
            List of paths to add, relative to the base of the tree.
596
597
        ids
598
            If set, use these instead of automatically generated ids.
599
            Must be the same length as the list of files, but may
600
            contain None for ids that are to be autogenerated.
601
602
        TODO: Perhaps have an option to add the ids even if the files do
603
              not (yet) exist.
604
605
        TODO: Perhaps callback with the ids and paths as they're added.
606
        """
607
        # TODO: Re-adding a file that is removed in the working copy
608
        # should probably put it back with the previous ID.
609
        if isinstance(files, basestring):
610
            assert(ids is None or isinstance(ids, basestring))
611
            files = [files]
612
            if ids is not None:
613
                ids = [ids]
614
615
        if ids is None:
616
            ids = [None] * len(files)
617
        else:
618
            assert(len(ids) == len(files))
619
620
        inv = self.read_working_inventory()
621
        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.
622
            if self.is_control_filename(f):
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
623
                raise errors.ForbiddenControlFileError(filename=f)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
624
625
            fp = splitpath(f)
626
627
            if len(fp) == 0:
628
                raise BzrError("cannot add top-level %r" % f)
629
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
630
            fullpath = normpath(self.abspath(f))
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
631
            try:
632
                kind = file_kind(fullpath)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
633
            except OSError, e:
634
                if e.errno == errno.ENOENT:
635
                    raise NoSuchFile(fullpath)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
636
            if not InventoryEntry.versionable_kind(kind):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
637
                raise errors.BadFileKindError(filename=f, kind=kind)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
638
            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'.
639
                inv.add_path(f, kind=kind)
640
            else:
641
                inv.add_path(f, kind=kind, file_id=file_id)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
642
643
        self._write_inventory(inv)
644
645
    @needs_write_lock
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
646
    def add_pending_merge(self, *revision_ids):
647
        # TODO: Perhaps should check at this point that the
648
        # history of the revision is actually present?
649
        p = self.pending_merges()
650
        updated = False
651
        for rev_id in revision_ids:
652
            if rev_id in p:
653
                continue
654
            p.append(rev_id)
655
            updated = True
656
        if updated:
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
657
            self.set_pending_merges(p)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
658
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
659
    @needs_read_lock
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
660
    def pending_merges(self):
661
        """Return a list of pending merges.
662
663
        These are revisions that have been merged into the working
664
        directory but not yet committed.
665
        """
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
666
        try:
1534.4.28 by Robert Collins
first cut at merge from integration.
667
            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.
668
        except NoSuchFile:
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
669
            return []
670
        p = []
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
671
        for l in merges_file.readlines():
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
672
            p.append(l.rstrip('\n'))
673
        return p
674
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
675
    @needs_write_lock
676
    def set_pending_merges(self, rev_list):
1534.4.28 by Robert Collins
first cut at merge from integration.
677
        self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
678
1534.7.192 by Aaron Bentley
Record hashes produced by merges
679
    @needs_write_lock
680
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
681
        def iter_stanzas():
682
            for file_id, hash in modified_hashes.iteritems():
683
                yield Stanza(file_id=file_id, hash=hash)
684
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
685
686
    @needs_write_lock
687
    def _put_rio(self, filename, stanzas, header):
688
        my_file = rio_file(stanzas, header)
689
        self._control_files.put(filename, my_file)
1534.7.192 by Aaron Bentley
Record hashes produced by merges
690
691
    @needs_read_lock
692
    def merge_modified(self):
693
        try:
694
            hashfile = self._control_files.get('merge-hashes')
695
        except NoSuchFile:
696
            return {}
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
697
        merge_hashes = {}
698
        try:
699
            if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
700
                raise MergeModifiedFormatError()
701
        except StopIteration:
702
            raise MergeModifiedFormatError()
703
        for s in RioReader(hashfile):
1534.7.198 by Aaron Bentley
Removed spurious encode/decode
704
            file_id = s.get("file_id")
1558.12.10 by Aaron Bentley
Be robust when merge_hash file_id not in inventory
705
            if file_id not in self.inventory:
706
                continue
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
707
            hash = s.get("hash")
708
            if hash == self.get_file_sha1(file_id):
709
                merge_hashes[file_id] = hash
710
        return merge_hashes
1534.7.192 by Aaron Bentley
Record hashes produced by merges
711
1092.2.6 by Robert Collins
symlink support updated to work
712
    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
713
        return os.readlink(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
714
715
    def file_class(self, filename):
716
        if self.path2id(filename):
717
            return 'V'
718
        elif self.is_ignored(filename):
719
            return 'I'
720
        else:
721
            return '?'
722
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
723
    def list_files(self):
1732.1.6 by John Arbash Meinel
Fix documentation bug in workingtree.list_files
724
        """Recursively list all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
725
726
        Lists, but does not descend into unversioned directories.
727
728
        This does not include files that have been deleted in this
729
        tree.
730
731
        Skips the control directory.
732
        """
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.
733
        inv = self._inventory
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
734
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
735
        pathjoin = osutils.pathjoin
736
        file_kind = osutils.file_kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
737
738
        # transport.base ends in a slash, we want the piece
739
        # between the last two slashes
740
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
741
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
742
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
743
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
744
        # directory file_id, relative path, absolute path, reverse sorted children
745
        children = os.listdir(self.basedir)
746
        children.sort()
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
747
        # jam 20060527 The kernel sized tree seems equivalent whether we 
748
        # use a deque and popleft to keep them sorted, or if we use a plain
749
        # 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.
750
        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
751
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
752
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
753
            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
754
755
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
756
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
757
                ## TODO: If we find a subdirectory with its own .bzr
758
                ## directory, then that is a separate tree and we
759
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
760
761
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
762
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
763
                    continue
764
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
765
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
766
                # 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
767
                # than the checks of pathjoin(), all relative paths will have an extra slash
768
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
769
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
770
771
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
772
                fap = from_dir_abspath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
773
                
774
                f_ie = inv.get_child(from_dir_id, f)
775
                if f_ie:
776
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
777
                elif self.is_ignored(fp[1:]):
778
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
779
                else:
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
780
                    # we may not have found this file, because of a unicode issue
781
                    f_norm, can_access = osutils.normalized_filename(f)
782
                    if f == f_norm or not can_access:
783
                        # No change, so treat this file normally
784
                        c = '?'
785
                    else:
786
                        # this file can be accessed by a normalized path
787
                        # check again if it is versioned
788
                        # these lines are repeated here for performance
789
                        f = f_norm
790
                        fp = from_dir_relpath + '/' + f
791
                        fap = from_dir_abspath + '/' + f
792
                        f_ie = inv.get_child(from_dir_id, f)
793
                        if f_ie:
794
                            c = 'V'
795
                        elif self.is_ignored(fp[1:]):
796
                            c = 'I'
797
                        else:
798
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
799
800
                fk = file_kind(fap)
801
802
                if f_ie:
803
                    if f_ie.kind != fk:
804
                        raise BzrCheckError("file %r entered as kind %r id %r, "
805
                                            "now of kind %r"
806
                                            % (fap, f_ie.kind, f_ie.file_id, fk))
807
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
808
                # make a last minute entry
809
                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
810
                    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
811
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
812
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
813
                        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
814
                    except KeyError:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
815
                        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.
816
                    continue
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
817
                
453 by Martin Pool
- Split WorkingTree into its own file
818
                if fk != 'directory':
819
                    continue
820
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
821
                # 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.
822
                new_children = os.listdir(fap)
823
                new_children.sort()
824
                new_children = collections.deque(new_children)
825
                stack.append((f_ie.file_id, fp, fap, new_children))
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
826
                # Break out of inner loop, so that we start outer loop with child
827
                break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
828
            else:
829
                # 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.
830
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
831
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
832
833
    @needs_write_lock
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
834
    def move(self, from_paths, to_name):
835
        """Rename files.
836
837
        to_name must exist in the inventory.
838
839
        If to_name exists and is a directory, the files are moved into
840
        it, keeping their old names.  
841
842
        Note that to_name is only the last component of the new name;
843
        this doesn't change the directory.
844
845
        This returns a list of (from_path, to_path) pairs for each
846
        entry that is moved.
847
        """
848
        result = []
849
        ## TODO: Option to move IDs only
850
        assert not isinstance(from_paths, basestring)
851
        inv = self.inventory
852
        to_abs = self.abspath(to_name)
853
        if not isdir(to_abs):
854
            raise BzrError("destination %r is not a directory" % to_abs)
855
        if not self.has_filename(to_name):
856
            raise BzrError("destination %r not in working directory" % to_abs)
857
        to_dir_id = inv.path2id(to_name)
858
        if to_dir_id == None and to_name != '':
859
            raise BzrError("destination %r is not a versioned directory" % to_name)
860
        to_dir_ie = inv[to_dir_id]
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
861
        if to_dir_ie.kind != 'directory':
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
862
            raise BzrError("destination %r is not a directory" % to_abs)
863
864
        to_idpath = inv.get_idpath(to_dir_id)
865
866
        for f in from_paths:
867
            if not self.has_filename(f):
868
                raise BzrError("%r does not exist in working tree" % f)
869
            f_id = inv.path2id(f)
870
            if f_id == None:
871
                raise BzrError("%r is not versioned" % f)
872
            name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
873
            dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
874
            if self.has_filename(dest_path):
875
                raise BzrError("destination %r already exists" % dest_path)
876
            if f_id in to_idpath:
877
                raise BzrError("can't move %r to a subdirectory of itself" % f)
878
879
        # OK, so there's a race here, it's possible that someone will
880
        # create a file in this interval and then the rename might be
881
        # left half-done.  But we should have caught most problems.
882
        orig_inv = deepcopy(self.inventory)
883
        try:
884
            for f in from_paths:
885
                name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
886
                dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
887
                result.append((f, dest_path))
888
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
889
                try:
890
                    rename(self.abspath(f), self.abspath(dest_path))
891
                except OSError, e:
892
                    raise BzrError("failed to rename %r to %r: %s" %
893
                                   (f, dest_path, e[1]),
894
                            ["rename rolled back"])
895
        except:
896
            # restore the inventory on error
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
897
            self._set_inventory(orig_inv)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
898
            raise
899
        self._write_inventory(inv)
900
        return result
901
902
    @needs_write_lock
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
903
    def rename_one(self, from_rel, to_rel):
904
        """Rename one file.
905
906
        This can change the directory or the filename or both.
907
        """
908
        inv = self.inventory
909
        if not self.has_filename(from_rel):
910
            raise BzrError("can't rename: old working file %r does not exist" % from_rel)
911
        if self.has_filename(to_rel):
912
            raise BzrError("can't rename: new working file %r already exists" % to_rel)
913
914
        file_id = inv.path2id(from_rel)
915
        if file_id == None:
916
            raise BzrError("can't rename: old name %r is not versioned" % from_rel)
917
918
        entry = inv[file_id]
919
        from_parent = entry.parent_id
920
        from_name = entry.name
921
        
922
        if inv.path2id(to_rel):
923
            raise BzrError("can't rename: new name %r is already versioned" % to_rel)
924
925
        to_dir, to_tail = os.path.split(to_rel)
926
        to_dir_id = inv.path2id(to_dir)
927
        if to_dir_id == None and to_dir != '':
928
            raise BzrError("can't determine destination directory id for %r" % to_dir)
929
930
        mutter("rename_one:")
931
        mutter("  file_id    {%s}" % file_id)
932
        mutter("  from_rel   %r" % from_rel)
933
        mutter("  to_rel     %r" % to_rel)
934
        mutter("  to_dir     %r" % to_dir)
935
        mutter("  to_dir_id  {%s}" % to_dir_id)
936
937
        inv.rename(file_id, to_dir_id, to_tail)
938
939
        from_abs = self.abspath(from_rel)
940
        to_abs = self.abspath(to_rel)
941
        try:
942
            rename(from_abs, to_abs)
943
        except OSError, e:
944
            inv.rename(file_id, from_parent, from_name)
945
            raise BzrError("failed to rename %r to %r: %s"
946
                    % (from_abs, to_abs, e[1]),
947
                    ["rename rolled back"])
948
        self._write_inventory(inv)
949
950
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
951
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
952
        """Return all unknown files.
953
954
        These are files in the working directory that are not versioned or
955
        control files or ignored.
956
        """
453 by Martin Pool
- Split WorkingTree into its own file
957
        for subp in self.extras():
958
            if not self.is_ignored(subp):
959
                yield subp
960
1534.10.16 by Aaron Bentley
Small tweaks
961
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
962
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
963
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
964
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
965
        return self._iter_conflicts()
966
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
967
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
968
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
969
        for info in self.list_files():
970
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
971
            stem = get_conflicted_stem(path)
972
            if stem is None:
973
                continue
974
            if stem not in conflicted:
975
                conflicted.add(stem)
976
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
977
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
978
    @needs_write_lock
1185.76.1 by Erik Bågfors
Support for --revision in pull
979
    def pull(self, source, overwrite=False, stop_revision=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
980
        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().
981
        source.lock_read()
982
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
983
            pp = ProgressPhase("Pull phase", 2, top_pb)
984
            pp.next_phase()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
985
            old_revision_history = self.branch.revision_history()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
986
            basis_tree = self.basis_tree()
1534.4.54 by Robert Collins
Merge from integration.
987
            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().
988
            new_revision_history = self.branch.revision_history()
989
            if new_revision_history != old_revision_history:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
990
                pp.next_phase()
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
991
                if len(old_revision_history):
992
                    other_revision = old_revision_history[-1]
993
                else:
994
                    other_revision = None
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
995
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
996
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
997
                try:
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
998
                    merge_inner(self.branch,
999
                                self.branch.basis_tree(),
1000
                                basis_tree, 
1001
                                this_tree=self, 
1002
                                pb=pb)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1003
                finally:
1004
                    pb.finished()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1005
                self.set_last_revision(self.branch.last_revision())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1006
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1007
        finally:
1008
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1009
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1010
453 by Martin Pool
- Split WorkingTree into its own file
1011
    def extras(self):
1012
        """Yield all unknown files in this WorkingTree.
1013
1014
        If there are any unknown directories then only the directory is
1015
        returned, not all its children.  But if there are unknown files
1016
        under a versioned subdirectory, they are returned.
1017
1018
        Currently returned depth-first, sorted by name within directories.
1019
        """
1020
        ## TODO: Work from given directory downwards
1021
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1022
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1023
            dirabs = self.abspath(path)
1024
            if not isdir(dirabs):
1025
                # e.g. directory deleted
1026
                continue
1027
1028
            fl = []
1029
            for subf in os.listdir(dirabs):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1030
                if subf == '.bzr':
1031
                    continue
1032
                if subf not in dir_entry.children:
1033
                    subf_norm, can_access = osutils.normalized_filename(subf)
1034
                    if subf_norm != subf and can_access:
1035
                        if subf_norm not in dir_entry.children:
1036
                            fl.append(subf_norm)
1037
                    else:
1038
                        fl.append(subf)
453 by Martin Pool
- Split WorkingTree into its own file
1039
            
1040
            fl.sort()
1041
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1042
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1043
                yield subp
1044
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1045
    def _translate_ignore_rule(self, rule):
1046
        """Translate a single ignore rule to a regex.
1047
1713.2.7 by Robert Collins
Better description of ignore rule types from Martin.
1048
        There are two types of ignore rules.  Those that do not contain a / are
1049
        matched against the tail of the filename (that is, they do not care
1050
        what directory the file is in.)  Rules which do contain a slash must
1051
        match the entire path.  As a special case, './' at the start of the
1052
        string counts as a slash in the string but is removed before matching
1053
        (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.
1054
1055
        :return: The translated regex.
1056
        """
1057
        if rule[:2] in ('./', '.\\'):
1058
            # rootdir rule
1059
            result = fnmatch.translate(rule[2:])
1060
        elif '/' in rule or '\\' in rule:
1061
            # path prefix 
1062
            result = fnmatch.translate(rule)
1063
        else:
1064
            # default rule style.
1065
            result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1066
        assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1067
        return "(" + result + ")"
1068
1069
    def _combine_ignore_rules(self, rules):
1070
        """Combine a list of ignore rules into a single regex object.
1071
1072
        Each individual rule is combined with | to form a big regex, which then
1073
        has $ added to it to form something like ()|()|()$. The group index for
1074
        each subregex's outermost group is placed in a dictionary mapping back 
1075
        to the rule. This allows quick identification of the matching rule that
1076
        triggered a match.
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1077
        :return: a list of the compiled regex and the matching-group index 
1078
        dictionaries. We return a list because python complains if you try to 
1079
        combine more than 100 regexes.
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1080
        """
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1081
        result = []
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1082
        groups = {}
1083
        next_group = 0
1084
        translated_rules = []
1085
        for rule in rules:
1086
            translated_rule = self._translate_ignore_rule(rule)
1087
            compiled_rule = re.compile(translated_rule)
1088
            groups[next_group] = rule
1089
            next_group += compiled_rule.groups
1090
            translated_rules.append(translated_rule)
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1091
            if next_group == 99:
1092
                result.append((re.compile("|".join(translated_rules)), groups))
1093
                groups = {}
1094
                next_group = 0
1095
                translated_rules = []
1096
        if len(translated_rules):
1097
            result.append((re.compile("|".join(translated_rules)), groups))
1098
        return result
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1099
453 by Martin Pool
- Split WorkingTree into its own file
1100
    def ignored_files(self):
1101
        """Yield list of PATH, IGNORE_PATTERN"""
1102
        for subp in self.extras():
1103
            pat = self.is_ignored(subp)
1104
            if pat != None:
1105
                yield subp, pat
1106
1107
    def get_ignore_list(self):
1108
        """Return list of ignore patterns.
1109
1110
        Cached in the Tree object after the first call.
1111
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1112
        ignoreset = getattr(self, '_ignoreset', None)
1113
        if ignoreset is not None:
1114
            return ignoreset
1115
1116
        ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1117
        ignore_globs.update(ignores.get_runtime_ignores())
1118
1119
        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
1120
453 by Martin Pool
- Split WorkingTree into its own file
1121
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1122
            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
1123
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1124
                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
1125
            finally:
1126
                f.close()
1127
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1128
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1129
        self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1130
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1131
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1132
    def _get_ignore_rules_as_regex(self):
1133
        """Return a regex of the ignore rules and a mapping dict.
1134
1135
        :return: (ignore rules compiled regex, dictionary mapping rule group 
1136
        indices to original rule.)
1137
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1138
        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.
1139
            self.get_ignore_list()
1140
        return self._ignore_regex
1141
453 by Martin Pool
- Split WorkingTree into its own file
1142
    def is_ignored(self, filename):
1143
        r"""Check whether the filename matches an ignore pattern.
1144
1145
        Patterns containing '/' or '\' need to match the whole path;
1146
        others match against only the last component.
1147
1148
        If the file is ignored, returns the pattern which caused it to
1149
        be ignored, otherwise None.  So this can simply be used as a
1150
        boolean if desired."""
1151
1152
        # TODO: Use '**' to match directories, and other extended
1153
        # globbing stuff from cvs/rsync.
1154
1155
        # XXX: fnmatch is actually not quite what we want: it's only
1156
        # approximately the same as real Unix fnmatch, and doesn't
1157
        # treat dotfiles correctly and allows * to match /.
1158
        # Eventually it should be replaced with something more
1159
        # accurate.
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1160
    
1161
        rules = self._get_ignore_rules_as_regex()
1162
        for regex, mapping in rules:
1163
            match = regex.match(filename)
1164
            if match is not None:
1165
                # one or more of the groups in mapping will have a non-None group 
1166
                # match.
1167
                groups = match.groups()
1168
                rules = [mapping[group] for group in 
1169
                    mapping if groups[group] is not None]
1170
                return rules[0]
1707.2.5 by Robert Collins
slightly improve add
1171
        return None
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1172
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1173
    def kind(self, file_id):
1174
        return file_kind(self.id2abspath(file_id))
1175
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1176
    @needs_read_lock
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1177
    def last_revision(self):
1178
        """Return the last revision id of this working tree.
1179
1180
        In early branch formats this was == the branch last_revision,
1181
        but that cannot be relied upon - for working tree operations,
1182
        always use tree.last_revision().
1183
        """
1184
        return self.branch.last_revision()
1185
1694.2.6 by Martin Pool
[merge] bzr.dev
1186
    def is_locked(self):
1187
        return self._control_files.is_locked()
1188
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1189
    def lock_read(self):
1190
        """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.
1191
        self.branch.lock_read()
1192
        try:
1193
            return self._control_files.lock_read()
1194
        except:
1195
            self.branch.unlock()
1196
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1197
1198
    def lock_write(self):
1199
        """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.
1200
        self.branch.lock_write()
1201
        try:
1202
            return self._control_files.lock_write()
1203
        except:
1204
            self.branch.unlock()
1205
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1206
1694.2.6 by Martin Pool
[merge] bzr.dev
1207
    def get_physical_lock_status(self):
1208
        return self._control_files.get_physical_lock_status()
1209
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1210
    def _basis_inventory_name(self):
1211
        return 'basis-inventory'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1212
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1213
    @needs_write_lock
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1214
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1215
        """Change the last revision in the working tree."""
1216
        if self._change_last_revision(new_revision):
1217
            self._cache_basis_inventory(new_revision)
1218
1219
    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.
1220
        """Template method part of set_last_revision to perform the change.
1221
        
1222
        This is used to allow WorkingTree3 instances to not affect branch
1223
        when their last revision is set.
1224
        """
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1225
        if new_revision is None:
1226
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1227
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1228
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1229
            self.branch.generate_revision_history(new_revision)
1230
        except errors.NoSuchRevision:
1231
            # not present in the repo - dont try to set it deeper than the tip
1232
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1233
        return True
1234
1235
    def _cache_basis_inventory(self, new_revision):
1236
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1237
        # TODO: this should allow the ready-to-use inventory to be passed in,
1238
        # as commit already has that ready-to-use [while the format is the
1239
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1240
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1241
            # this double handles the inventory - unpack and repack - 
1242
            # but is easier to understand. We can/should put a conditional
1243
            # in here based on whether the inventory is in the latest format
1244
            # - perhaps we should repack all inventories on a repository
1245
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1246
            # the fast path is to copy the raw xml from the repository. If the
1247
            # xml contains 'revision_id="', then we assume the right 
1248
            # revision_id is set. We must check for this full string, because a
1249
            # root node id can legitimately look like 'revision_id' but cannot
1250
            # contain a '"'.
1251
            xml = self.branch.repository.get_inventory_xml(new_revision)
1252
            if not 'revision_id="' in xml.split('\n', 1)[0]:
1253
                inv = self.branch.repository.deserialise_inventory(
1254
                    new_revision, xml)
1255
                inv.revision_id = new_revision
1256
                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.
1257
            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.
1258
            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.
1259
            sio = StringIO(xml)
1260
            self._control_files.put(path, sio)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1261
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1262
            pass
1263
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1264
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1265
        """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.
1266
        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.
1267
        return self._control_files.get(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1268
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1269
    @needs_read_lock
1270
    def read_working_inventory(self):
1271
        """Read the working inventory."""
1272
        # ElementTree does its own conversion from UTF-8, so open in
1273
        # binary.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1274
        result = bzrlib.xml5.serializer_v5.read_inventory(
1534.4.28 by Robert Collins
first cut at merge from integration.
1275
            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()
1276
        self._set_inventory(result)
1277
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1278
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1279
    @needs_write_lock
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1280
    def remove(self, files, verbose=False, to_file=None):
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1281
        """Remove nominated files from the working inventory..
1282
1283
        This does not remove their text.  This does not run on XXX on what? RBC
1284
1285
        TODO: Refuse to remove modified files unless --force is given?
1286
1287
        TODO: Do something useful with directories.
1288
1289
        TODO: Should this remove the text or not?  Tough call; not
1290
        removing may be useful and the user can just use use rm, and
1291
        is the opposite of add.  Removing it is consistent with most
1292
        other tools.  Maybe an option.
1293
        """
1294
        ## TODO: Normalize names
1295
        ## TODO: Remove nested loops; better scalability
1296
        if isinstance(files, basestring):
1297
            files = [files]
1298
1299
        inv = self.inventory
1300
1301
        # do this before any modifications
1302
        for f in files:
1303
            fid = inv.path2id(f)
1304
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
1305
                # TODO: Perhaps make this just a warning, and continue?
1306
                # This tends to happen when 
1307
                raise NotVersionedError(path=f)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1308
            if verbose:
1309
                # having remove it, it must be either ignored or unknown
1310
                if self.is_ignored(f):
1311
                    new_status = 'I'
1312
                else:
1313
                    new_status = '?'
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1314
                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.
1315
            del inv[fid]
1316
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1317
        self._write_inventory(inv)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1318
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1319
    @needs_write_lock
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1320
    def revert(self, filenames, old_tree=None, backups=True, 
1321
               pb=DummyProgress()):
1534.7.47 by Aaron Bentley
Started work on 'revert'
1322
        from transform import revert
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1323
        from conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1324
        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()
1325
            old_tree = self.basis_tree()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1326
        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.
1327
        if not len(filenames):
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
1328
            self.set_pending_merges([])
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1329
            resolve(self)
1330
        else:
1534.10.15 by Aaron Bentley
Revert does resolve
1331
            resolve(self, filenames, ignore_misses=True)
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1332
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1333
1658.1.3 by Martin Pool
Doc
1334
    # XXX: This method should be deprecated in favour of taking in a proper
1335
    # new Inventory object.
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1336
    @needs_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1337
    def set_inventory(self, new_inventory_list):
1338
        from bzrlib.inventory import (Inventory,
1339
                                      InventoryDirectory,
1340
                                      InventoryEntry,
1341
                                      InventoryFile,
1342
                                      InventoryLink)
1343
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1344
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1345
            name = os.path.basename(path)
1346
            if name == "":
1347
                continue
1348
            # fixme, there should be a factory function inv,add_?? 
1349
            if kind == 'directory':
1350
                inv.add(InventoryDirectory(file_id, name, parent))
1351
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1352
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1353
            elif kind == 'symlink':
1354
                inv.add(InventoryLink(file_id, name, parent))
1355
            else:
1356
                raise BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1357
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1358
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1359
    @needs_write_lock
1360
    def set_root_id(self, file_id):
1361
        """Set the root id for this tree."""
1362
        inv = self.read_working_inventory()
1363
        orig_root_id = inv.root.file_id
1364
        del inv._byid[inv.root.file_id]
1365
        inv.root.file_id = file_id
1366
        inv._byid[inv.root.file_id] = inv.root
1367
        for fid in inv:
1368
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1369
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1370
                entry.parent_id = inv.root.file_id
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1371
        self._write_inventory(inv)
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1372
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1373
    def unlock(self):
1374
        """See Branch.unlock.
1375
        
1376
        WorkingTree locking just uses the Branch locking facilities.
1377
        This is current because all working trees have an embedded branch
1378
        within them. IF in the future, we were to make branch data shareable
1379
        between multiple working trees, i.e. via shared storage, then we 
1380
        would probably want to lock both the local tree, and the branch.
1381
        """
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.
1382
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1383
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1384
    @needs_write_lock
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1385
    def update(self):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1386
        """Update a working tree along its branch.
1387
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1388
        This will update the branch if its bound too, which means we have multiple trees involved:
1389
        The new basis tree of the master.
1390
        The old basis tree of the branch.
1391
        The old basis tree of the working tree.
1392
        The current working tree state.
1393
        pathologically all three may be different, and non ancestors of each other.
1394
        Conceptually we want to:
1395
        Preserve the wt.basis->wt.state changes
1396
        Transform the wt.basis to the new master basis.
1397
        Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1398
        Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1399
1400
        There isn't a single operation at the moment to do that, so we:
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1401
        Merge current state -> basis tree of the master w.r.t. the old tree basis.
1402
        Do a 'normal' merge of the old branch basis if it is relevant.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1403
        """
1587.1.10 by Robert Collins
update updates working tree and branch together.
1404
        old_tip = self.branch.update()
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1405
        if old_tip is not None:
1406
            self.add_pending_merge(old_tip)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1407
        self.branch.lock_read()
1408
        try:
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1409
            result = 0
1410
            if self.last_revision() != self.branch.last_revision():
1411
                # merge tree state up to new branch tip.
1412
                basis = self.basis_tree()
1413
                to_tree = self.branch.basis_tree()
1414
                result += merge_inner(self.branch,
1415
                                      to_tree,
1416
                                      basis,
1417
                                      this_tree=self)
1418
                self.set_last_revision(self.branch.last_revision())
1419
            if old_tip and old_tip != self.last_revision():
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1420
                # our last revision was not the prior branch last revision
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1421
                # and we have converted that last revision to a pending merge.
1422
                # base is somewhere between the branch tip now
1423
                # and the now pending merge
1424
                from bzrlib.revision import common_ancestor
1425
                try:
1426
                    base_rev_id = common_ancestor(self.branch.last_revision(),
1427
                                                  old_tip,
1428
                                                  self.branch.repository)
1429
                except errors.NoCommonAncestor:
1430
                    base_rev_id = None
1431
                base_tree = self.branch.repository.revision_tree(base_rev_id)
1432
                other_tree = self.branch.repository.revision_tree(old_tip)
1433
                result += merge_inner(self.branch,
1434
                                      other_tree,
1435
                                      base_tree,
1436
                                      this_tree=self)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1437
            return result
1438
        finally:
1439
            self.branch.unlock()
1440
1441
    @needs_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1442
    def _write_inventory(self, inv):
1443
        """Write inventory as the current inventory."""
1444
        sio = StringIO()
1445
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1446
        sio.seek(0)
1534.4.28 by Robert Collins
first cut at merge from integration.
1447
        self._control_files.put('inventory', sio)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1448
        self._set_inventory(inv)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1449
        mutter('wrote working inventory')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1450
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1451
    def set_conflicts(self, arg):
1452
        raise UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1453
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1454
    def add_conflicts(self, arg):
1455
        raise UnsupportedOperation(self.add_conflicts, self)
1456
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1457
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1458
    def conflicts(self):
1459
        conflicts = ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1460
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1461
            text = True
1462
            try:
1463
                if file_kind(self.abspath(conflicted)) != "file":
1464
                    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.
1465
            except errors.NoSuchFile:
1466
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1467
            if text is True:
1468
                for suffix in ('.THIS', '.OTHER'):
1469
                    try:
1470
                        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.
1471
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1472
                            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.
1473
                    except errors.NoSuchFile:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1474
                        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.
1475
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1476
                        break
1477
            ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1478
            conflicts.append(Conflict.factory(ctype, path=conflicted,
1479
                             file_id=self.path2id(conflicted)))
1480
        return conflicts
1481
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1482
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.
1483
class WorkingTree2(WorkingTree):
1484
    """This is the Format 2 working tree.
1485
1486
    This was the first weave based working tree. 
1487
     - uses os locks for locking.
1488
     - uses the branch last-revision.
1489
    """
1490
1491
    def unlock(self):
1492
        # we share control files:
1493
        if self._hashcache.needs_write and self._control_files._lock_count==3:
1494
            self._hashcache.write()
1495
        # reverse order of locking.
1496
        try:
1497
            return self._control_files.unlock()
1498
        finally:
1499
            self.branch.unlock()
1500
1501
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1502
class WorkingTree3(WorkingTree):
1503
    """This is the Format 3 working tree.
1504
1505
    This differs from the base WorkingTree by:
1506
     - having its own file lock
1507
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1508
1509
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1510
    """
1511
1512
    @needs_read_lock
1513
    def last_revision(self):
1514
        """See WorkingTree.last_revision."""
1515
        try:
1516
            return self._control_files.get_utf8('last-revision').read()
1517
        except NoSuchFile:
1518
            return None
1519
1520
    def _change_last_revision(self, revision_id):
1521
        """See WorkingTree._change_last_revision."""
1522
        if revision_id is None or revision_id == NULL_REVISION:
1523
            try:
1524
                self._control_files._transport.delete('last-revision')
1525
            except errors.NoSuchFile:
1526
                pass
1527
            return False
1528
        else:
1529
            self._control_files.put_utf8('last-revision', revision_id)
1530
            return True
1531
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1532
    @needs_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1533
    def set_conflicts(self, conflicts):
1534
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
1535
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1536
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1537
    @needs_write_lock
1538
    def add_conflicts(self, new_conflicts):
1539
        conflict_set = set(self.conflicts())
1540
        conflict_set.update(set(list(new_conflicts)))
1541
        self.set_conflicts(ConflictList(sorted(conflict_set,
1542
                                               key=Conflict.sort_key)))
1543
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1544
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1545
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1546
        try:
1547
            confile = self._control_files.get('conflicts')
1548
        except NoSuchFile:
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1549
            return ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1550
        try:
1551
            if confile.next() != CONFLICT_HEADER_1 + '\n':
1552
                raise ConflictFormatError()
1553
        except StopIteration:
1554
            raise ConflictFormatError()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1555
        return ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1556
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.
1557
    def unlock(self):
1558
        if self._hashcache.needs_write and self._control_files._lock_count==1:
1559
            self._hashcache.write()
1560
        # reverse order of locking.
1561
        try:
1562
            return self._control_files.unlock()
1563
        finally:
1564
            self.branch.unlock()
1565
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1566
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1567
def get_conflicted_stem(path):
1568
    for suffix in CONFLICT_SUFFIXES:
1569
        if path.endswith(suffix):
1570
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1571
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1572
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1573
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1574
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1575
    ## FIXME: better check
1576
    filename = normpath(filename)
1577
    while filename != '':
1578
        head, tail = os.path.split(filename)
1579
        ## 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.
1580
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1581
            return True
1582
        if filename == head:
1583
            break
1584
        filename = head
1585
    return False
1586
1587
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1588
class WorkingTreeFormat(object):
1589
    """An encapsulation of the initialization and open routines for a format.
1590
1591
    Formats provide three things:
1592
     * An initialization routine,
1593
     * a format string,
1594
     * an open routine.
1595
1596
    Formats are placed in an dict by their format string for reference 
1597
    during workingtree opening. Its not required that these be instances, they
1598
    can be classes themselves with class methods - it simply depends on 
1599
    whether state is needed for a given format or not.
1600
1601
    Once a format is deprecated, just deprecate the initialize and open
1602
    methods on the format class. Do not deprecate the object, as the 
1603
    object will be created every time regardless.
1604
    """
1605
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1606
    _default_format = None
1607
    """The default format used for new trees."""
1608
1609
    _formats = {}
1610
    """The known formats."""
1611
1612
    @classmethod
1613
    def find_format(klass, a_bzrdir):
1614
        """Return the format for the working tree object in a_bzrdir."""
1615
        try:
1616
            transport = a_bzrdir.get_workingtree_transport(None)
1617
            format_string = transport.get("format").read()
1618
            return klass._formats[format_string]
1619
        except NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1620
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1621
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1622
            raise errors.UnknownFormatError(format=format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1623
1624
    @classmethod
1625
    def get_default_format(klass):
1626
        """Return the current default format."""
1627
        return klass._default_format
1628
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1629
    def get_format_string(self):
1630
        """Return the ASCII format string that identifies this format."""
1631
        raise NotImplementedError(self.get_format_string)
1632
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1633
    def get_format_description(self):
1634
        """Return the short description for this format."""
1635
        raise NotImplementedError(self.get_format_description)
1636
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1637
    def is_supported(self):
1638
        """Is this format supported?
1639
1640
        Supported formats can be initialized and opened.
1641
        Unsupported formats may not support initialization or committing or 
1642
        some other features depending on the reason for not being supported.
1643
        """
1644
        return True
1645
1646
    @classmethod
1647
    def register_format(klass, format):
1648
        klass._formats[format.get_format_string()] = format
1649
1650
    @classmethod
1651
    def set_default_format(klass, format):
1652
        klass._default_format = format
1653
1654
    @classmethod
1655
    def unregister_format(klass, format):
1656
        assert klass._formats[format.get_format_string()] is format
1657
        del klass._formats[format.get_format_string()]
1658
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1659
1660
1661
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1662
    """The second working tree format. 
1663
1664
    This format modified the hash cache from the format 1 hash cache.
1665
    """
1666
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1667
    def get_format_description(self):
1668
        """See WorkingTreeFormat.get_format_description()."""
1669
        return "Working tree format 2"
1670
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
1671
    def stub_initialize_remote(self, control_files):
1672
        """As a special workaround create critical control files for a remote working tree
1673
        
1674
        This ensures that it can later be updated and dealt with locally,
1675
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
1676
        no working tree.  (See bug #43064).
1677
        """
1678
        sio = StringIO()
1679
        inv = Inventory()
1680
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1681
        sio.seek(0)
1682
        control_files.put('inventory', sio)
1683
1684
        control_files.put_utf8('pending-merges', '')
1685
        
1686
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1687
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1688
        """See WorkingTreeFormat.initialize()."""
1689
        if not isinstance(a_bzrdir.transport, LocalTransport):
1690
            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.
1691
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1692
        if revision_id is not None:
1693
            branch.lock_write()
1694
            try:
1695
                revision_history = branch.revision_history()
1696
                try:
1697
                    position = revision_history.index(revision_id)
1698
                except ValueError:
1699
                    raise errors.NoSuchRevision(branch, revision_id)
1700
                branch.set_revision_history(revision_history[:position + 1])
1701
            finally:
1702
                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.
1703
        revision = branch.last_revision()
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1704
        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.
1705
        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.
1706
                         branch,
1707
                         inv,
1708
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1709
                         _format=self,
1710
                         _bzrdir=a_bzrdir)
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1711
        wt._write_inventory(inv)
1712
        wt.set_root_id(inv.root.file_id)
1731.1.12 by Aaron Bentley
Don't fail test cases involving only repositories if they have wrong roots
1713
        wt.set_last_revision(revision)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1714
        wt.set_pending_merges([])
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1715
        build_tree(wt.basis_tree(), wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1716
        return wt
1717
1718
    def __init__(self):
1719
        super(WorkingTreeFormat2, self).__init__()
1720
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1721
1722
    def open(self, a_bzrdir, _found=False):
1723
        """Return the WorkingTree object for a_bzrdir
1724
1725
        _found is a private parameter, do not use it. It is used to indicate
1726
               if format probing has already been done.
1727
        """
1728
        if not _found:
1729
            # we are being called directly and must probe.
1730
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1731
        if not isinstance(a_bzrdir.transport, LocalTransport):
1732
            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.
1733
        return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1734
                           _internal=True,
1735
                           _format=self,
1736
                           _bzrdir=a_bzrdir)
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1737
1738
1739
class WorkingTreeFormat3(WorkingTreeFormat):
1740
    """The second working tree format updated to record a format marker.
1741
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1742
    This format:
1743
        - exists within a metadir controlling .bzr
1744
        - includes an explicit version marker for the workingtree control
1745
          files, separate from the BzrDir format
1746
        - modifies the hash cache format
1747
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
1748
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1749
    """
1750
1751
    def get_format_string(self):
1752
        """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
1753
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1754
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1755
    def get_format_description(self):
1756
        """See WorkingTreeFormat.get_format_description()."""
1757
        return "Working tree format 3"
1758
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1759
    _lock_file_name = 'lock'
1760
    _lock_class = LockDir
1761
1762
    def _open_control_files(self, a_bzrdir):
1763
        transport = a_bzrdir.get_workingtree_transport(None)
1764
        return LockableFiles(transport, self._lock_file_name, 
1765
                             self._lock_class)
1766
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1767
    def initialize(self, a_bzrdir, revision_id=None):
1768
        """See WorkingTreeFormat.initialize().
1769
        
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1770
        revision_id allows creating a working tree at a different
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1771
        revision than the branch is at.
1772
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1773
        if not isinstance(a_bzrdir.transport, LocalTransport):
1774
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1775
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1776
        control_files = self._open_control_files(a_bzrdir)
1777
        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.
1778
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1779
        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.
1780
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1781
        if revision_id is None:
1782
            revision_id = branch.last_revision()
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1783
        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
1784
        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.
1785
                         branch,
1786
                         inv,
1787
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1788
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1789
                         _bzrdir=a_bzrdir,
1790
                         _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.
1791
        wt.lock_write()
1792
        try:
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1793
            wt._write_inventory(inv)
1794
            wt.set_root_id(inv.root.file_id)
1731.1.12 by Aaron Bentley
Don't fail test cases involving only repositories if they have wrong roots
1795
            wt.set_last_revision(revision_id)
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
1796
            wt.set_pending_merges([])
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1797
            build_tree(wt.basis_tree(), wt)
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
1798
        finally:
1799
            wt.unlock()
1800
            control_files.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1801
        return wt
1802
1803
    def __init__(self):
1804
        super(WorkingTreeFormat3, self).__init__()
1805
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1806
1807
    def open(self, a_bzrdir, _found=False):
1808
        """Return the WorkingTree object for a_bzrdir
1809
1810
        _found is a private parameter, do not use it. It is used to indicate
1811
               if format probing has already been done.
1812
        """
1813
        if not _found:
1814
            # we are being called directly and must probe.
1815
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1816
        if not isinstance(a_bzrdir.transport, LocalTransport):
1817
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
1818
        return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1819
1820
    def _open(self, a_bzrdir, control_files):
1821
        """Open the tree itself.
1822
        
1823
        :param a_bzrdir: the dir for the tree.
1824
        :param control_files: the control files for the tree.
1825
        """
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
1826
        return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1827
                           _internal=True,
1828
                           _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1829
                           _bzrdir=a_bzrdir,
1830
                           _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1831
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
1832
    def __str__(self):
1833
        return self.get_format_string()
1834
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1835
1836
# formats which have no format string are not discoverable
1837
# and not independently creatable, so are not registered.
1838
__default_format = WorkingTreeFormat3()
1839
WorkingTreeFormat.register_format(__default_format)
1840
WorkingTreeFormat.set_default_format(__default_format)
1841
_legacy_formats = [WorkingTreeFormat2(),
1842
                   ]
1843
1844
1845
class WorkingTreeTestProviderAdapter(object):
1846
    """A tool to generate a suite testing multiple workingtree formats at once.
1847
1848
    This is done by copying the test once for each transport and injecting
1849
    the transport_server, transport_readonly_server, and workingtree_format
1850
    classes into each copy. Each copy is also given a new id() to make it
1851
    easy to identify.
1852
    """
1853
1854
    def __init__(self, transport_server, transport_readonly_server, formats):
1855
        self._transport_server = transport_server
1856
        self._transport_readonly_server = transport_readonly_server
1857
        self._formats = formats
1858
    
1852.6.1 by Robert Collins
Start tree implementation tests.
1859
    def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
1860
        """Clone test for adaption."""
1861
        new_test = deepcopy(test)
1862
        new_test.transport_server = self._transport_server
1863
        new_test.transport_readonly_server = self._transport_readonly_server
1864
        new_test.bzrdir_format = bzrdir_format
1865
        new_test.workingtree_format = workingtree_format
1866
        def make_new_test_id():
1867
            new_id = "%s(%s)" % (test.id(), variation)
1868
            return lambda: new_id
1869
        new_test.id = make_new_test_id()
1870
        return new_test
1871
    
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1872
    def adapt(self, test):
1873
        from bzrlib.tests import TestSuite
1874
        result = TestSuite()
1875
        for workingtree_format, bzrdir_format in self._formats:
1852.6.1 by Robert Collins
Start tree implementation tests.
1876
            new_test = self._clone_test(
1877
                test,
1878
                bzrdir_format,
1879
                workingtree_format, workingtree_format.__class__.__name__)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1880
            result.addTest(new_test)
1881
        return result