/brz/remove-bazaar

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