/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
453 by Martin Pool
- Split WorkingTree into its own file
2
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.
7
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.
12
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
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
42
from copy import deepcopy
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
43
from cStringIO import StringIO
44
import errno
45
import fnmatch
453 by Martin Pool
- Split WorkingTree into its own file
46
import os
1398 by Robert Collins
integrate in Gustavos x-bit patch
47
import stat
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
48
 
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
49
50
from bzrlib.atomicfile import AtomicFile
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
51
from bzrlib.branch import (Branch,
52
                           quotefn)
1534.10.22 by Aaron Bentley
Got ConflictList implemented
53
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
54
import bzrlib.bzrdir as bzrdir
1534.4.28 by Robert Collins
first cut at merge from integration.
55
from bzrlib.decorators import needs_read_lock, needs_write_lock
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
56
import bzrlib.errors as errors
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
57
from bzrlib.errors import (BzrCheckError,
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
58
                           BzrError,
1534.10.7 by Aaron Bentley
Added tests for bad conflict lists
59
                           ConflictFormatError,
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
60
                           DivergedBranches,
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
61
                           WeaveRevisionNotPresent,
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
62
                           NotBranchError,
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
63
                           NoSuchFile,
1558.3.3 by Aaron Bentley
Fix error handling for merge_modified
64
                           NotVersionedError,
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
65
                           MergeModifiedFormatError,
66
                           UnsupportedOperation,
67
                           )
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
68
from bzrlib.inventory import InventoryEntry, Inventory
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
69
from bzrlib.lockable_files import LockableFiles, TransportLock
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
70
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.
71
from bzrlib.merge import merge_inner, transform_tree
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
72
from bzrlib.osutils import (
73
                            abspath,
74
                            appendpath,
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
75
                            compact_date,
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
76
                            file_kind,
77
                            isdir,
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
78
                            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 \
79
                            pathjoin,
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
80
                            pumpfile,
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
81
                            safe_unicode,
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
82
                            splitpath,
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
83
                            rand_bytes,
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
84
                            normpath,
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
85
                            realpath,
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
86
                            relpath,
1534.7.25 by Aaron Bentley
Added set_executability
87
                            rename,
88
                            supports_executable,
89
                            )
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
90
from bzrlib.progress import DummyProgress, ProgressPhase
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
91
from bzrlib.revision import NULL_REVISION
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
92
from bzrlib.rio import RioReader, rio_file, Stanza
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.
93
from bzrlib.symbol_versioning import *
1185.33.92 by Martin Pool
[patch] fix for 'bzr rm -v' (Wouter van Heyst)
94
from bzrlib.textui import show_status
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
95
import bzrlib.tree
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
96
from bzrlib.transform import build_tree
1185.80.10 by John Arbash Meinel
Adding progress indicators and improved get order for 'bzr branch'
97
from bzrlib.trace import mutter, note
1534.4.28 by Robert Collins
first cut at merge from integration.
98
from bzrlib.transport import get_transport
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
99
from bzrlib.transport.local import LocalTransport
1534.9.10 by Aaron Bentley
Fixed use of ui_factory (which can't be imported directly)
100
import bzrlib.ui
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
101
import bzrlib.xml5
453 by Martin Pool
- Split WorkingTree into its own file
102
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
103
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
104
def gen_file_id(name):
105
    """Return new file id.
106
107
    This should probably generate proper UUIDs, but for the moment we
108
    cope with just randomness because running uuidgen every time is
109
    slow."""
110
    import re
111
    from binascii import hexlify
112
    from time import time
113
114
    # get last component
115
    idx = name.rfind('/')
116
    if idx != -1:
117
        name = name[idx+1 : ]
118
    idx = name.rfind('\\')
119
    if idx != -1:
120
        name = name[idx+1 : ]
121
122
    # make it not a hidden file
123
    name = name.lstrip('.')
124
125
    # remove any wierd characters; we don't escape them but rather
126
    # just pull them out
127
    name = re.sub(r'[^\w.]', '', name)
128
129
    s = hexlify(rand_bytes(8))
130
    return '-'.join((name, compact_date(time()), s))
131
132
133
def gen_root_id():
134
    """Return a new tree-root file id."""
135
    return gen_file_id('TREE_ROOT')
136
137
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
138
class TreeEntry(object):
139
    """An entry that implements the minium interface used by commands.
140
141
    This needs further inspection, it may be better to have 
142
    InventoryEntries without ids - though that seems wrong. For now,
143
    this is a parallel hierarchy to InventoryEntry, and needs to become
144
    one of several things: decorates to that hierarchy, children of, or
145
    parents of it.
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
146
    Another note is that these objects are currently only used when there is
147
    no InventoryEntry available - i.e. for unversioned objects.
148
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
149
    """
150
 
151
    def __eq__(self, other):
152
        # yes, this us ugly, TODO: best practice __eq__ style.
153
        return (isinstance(other, TreeEntry)
154
                and other.__class__ == self.__class__)
155
 
156
    def kind_character(self):
157
        return "???"
158
159
160
class TreeDirectory(TreeEntry):
161
    """See TreeEntry. This is a directory in a working tree."""
162
163
    def __eq__(self, other):
164
        return (isinstance(other, TreeDirectory)
165
                and other.__class__ == self.__class__)
166
167
    def kind_character(self):
168
        return "/"
169
170
171
class TreeFile(TreeEntry):
172
    """See TreeEntry. This is a regular file in a working tree."""
173
174
    def __eq__(self, other):
175
        return (isinstance(other, TreeFile)
176
                and other.__class__ == self.__class__)
177
178
    def kind_character(self):
179
        return ''
180
181
182
class TreeLink(TreeEntry):
183
    """See TreeEntry. This is a symlink in a working tree."""
184
185
    def __eq__(self, other):
186
        return (isinstance(other, TreeLink)
187
                and other.__class__ == self.__class__)
188
189
    def kind_character(self):
190
        return ''
191
192
453 by Martin Pool
- Split WorkingTree into its own file
193
class WorkingTree(bzrlib.tree.Tree):
194
    """Working copy tree.
195
196
    The inventory is held in the `Branch` working-inventory, and the
197
    files are in a directory on disk.
198
199
    It is possible for a `WorkingTree` to have a filename which is
200
    not listed in the Inventory and vice versa.
201
    """
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
202
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
203
    def __init__(self, basedir='.',
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
204
                 branch=DEPRECATED_PARAMETER,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
205
                 _inventory=None,
206
                 _control_files=None,
207
                 _internal=False,
208
                 _format=None,
209
                 _bzrdir=None):
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
210
        """Construct a WorkingTree for basedir.
211
212
        If the branch is not supplied, it is opened automatically.
213
        If the branch is supplied, it must be the branch for this basedir.
214
        (branch.base is not cross checked, because for remote branches that
215
        would be meaningless).
216
        """
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.
217
        self._format = _format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
218
        self.bzrdir = _bzrdir
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
219
        if not _internal:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
220
            # not created via open etc.
1508.1.25 by Robert Collins
Update per review comments.
221
            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.
222
                 "Please use bzrdir.open_workingtree or WorkingTree.open().",
223
                 DeprecationWarning,
224
                 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.
225
            wt = WorkingTree.open(basedir)
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
226
            self._branch = wt.branch
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
227
            self.basedir = wt.basedir
228
            self._control_files = wt._control_files
229
            self._hashcache = wt._hashcache
230
            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.
231
            self._format = wt._format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
232
            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.
233
        from bzrlib.hashcache import HashCache
234
        from bzrlib.trace import note, mutter
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
235
        assert isinstance(basedir, basestring), \
236
            "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.
237
        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.
238
        mutter("opening working tree %r", basedir)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
239
        if deprecated_passed(branch):
240
            if not _internal:
241
                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
242
                     " Please use bzrdir.open_workingtree() or"
243
                     " WorkingTree.open().",
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
244
                     DeprecationWarning,
245
                     stacklevel=2
246
                     )
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
247
            self._branch = branch
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
248
        else:
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
249
            self._branch = self.bzrdir.open_branch()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
250
        assert isinstance(self.branch, Branch), \
251
            "branch %r is not a Branch" % self.branch
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
252
        self.basedir = realpath(basedir)
1534.4.28 by Robert Collins
first cut at merge from integration.
253
        # 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.
254
        if isinstance(self._format, WorkingTreeFormat2):
255
            # share control object
1534.4.28 by Robert Collins
first cut at merge from integration.
256
            self._control_files = self.branch.control_files
257
        else:
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
258
            # only ready for format 3
259
            assert isinstance(self._format, WorkingTreeFormat3)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
260
            assert isinstance(_control_files, LockableFiles), \
261
                    "_control_files must be a LockableFiles, not %r" \
262
                    % _control_files
263
            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.
264
        # update the whole cache up front and write to disk if anything changed;
265
        # in the future we might want to do this more selectively
1467 by Robert Collins
WorkingTree.__del__ has been removed.
266
        # two possible ways offer themselves : in self._unlock, write the cache
267
        # if needed, or, when the cache sees a change, append it to the hash
268
        # cache file, and have the parser take the most recent entry for a
269
        # given path only.
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
270
        cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
271
        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.
272
        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.
273
        # is this scan needed ? it makes things kinda slow.
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
274
        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.
275
276
        if hc.needs_write:
277
            mutter("write hc")
278
            hc.write()
453 by Martin Pool
- Split WorkingTree into its own file
279
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
280
        if _inventory is None:
281
            self._set_inventory(self.read_working_inventory())
282
        else:
283
            self._set_inventory(_inventory)
1185.60.6 by Aaron Bentley
Fixed hashcache
284
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
285
    branch = property(
286
        fget=lambda self: self._branch,
287
        doc="""The branch this WorkingTree is connected to.
288
289
            This cannot be set - it is reflective of the actual disk structure
290
            the working tree has been constructed from.
291
            """)
292
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
293
    def _set_inventory(self, inv):
294
        self._inventory = inv
295
        self.path2id = self._inventory.path2id
296
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
297
    def is_control_filename(self, filename):
1534.5.16 by Robert Collins
Review feedback.
298
        """True if filename is the name of a control file in this tree.
299
        
300
        This is true IF and ONLY IF the filename is part of the meta data
301
        that bzr controls in this tree. I.E. a random .bzr directory placed
302
        on disk will not be a control file for this tree.
303
        """
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
304
        try:
305
            self.bzrdir.transport.relpath(self.abspath(filename))
306
            return True
307
        except errors.PathNotChild:
308
            return False
309
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
310
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
311
    def open(path=None, _unsupported=False):
312
        """Open an existing working tree at path.
313
314
        """
315
        if path is None:
316
            path = os.path.getcwdu()
317
        control = bzrdir.BzrDir.open(path, _unsupported)
318
        return control.open_workingtree(_unsupported)
319
        
320
    @staticmethod
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
321
    def open_containing(path=None):
322
        """Open an existing working tree which has its root about path.
323
        
324
        This probes for a working tree at path and searches upwards from there.
325
326
        Basically we keep looking up until we find the control directory or
327
        run into /.  If there isn't one, raises NotBranchError.
328
        TODO: give this a new exception.
329
        If there is one, it is returned, along with the unused portion of path.
330
        """
331
        if path is None:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
332
            path = os.getcwdu()
333
        control, relpath = bzrdir.BzrDir.open_containing(path)
334
        return control.open_workingtree(), relpath
335
336
    @staticmethod
337
    def open_downlevel(path=None):
338
        """Open an unsupported working tree.
339
340
        Only intended for advanced situations like upgrading part of a bzrdir.
341
        """
342
        return WorkingTree.open(path, _unsupported=True)
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
343
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
344
    def __iter__(self):
345
        """Iterate through file_ids for this tree.
346
347
        file_ids are in a WorkingTree if they are in the working inventory
348
        and the working file exists.
349
        """
350
        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.
351
        for path, ie in inv.iter_entries():
1092.2.6 by Robert Collins
symlink support updated to work
352
            if bzrlib.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.
353
                yield ie.file_id
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
354
453 by Martin Pool
- Split WorkingTree into its own file
355
    def __repr__(self):
356
        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
357
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
358
359
    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 \
360
        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()
361
    
362
    def basis_tree(self):
363
        """Return RevisionTree for the current last revision."""
364
        revision_id = self.last_revision()
365
        if revision_id is not None:
366
            try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
367
                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()
368
                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.
369
            except NoSuchFile:
370
                inv = None
371
            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()
372
                return bzrlib.tree.RevisionTree(self.branch.repository, inv,
373
                                                revision_id)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
374
        # 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()
375
        return self.branch.repository.revision_tree(revision_id)
453 by Martin Pool
- Split WorkingTree into its own file
376
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
377
    @staticmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
378
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
379
    def create(branch, directory):
380
        """Create a workingtree for branch at directory.
381
382
        If existing_directory already exists it must have a .bzr directory.
383
        If it does not exist, it will be created.
384
385
        This returns a new WorkingTree object for the new checkout.
386
387
        TODO FIXME RBC 20060124 when we have checkout formats in place this
388
        should accept an optional revisionid to checkout [and reject this if
389
        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
390
391
        XXX: When BzrDir is present, these should be created through that 
392
        interface instead.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
393
        """
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
394
        warn('delete WorkingTree.create', stacklevel=3)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
395
        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.
396
        if branch.bzrdir.root_transport.base == transport.base:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
397
            # same dir 
398
            return branch.bzrdir.create_workingtree()
399
        # different directory, 
400
        # create a branch reference
401
        # and now a working tree.
402
        raise NotImplementedError
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
403
 
404
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
405
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
406
    def create_standalone(directory):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
407
        """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.
408
409
        Directory must exist and be empty.
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
410
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
411
        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.
412
        """
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
413
        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.
414
1185.31.37 by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
415
    def relpath(self, abs):
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
416
        """Return the local path portion from a given absolute path."""
1185.31.37 by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
417
        return relpath(self.basedir, abs)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
418
453 by Martin Pool
- Split WorkingTree into its own file
419
    def has_filename(self, filename):
1092.2.6 by Robert Collins
symlink support updated to work
420
        return bzrlib.osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
421
422
    def get_file(self, file_id):
423
        return self.get_file_byname(self.id2path(file_id))
424
425
    def get_file_byname(self, filename):
426
        return file(self.abspath(filename), 'rb')
427
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
428
    def get_root_id(self):
429
        """Return the id of this trees root"""
430
        inv = self.read_working_inventory()
431
        return inv.root.file_id
432
        
453 by Martin Pool
- Split WorkingTree into its own file
433
    def _get_store_filename(self, file_id):
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
434
        ## XXX: badly named; this is not in the store at all
453 by Martin Pool
- Split WorkingTree into its own file
435
        return self.abspath(self.id2path(file_id))
436
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
437
    @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.
438
    def clone(self, to_bzrdir, revision_id=None, basis=None):
439
        """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()
440
        
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.
441
        Specifically modified files are kept as modified, but
442
        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()
443
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.
444
        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()
445
446
        revision
447
            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.
448
            revision, and and difference between the source trees last revision
449
            and this one merged in.
450
451
        basis
452
            If not None, a closer copy of a tree which may have some files in
453
            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()
454
        """
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.
455
        # assumes the target bzr dir format is compatible.
456
        result = self._format.initialize(to_bzrdir)
457
        self.copy_content_into(result, revision_id)
458
        return result
459
460
    @needs_read_lock
461
    def copy_content_into(self, tree, revision_id=None):
462
        """Copy the current content and user files of this tree into tree."""
463
        if revision_id is None:
464
            transform_tree(tree, self)
465
        else:
466
            # TODO now merge from tree.last_revision to revision
467
            transform_tree(tree, self)
468
            tree.set_last_revision(revision_id)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
469
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
470
    @needs_write_lock
1593.1.1 by Robert Collins
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
471
    def commit(self, message=None, revprops=None, *args, **kwargs):
472
        # avoid circular imports
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
473
        from bzrlib.commit import Commit
1593.1.1 by Robert Collins
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
474
        if revprops is None:
475
            revprops = {}
476
        if not 'branch-nick' in revprops:
477
            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.
478
        # args for wt.commit start at message from the Commit.commit method,
479
        # but with branch a kwarg now, passing in args as is results in the
480
        #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.
481
        args = (DEPRECATED_PARAMETER, message, ) + args
482
        Commit().commit(working_tree=self, revprops=revprops, *args, **kwargs)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
483
        self._set_inventory(self.read_working_inventory())
1248 by Martin Pool
- new weave based cleanup [broken]
484
485
    def id2abspath(self, file_id):
486
        return self.abspath(self.id2path(file_id))
487
1185.12.39 by abentley
Propogated has_or_had_id to Tree
488
    def has_id(self, file_id):
453 by Martin Pool
- Split WorkingTree into its own file
489
        # files that have been deleted are excluded
1185.12.39 by abentley
Propogated has_or_had_id to Tree
490
        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.
491
        if not inv.has_id(file_id):
453 by Martin Pool
- Split WorkingTree into its own file
492
            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.
493
        path = inv.id2path(file_id)
1092.2.6 by Robert Collins
symlink support updated to work
494
        return bzrlib.osutils.lexists(self.abspath(path))
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
495
1185.12.39 by abentley
Propogated has_or_had_id to Tree
496
    def has_or_had_id(self, file_id):
497
        if file_id == self.inventory.root.file_id:
498
            return True
499
        return self.inventory.has_id(file_id)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
500
501
    __contains__ = has_id
502
453 by Martin Pool
- Split WorkingTree into its own file
503
    def get_file_size(self, file_id):
1248 by Martin Pool
- new weave based cleanup [broken]
504
        return os.path.getsize(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
505
1185.60.6 by Aaron Bentley
Fixed hashcache
506
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
507
    def get_file_sha1(self, 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.
508
        path = self._inventory.id2path(file_id)
509
        return self._hashcache.get_sha1(path)
453 by Martin Pool
- Split WorkingTree into its own file
510
1398 by Robert Collins
integrate in Gustavos x-bit patch
511
    def is_executable(self, file_id):
1534.7.25 by Aaron Bentley
Added set_executability
512
        if not supports_executable():
1398 by Robert Collins
integrate in Gustavos x-bit patch
513
            return self._inventory[file_id].executable
514
        else:
515
            path = self._inventory.id2path(file_id)
516
            mode = os.lstat(self.abspath(path)).st_mode
517
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
518
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
519
    @needs_write_lock
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
520
    def add(self, files, ids=None):
521
        """Make files versioned.
522
523
        Note that the command line normally calls smart_add instead,
524
        which can automatically recurse.
525
526
        This adds the files to the inventory, so that they will be
527
        recorded by the next commit.
528
529
        files
530
            List of paths to add, relative to the base of the tree.
531
532
        ids
533
            If set, use these instead of automatically generated ids.
534
            Must be the same length as the list of files, but may
535
            contain None for ids that are to be autogenerated.
536
537
        TODO: Perhaps have an option to add the ids even if the files do
538
              not (yet) exist.
539
540
        TODO: Perhaps callback with the ids and paths as they're added.
541
        """
542
        # TODO: Re-adding a file that is removed in the working copy
543
        # should probably put it back with the previous ID.
544
        if isinstance(files, basestring):
545
            assert(ids is None or isinstance(ids, basestring))
546
            files = [files]
547
            if ids is not None:
548
                ids = [ids]
549
550
        if ids is None:
551
            ids = [None] * len(files)
552
        else:
553
            assert(len(ids) == len(files))
554
555
        inv = self.read_working_inventory()
556
        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.
557
            if self.is_control_filename(f):
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
558
                raise BzrError("cannot add control file %s" % quotefn(f))
559
560
            fp = splitpath(f)
561
562
            if len(fp) == 0:
563
                raise BzrError("cannot add top-level %r" % f)
564
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
565
            fullpath = normpath(self.abspath(f))
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
566
567
            try:
568
                kind = file_kind(fullpath)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
569
            except OSError, e:
570
                if e.errno == errno.ENOENT:
571
                    raise NoSuchFile(fullpath)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
572
                # maybe something better?
573
                raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
574
575
            if not InventoryEntry.versionable_kind(kind):
576
                raise BzrError('cannot add: not a versionable file ('
577
                               'i.e. regular file, symlink or directory): %s' % quotefn(f))
578
579
            if file_id is None:
580
                file_id = gen_file_id(f)
581
            inv.add_path(f, kind=kind, file_id=file_id)
582
583
            mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
584
        self._write_inventory(inv)
585
586
    @needs_write_lock
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
587
    def add_pending_merge(self, *revision_ids):
588
        # TODO: Perhaps should check at this point that the
589
        # history of the revision is actually present?
590
        p = self.pending_merges()
591
        updated = False
592
        for rev_id in revision_ids:
593
            if rev_id in p:
594
                continue
595
            p.append(rev_id)
596
            updated = True
597
        if updated:
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
598
            self.set_pending_merges(p)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
599
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
600
    @needs_read_lock
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
601
    def pending_merges(self):
602
        """Return a list of pending merges.
603
604
        These are revisions that have been merged into the working
605
        directory but not yet committed.
606
        """
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
607
        try:
1534.4.28 by Robert Collins
first cut at merge from integration.
608
            merges_file = self._control_files.get_utf8('pending-merges')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
609
        except OSError, e:
610
            if e.errno != errno.ENOENT:
611
                raise
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
612
            return []
613
        p = []
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
614
        for l in merges_file.readlines():
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
615
            p.append(l.rstrip('\n'))
616
        return p
617
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
618
    @needs_write_lock
619
    def set_pending_merges(self, rev_list):
1534.4.28 by Robert Collins
first cut at merge from integration.
620
        self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
621
1534.7.192 by Aaron Bentley
Record hashes produced by merges
622
    @needs_write_lock
623
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
624
        def iter_stanzas():
625
            for file_id, hash in modified_hashes.iteritems():
626
                yield Stanza(file_id=file_id, hash=hash)
627
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
628
629
    @needs_write_lock
630
    def _put_rio(self, filename, stanzas, header):
631
        my_file = rio_file(stanzas, header)
632
        self._control_files.put(filename, my_file)
1534.7.192 by Aaron Bentley
Record hashes produced by merges
633
634
    @needs_read_lock
635
    def merge_modified(self):
636
        try:
637
            hashfile = self._control_files.get('merge-hashes')
638
        except NoSuchFile:
639
            return {}
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
640
        merge_hashes = {}
641
        try:
642
            if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
643
                raise MergeModifiedFormatError()
644
        except StopIteration:
645
            raise MergeModifiedFormatError()
646
        for s in RioReader(hashfile):
1534.7.198 by Aaron Bentley
Removed spurious encode/decode
647
            file_id = s.get("file_id")
1558.12.10 by Aaron Bentley
Be robust when merge_hash file_id not in inventory
648
            if file_id not in self.inventory:
649
                continue
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
650
            hash = s.get("hash")
651
            if hash == self.get_file_sha1(file_id):
652
                merge_hashes[file_id] = hash
653
        return merge_hashes
1534.7.192 by Aaron Bentley
Record hashes produced by merges
654
1092.2.6 by Robert Collins
symlink support updated to work
655
    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
656
        return os.readlink(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
657
658
    def file_class(self, filename):
659
        if self.path2id(filename):
660
            return 'V'
661
        elif self.is_ignored(filename):
662
            return 'I'
663
        else:
664
            return '?'
665
666
    def list_files(self):
667
        """Recursively list all files as (path, class, kind, id).
668
669
        Lists, but does not descend into unversioned directories.
670
671
        This does not include files that have been deleted in this
672
        tree.
673
674
        Skips the control directory.
675
        """
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.
676
        inv = self._inventory
453 by Martin Pool
- Split WorkingTree into its own file
677
678
        def descend(from_dir_relpath, from_dir_id, dp):
679
            ls = os.listdir(dp)
680
            ls.sort()
681
            for f in ls:
682
                ## TODO: If we find a subdirectory with its own .bzr
683
                ## directory, then that is a separate tree and we
684
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
685
686
                # the bzrdir for this tree
687
                if self.bzrdir.transport.base.endswith(f + '/'):
453 by Martin Pool
- Split WorkingTree into its own file
688
                    continue
689
690
                # path within tree
691
                fp = appendpath(from_dir_relpath, f)
692
693
                # absolute path
694
                fap = appendpath(dp, f)
695
                
696
                f_ie = inv.get_child(from_dir_id, f)
697
                if f_ie:
698
                    c = 'V'
699
                elif self.is_ignored(fp):
700
                    c = 'I'
701
                else:
702
                    c = '?'
703
704
                fk = file_kind(fap)
705
706
                if f_ie:
707
                    if f_ie.kind != fk:
708
                        raise BzrCheckError("file %r entered as kind %r id %r, "
709
                                            "now of kind %r"
710
                                            % (fap, f_ie.kind, f_ie.file_id, fk))
711
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
712
                # make a last minute entry
713
                if f_ie:
714
                    entry = f_ie
715
                else:
716
                    if fk == 'directory':
717
                        entry = TreeDirectory()
718
                    elif fk == 'file':
719
                        entry = TreeFile()
720
                    elif fk == 'symlink':
721
                        entry = TreeLink()
722
                    else:
723
                        entry = TreeEntry()
724
                
725
                yield fp, c, fk, (f_ie and f_ie.file_id), entry
453 by Martin Pool
- Split WorkingTree into its own file
726
727
                if fk != 'directory':
728
                    continue
729
730
                if c != 'V':
731
                    # don't descend unversioned directories
732
                    continue
733
                
734
                for ff in descend(fp, f_ie.file_id, fap):
735
                    yield ff
736
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
737
        for f in descend(u'', inv.root.file_id, self.basedir):
453 by Martin Pool
- Split WorkingTree into its own file
738
            yield f
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
739
740
    @needs_write_lock
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
741
    def move(self, from_paths, to_name):
742
        """Rename files.
743
744
        to_name must exist in the inventory.
745
746
        If to_name exists and is a directory, the files are moved into
747
        it, keeping their old names.  
748
749
        Note that to_name is only the last component of the new name;
750
        this doesn't change the directory.
751
752
        This returns a list of (from_path, to_path) pairs for each
753
        entry that is moved.
754
        """
755
        result = []
756
        ## TODO: Option to move IDs only
757
        assert not isinstance(from_paths, basestring)
758
        inv = self.inventory
759
        to_abs = self.abspath(to_name)
760
        if not isdir(to_abs):
761
            raise BzrError("destination %r is not a directory" % to_abs)
762
        if not self.has_filename(to_name):
763
            raise BzrError("destination %r not in working directory" % to_abs)
764
        to_dir_id = inv.path2id(to_name)
765
        if to_dir_id == None and to_name != '':
766
            raise BzrError("destination %r is not a versioned directory" % to_name)
767
        to_dir_ie = inv[to_dir_id]
768
        if to_dir_ie.kind not in ('directory', 'root_directory'):
769
            raise BzrError("destination %r is not a directory" % to_abs)
770
771
        to_idpath = inv.get_idpath(to_dir_id)
772
773
        for f in from_paths:
774
            if not self.has_filename(f):
775
                raise BzrError("%r does not exist in working tree" % f)
776
            f_id = inv.path2id(f)
777
            if f_id == None:
778
                raise BzrError("%r is not versioned" % f)
779
            name_tail = splitpath(f)[-1]
780
            dest_path = appendpath(to_name, name_tail)
781
            if self.has_filename(dest_path):
782
                raise BzrError("destination %r already exists" % dest_path)
783
            if f_id in to_idpath:
784
                raise BzrError("can't move %r to a subdirectory of itself" % f)
785
786
        # OK, so there's a race here, it's possible that someone will
787
        # create a file in this interval and then the rename might be
788
        # left half-done.  But we should have caught most problems.
789
        orig_inv = deepcopy(self.inventory)
790
        try:
791
            for f in from_paths:
792
                name_tail = splitpath(f)[-1]
793
                dest_path = appendpath(to_name, name_tail)
794
                result.append((f, dest_path))
795
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
796
                try:
797
                    rename(self.abspath(f), self.abspath(dest_path))
798
                except OSError, e:
799
                    raise BzrError("failed to rename %r to %r: %s" %
800
                                   (f, dest_path, e[1]),
801
                            ["rename rolled back"])
802
        except:
803
            # restore the inventory on error
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
804
            self._set_inventory(orig_inv)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
805
            raise
806
        self._write_inventory(inv)
807
        return result
808
809
    @needs_write_lock
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
810
    def rename_one(self, from_rel, to_rel):
811
        """Rename one file.
812
813
        This can change the directory or the filename or both.
814
        """
815
        inv = self.inventory
816
        if not self.has_filename(from_rel):
817
            raise BzrError("can't rename: old working file %r does not exist" % from_rel)
818
        if self.has_filename(to_rel):
819
            raise BzrError("can't rename: new working file %r already exists" % to_rel)
820
821
        file_id = inv.path2id(from_rel)
822
        if file_id == None:
823
            raise BzrError("can't rename: old name %r is not versioned" % from_rel)
824
825
        entry = inv[file_id]
826
        from_parent = entry.parent_id
827
        from_name = entry.name
828
        
829
        if inv.path2id(to_rel):
830
            raise BzrError("can't rename: new name %r is already versioned" % to_rel)
831
832
        to_dir, to_tail = os.path.split(to_rel)
833
        to_dir_id = inv.path2id(to_dir)
834
        if to_dir_id == None and to_dir != '':
835
            raise BzrError("can't determine destination directory id for %r" % to_dir)
836
837
        mutter("rename_one:")
838
        mutter("  file_id    {%s}" % file_id)
839
        mutter("  from_rel   %r" % from_rel)
840
        mutter("  to_rel     %r" % to_rel)
841
        mutter("  to_dir     %r" % to_dir)
842
        mutter("  to_dir_id  {%s}" % to_dir_id)
843
844
        inv.rename(file_id, to_dir_id, to_tail)
845
846
        from_abs = self.abspath(from_rel)
847
        to_abs = self.abspath(to_rel)
848
        try:
849
            rename(from_abs, to_abs)
850
        except OSError, e:
851
            inv.rename(file_id, from_parent, from_name)
852
            raise BzrError("failed to rename %r to %r: %s"
853
                    % (from_abs, to_abs, e[1]),
854
                    ["rename rolled back"])
855
        self._write_inventory(inv)
856
857
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
858
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
859
        """Return all unknown files.
860
861
        These are files in the working directory that are not versioned or
862
        control files or ignored.
863
        
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
864
        >>> from bzrlib.bzrdir import ScratchDir
865
        >>> d = ScratchDir(files=['foo', 'foo~'])
866
        >>> b = d.open_branch()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
867
        >>> tree = d.open_workingtree()
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
868
        >>> map(str, tree.unknowns())
869
        ['foo']
870
        >>> tree.add('foo')
871
        >>> list(b.unknowns())
872
        []
873
        >>> tree.remove('foo')
874
        >>> list(b.unknowns())
875
        [u'foo']
876
        """
453 by Martin Pool
- Split WorkingTree into its own file
877
        for subp in self.extras():
878
            if not self.is_ignored(subp):
879
                yield subp
880
1534.10.16 by Aaron Bentley
Small tweaks
881
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
882
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
883
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
884
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
885
        return self._iter_conflicts()
886
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
887
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
888
        conflicted = set()
889
        for path in (s[0] for s in self.list_files()):
890
            stem = get_conflicted_stem(path)
891
            if stem is None:
892
                continue
893
            if stem not in conflicted:
894
                conflicted.add(stem)
895
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
896
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
897
    @needs_write_lock
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
898
    def pull(self, source, overwrite=False, stop_revision=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
899
        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().
900
        source.lock_read()
901
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
902
            pp = ProgressPhase("Pull phase", 2, top_pb)
903
            pp.next_phase()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
904
            old_revision_history = self.branch.revision_history()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
905
            basis_tree = self.basis_tree()
1534.4.54 by Robert Collins
Merge from integration.
906
            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().
907
            new_revision_history = self.branch.revision_history()
908
            if new_revision_history != old_revision_history:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
909
                pp.next_phase()
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
910
                if len(old_revision_history):
911
                    other_revision = old_revision_history[-1]
912
                else:
913
                    other_revision = None
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
914
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
915
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
916
                try:
917
                    merge_inner(self.branch,
918
                                self.branch.basis_tree(),
919
                                basis_tree, 
920
                                this_tree=self, 
921
                                pb=pb)
922
                finally:
923
                    pb.finished()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
924
                self.set_last_revision(self.branch.last_revision())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
925
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
926
        finally:
927
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
928
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
929
453 by Martin Pool
- Split WorkingTree into its own file
930
    def extras(self):
931
        """Yield all unknown files in this WorkingTree.
932
933
        If there are any unknown directories then only the directory is
934
        returned, not all its children.  But if there are unknown files
935
        under a versioned subdirectory, they are returned.
936
937
        Currently returned depth-first, sorted by name within directories.
938
        """
939
        ## TODO: Work from given directory downwards
940
        for path, dir_entry in self.inventory.directories():
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
941
            mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
942
            dirabs = self.abspath(path)
943
            if not isdir(dirabs):
944
                # e.g. directory deleted
945
                continue
946
947
            fl = []
948
            for subf in os.listdir(dirabs):
949
                if (subf != '.bzr'
950
                    and (subf not in dir_entry.children)):
951
                    fl.append(subf)
952
            
953
            fl.sort()
954
            for subf in fl:
955
                subp = appendpath(path, subf)
956
                yield subp
957
958
959
    def ignored_files(self):
960
        """Yield list of PATH, IGNORE_PATTERN"""
961
        for subp in self.extras():
962
            pat = self.is_ignored(subp)
963
            if pat != None:
964
                yield subp, pat
965
966
967
    def get_ignore_list(self):
968
        """Return list of ignore patterns.
969
970
        Cached in the Tree object after the first call.
971
        """
972
        if hasattr(self, '_ignorelist'):
973
            return self._ignorelist
974
975
        l = bzrlib.DEFAULT_IGNORE[:]
976
        if self.has_filename(bzrlib.IGNORE_FILENAME):
977
            f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
978
            l.extend([line.rstrip("\n\r") for line in f.readlines()])
979
        self._ignorelist = l
980
        return l
981
982
983
    def is_ignored(self, filename):
984
        r"""Check whether the filename matches an ignore pattern.
985
986
        Patterns containing '/' or '\' need to match the whole path;
987
        others match against only the last component.
988
989
        If the file is ignored, returns the pattern which caused it to
990
        be ignored, otherwise None.  So this can simply be used as a
991
        boolean if desired."""
992
993
        # TODO: Use '**' to match directories, and other extended
994
        # globbing stuff from cvs/rsync.
995
996
        # XXX: fnmatch is actually not quite what we want: it's only
997
        # approximately the same as real Unix fnmatch, and doesn't
998
        # treat dotfiles correctly and allows * to match /.
999
        # Eventually it should be replaced with something more
1000
        # accurate.
1001
        
1002
        for pat in self.get_ignore_list():
1003
            if '/' in pat or '\\' in pat:
1004
                
1005
                # as a special case, you can put ./ at the start of a
1006
                # pattern; this is good to match in the top-level
1007
                # only;
1008
                
1009
                if (pat[:2] == './') or (pat[:2] == '.\\'):
1010
                    newpat = pat[2:]
1011
                else:
1012
                    newpat = pat
1013
                if fnmatch.fnmatchcase(filename, newpat):
1014
                    return pat
1015
            else:
1016
                if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):
1017
                    return pat
1018
        else:
1019
            return None
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1020
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1021
    def kind(self, file_id):
1022
        return file_kind(self.id2abspath(file_id))
1023
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1024
    @needs_read_lock
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1025
    def last_revision(self):
1026
        """Return the last revision id of this working tree.
1027
1028
        In early branch formats this was == the branch last_revision,
1029
        but that cannot be relied upon - for working tree operations,
1030
        always use tree.last_revision().
1031
        """
1032
        return self.branch.last_revision()
1033
1694.2.6 by Martin Pool
[merge] bzr.dev
1034
    def is_locked(self):
1035
        return self._control_files.is_locked()
1036
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1037
    def lock_read(self):
1038
        """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.
1039
        self.branch.lock_read()
1040
        try:
1041
            return self._control_files.lock_read()
1042
        except:
1043
            self.branch.unlock()
1044
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1045
1046
    def lock_write(self):
1047
        """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.
1048
        self.branch.lock_write()
1049
        try:
1050
            return self._control_files.lock_write()
1051
        except:
1052
            self.branch.unlock()
1053
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1054
1694.2.6 by Martin Pool
[merge] bzr.dev
1055
    def get_physical_lock_status(self):
1056
        return self._control_files.get_physical_lock_status()
1057
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1058
    def _basis_inventory_name(self):
1059
        return 'basis-inventory'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1060
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1061
    @needs_write_lock
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1062
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1063
        """Change the last revision in the working tree."""
1064
        if self._change_last_revision(new_revision):
1065
            self._cache_basis_inventory(new_revision)
1066
1067
    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.
1068
        """Template method part of set_last_revision to perform the change.
1069
        
1070
        This is used to allow WorkingTree3 instances to not affect branch
1071
        when their last revision is set.
1072
        """
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1073
        if new_revision is None:
1074
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1075
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1076
        # current format is locked in with the branch
1077
        revision_history = self.branch.revision_history()
1078
        try:
1079
            position = revision_history.index(new_revision)
1080
        except ValueError:
1081
            raise errors.NoSuchRevision(self.branch, new_revision)
1082
        self.branch.set_revision_history(revision_history[:position + 1])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1083
        return True
1084
1085
    def _cache_basis_inventory(self, new_revision):
1086
        """Cache new_revision as the basis inventory."""
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1087
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1088
            # this double handles the inventory - unpack and repack - 
1089
            # but is easier to understand. We can/should put a conditional
1090
            # in here based on whether the inventory is in the latest format
1091
            # - perhaps we should repack all inventories on a repository
1092
            # upgrade ?
1093
            inv = self.branch.repository.get_inventory(new_revision)
1094
            inv.revision_id = new_revision
1095
            xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1096
1097
            path = self._basis_inventory_name()
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1098
            self._control_files.put_utf8(path, xml)
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1099
        except WeaveRevisionNotPresent:
1100
            pass
1101
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1102
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1103
        """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.
1104
        path = self._basis_inventory_name()
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1105
        return self._control_files.get_utf8(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1106
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1107
    @needs_read_lock
1108
    def read_working_inventory(self):
1109
        """Read the working inventory."""
1110
        # ElementTree does its own conversion from UTF-8, so open in
1111
        # binary.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1112
        result = bzrlib.xml5.serializer_v5.read_inventory(
1534.4.28 by Robert Collins
first cut at merge from integration.
1113
            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()
1114
        self._set_inventory(result)
1115
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1116
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1117
    @needs_write_lock
1118
    def remove(self, files, verbose=False):
1119
        """Remove nominated files from the working inventory..
1120
1121
        This does not remove their text.  This does not run on XXX on what? RBC
1122
1123
        TODO: Refuse to remove modified files unless --force is given?
1124
1125
        TODO: Do something useful with directories.
1126
1127
        TODO: Should this remove the text or not?  Tough call; not
1128
        removing may be useful and the user can just use use rm, and
1129
        is the opposite of add.  Removing it is consistent with most
1130
        other tools.  Maybe an option.
1131
        """
1132
        ## TODO: Normalize names
1133
        ## TODO: Remove nested loops; better scalability
1134
        if isinstance(files, basestring):
1135
            files = [files]
1136
1137
        inv = self.inventory
1138
1139
        # do this before any modifications
1140
        for f in files:
1141
            fid = inv.path2id(f)
1142
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
1143
                # TODO: Perhaps make this just a warning, and continue?
1144
                # This tends to happen when 
1145
                raise NotVersionedError(path=f)
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
1146
            mutter("remove inventory entry %s {%s}", quotefn(f), fid)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1147
            if verbose:
1148
                # having remove it, it must be either ignored or unknown
1149
                if self.is_ignored(f):
1150
                    new_status = 'I'
1151
                else:
1152
                    new_status = '?'
1153
                show_status(new_status, inv[fid].kind, quotefn(f))
1154
            del inv[fid]
1155
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1156
        self._write_inventory(inv)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1157
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1158
    @needs_write_lock
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1159
    def revert(self, filenames, old_tree=None, backups=True, 
1160
               pb=DummyProgress()):
1534.7.47 by Aaron Bentley
Started work on 'revert'
1161
        from transform import revert
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1162
        from conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1163
        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()
1164
            old_tree = self.basis_tree()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1165
        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.
1166
        if not len(filenames):
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
1167
            self.set_pending_merges([])
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1168
            resolve(self)
1169
        else:
1534.10.15 by Aaron Bentley
Revert does resolve
1170
            resolve(self, filenames, ignore_misses=True)
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1171
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1172
1658.1.3 by Martin Pool
Doc
1173
    # XXX: This method should be deprecated in favour of taking in a proper
1174
    # new Inventory object.
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1175
    @needs_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1176
    def set_inventory(self, new_inventory_list):
1177
        from bzrlib.inventory import (Inventory,
1178
                                      InventoryDirectory,
1179
                                      InventoryEntry,
1180
                                      InventoryFile,
1181
                                      InventoryLink)
1182
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1183
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1184
            name = os.path.basename(path)
1185
            if name == "":
1186
                continue
1187
            # fixme, there should be a factory function inv,add_?? 
1188
            if kind == 'directory':
1189
                inv.add(InventoryDirectory(file_id, name, parent))
1190
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1191
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1192
            elif kind == 'symlink':
1193
                inv.add(InventoryLink(file_id, name, parent))
1194
            else:
1195
                raise BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1196
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1197
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1198
    @needs_write_lock
1199
    def set_root_id(self, file_id):
1200
        """Set the root id for this tree."""
1201
        inv = self.read_working_inventory()
1202
        orig_root_id = inv.root.file_id
1203
        del inv._byid[inv.root.file_id]
1204
        inv.root.file_id = file_id
1205
        inv._byid[inv.root.file_id] = inv.root
1206
        for fid in inv:
1207
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1208
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1209
                entry.parent_id = inv.root.file_id
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1210
        self._write_inventory(inv)
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1211
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1212
    def unlock(self):
1213
        """See Branch.unlock.
1214
        
1215
        WorkingTree locking just uses the Branch locking facilities.
1216
        This is current because all working trees have an embedded branch
1217
        within them. IF in the future, we were to make branch data shareable
1218
        between multiple working trees, i.e. via shared storage, then we 
1219
        would probably want to lock both the local tree, and the branch.
1220
        """
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1221
        # FIXME: We want to write out the hashcache only when the last lock on
1222
        # this working copy is released.  Peeking at the lock count is a bit
1223
        # of a nasty hack; probably it's better to have a transaction object,
1224
        # which can do some finalization when it's either successfully or
1225
        # unsuccessfully completed.  (Denys's original patch did that.)
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.
1226
        # RBC 20060206 hookinhg into transaction will couple lock and transaction
1227
        # wrongly. Hookinh into unllock on the control files object is fine though.
1228
        
1229
        # TODO: split this per format so there is no ugly if block
1230
        if self._hashcache.needs_write and (
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1231
            # dedicated lock files
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.
1232
            self._control_files._lock_count==1 or 
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1233
            # shared lock files
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.
1234
            (self._control_files is self.branch.control_files and 
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1235
             self._control_files._lock_count==3)):
1185.60.6 by Aaron Bentley
Fixed hashcache
1236
            self._hashcache.write()
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.
1237
        # reverse order of locking.
1238
        result = self._control_files.unlock()
1239
        try:
1240
            self.branch.unlock()
1241
        finally:
1242
            return result
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1243
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1244
    @needs_write_lock
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1245
    def update(self):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1246
        """Update a working tree along its branch.
1247
1248
        This will update the branch if its bound too, which means we have multiple trees involved:
1249
        The new basis tree of the master.
1250
        The old basis tree of the branch.
1251
        The old basis tree of the working tree.
1252
        The current working tree state.
1253
        pathologically all three may be different, and non ancestors of each other.
1254
        Conceptually we want to:
1255
        Preserve the wt.basis->wt.state changes
1256
        Transform the wt.basis to the new master basis.
1257
        Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1258
        Restore the wt.basis->wt.state changes.
1259
1260
        There isn't a single operation at the moment to do that, so we:
1261
        Merge current state -> basis tree of the master w.r.t. the old tree basis.
1262
        Do a 'normal' merge of the old branch basis if it is relevant.
1263
        """
1587.1.10 by Robert Collins
update updates working tree and branch together.
1264
        old_tip = self.branch.update()
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1265
        if old_tip is not None:
1266
            self.add_pending_merge(old_tip)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1267
        self.branch.lock_read()
1268
        try:
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1269
            result = 0
1270
            if self.last_revision() != self.branch.last_revision():
1271
                # merge tree state up to new branch tip.
1272
                basis = self.basis_tree()
1273
                to_tree = self.branch.basis_tree()
1274
                result += merge_inner(self.branch,
1275
                                      to_tree,
1276
                                      basis,
1277
                                      this_tree=self)
1278
                self.set_last_revision(self.branch.last_revision())
1279
            if old_tip and old_tip != self.last_revision():
1280
                # our last revision was not the prior branch last reivison
1281
                # and we have converted that last revision to a pending merge.
1282
                # base is somewhere between the branch tip now
1283
                # and the now pending merge
1284
                from bzrlib.revision import common_ancestor
1285
                try:
1286
                    base_rev_id = common_ancestor(self.branch.last_revision(),
1287
                                                  old_tip,
1288
                                                  self.branch.repository)
1289
                except errors.NoCommonAncestor:
1290
                    base_rev_id = None
1291
                base_tree = self.branch.repository.revision_tree(base_rev_id)
1292
                other_tree = self.branch.repository.revision_tree(old_tip)
1293
                result += merge_inner(self.branch,
1294
                                      other_tree,
1295
                                      base_tree,
1296
                                      this_tree=self)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1297
            return result
1298
        finally:
1299
            self.branch.unlock()
1300
1301
    @needs_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1302
    def _write_inventory(self, inv):
1303
        """Write inventory as the current inventory."""
1304
        sio = StringIO()
1305
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1306
        sio.seek(0)
1534.4.28 by Robert Collins
first cut at merge from integration.
1307
        self._control_files.put('inventory', sio)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1308
        self._set_inventory(inv)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1309
        mutter('wrote working inventory')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1310
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1311
    def set_conflicts(self, arg):
1312
        raise UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1313
1314
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1315
    def conflicts(self):
1316
        conflicts = ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1317
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1318
            text = True
1319
            try:
1320
                if file_kind(self.abspath(conflicted)) != "file":
1321
                    text = False
1322
            except OSError, e:
1323
                if e.errno == errno.ENOENT:
1324
                    text = False
1325
                else:
1326
                    raise
1327
            if text is True:
1328
                for suffix in ('.THIS', '.OTHER'):
1329
                    try:
1330
                        kind = file_kind(self.abspath(conflicted+suffix))
1331
                    except OSError, e:
1332
                        if e.errno == errno.ENOENT:
1333
                            text = False
1334
                            break
1335
                        else:
1336
                            raise
1337
                    if kind != "file":
1338
                        text = False
1339
                        break
1340
            ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1341
            conflicts.append(Conflict.factory(ctype, path=conflicted,
1342
                             file_id=self.path2id(conflicted)))
1343
        return conflicts
1344
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1345
1346
class WorkingTree3(WorkingTree):
1347
    """This is the Format 3 working tree.
1348
1349
    This differs from the base WorkingTree by:
1350
     - having its own file lock
1351
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1352
1353
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1354
    """
1355
1356
    @needs_read_lock
1357
    def last_revision(self):
1358
        """See WorkingTree.last_revision."""
1359
        try:
1360
            return self._control_files.get_utf8('last-revision').read()
1361
        except NoSuchFile:
1362
            return None
1363
1364
    def _change_last_revision(self, revision_id):
1365
        """See WorkingTree._change_last_revision."""
1366
        if revision_id is None or revision_id == NULL_REVISION:
1367
            try:
1368
                self._control_files._transport.delete('last-revision')
1369
            except errors.NoSuchFile:
1370
                pass
1371
            return False
1372
        else:
1373
            try:
1374
                self.branch.revision_history().index(revision_id)
1375
            except ValueError:
1376
                raise errors.NoSuchRevision(self.branch, revision_id)
1377
            self._control_files.put_utf8('last-revision', revision_id)
1378
            return True
1379
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1380
    @needs_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1381
    def set_conflicts(self, conflicts):
1382
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
1383
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1384
1385
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1386
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1387
        try:
1388
            confile = self._control_files.get('conflicts')
1389
        except NoSuchFile:
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1390
            return ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1391
        try:
1392
            if confile.next() != CONFLICT_HEADER_1 + '\n':
1393
                raise ConflictFormatError()
1394
        except StopIteration:
1395
            raise ConflictFormatError()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1396
        return ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1397
1398
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1399
def get_conflicted_stem(path):
1400
    for suffix in CONFLICT_SUFFIXES:
1401
        if path.endswith(suffix):
1402
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1403
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1404
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1405
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1406
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1407
    ## FIXME: better check
1408
    filename = normpath(filename)
1409
    while filename != '':
1410
        head, tail = os.path.split(filename)
1411
        ## 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.
1412
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1413
            return True
1414
        if filename == head:
1415
            break
1416
        filename = head
1417
    return False
1418
1419
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1420
class WorkingTreeFormat(object):
1421
    """An encapsulation of the initialization and open routines for a format.
1422
1423
    Formats provide three things:
1424
     * An initialization routine,
1425
     * a format string,
1426
     * an open routine.
1427
1428
    Formats are placed in an dict by their format string for reference 
1429
    during workingtree opening. Its not required that these be instances, they
1430
    can be classes themselves with class methods - it simply depends on 
1431
    whether state is needed for a given format or not.
1432
1433
    Once a format is deprecated, just deprecate the initialize and open
1434
    methods on the format class. Do not deprecate the object, as the 
1435
    object will be created every time regardless.
1436
    """
1437
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1438
    _default_format = None
1439
    """The default format used for new trees."""
1440
1441
    _formats = {}
1442
    """The known formats."""
1443
1444
    @classmethod
1445
    def find_format(klass, a_bzrdir):
1446
        """Return the format for the working tree object in a_bzrdir."""
1447
        try:
1448
            transport = a_bzrdir.get_workingtree_transport(None)
1449
            format_string = transport.get("format").read()
1450
            return klass._formats[format_string]
1451
        except NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1452
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1453
        except KeyError:
1454
            raise errors.UnknownFormatError(format_string)
1455
1456
    @classmethod
1457
    def get_default_format(klass):
1458
        """Return the current default format."""
1459
        return klass._default_format
1460
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1461
    def get_format_string(self):
1462
        """Return the ASCII format string that identifies this format."""
1463
        raise NotImplementedError(self.get_format_string)
1464
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1465
    def get_format_description(self):
1466
        """Return the short description for this format."""
1467
        raise NotImplementedError(self.get_format_description)
1468
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1469
    def is_supported(self):
1470
        """Is this format supported?
1471
1472
        Supported formats can be initialized and opened.
1473
        Unsupported formats may not support initialization or committing or 
1474
        some other features depending on the reason for not being supported.
1475
        """
1476
        return True
1477
1478
    @classmethod
1479
    def register_format(klass, format):
1480
        klass._formats[format.get_format_string()] = format
1481
1482
    @classmethod
1483
    def set_default_format(klass, format):
1484
        klass._default_format = format
1485
1486
    @classmethod
1487
    def unregister_format(klass, format):
1488
        assert klass._formats[format.get_format_string()] is format
1489
        del klass._formats[format.get_format_string()]
1490
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1491
1492
1493
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1494
    """The second working tree format. 
1495
1496
    This format modified the hash cache from the format 1 hash cache.
1497
    """
1498
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1499
    def get_format_description(self):
1500
        """See WorkingTreeFormat.get_format_description()."""
1501
        return "Working tree format 2"
1502
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1503
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1504
        """See WorkingTreeFormat.initialize()."""
1505
        if not isinstance(a_bzrdir.transport, LocalTransport):
1506
            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.
1507
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1508
        if revision_id is not None:
1509
            branch.lock_write()
1510
            try:
1511
                revision_history = branch.revision_history()
1512
                try:
1513
                    position = revision_history.index(revision_id)
1514
                except ValueError:
1515
                    raise errors.NoSuchRevision(branch, revision_id)
1516
                branch.set_revision_history(revision_history[:position + 1])
1517
            finally:
1518
                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.
1519
        revision = branch.last_revision()
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1520
        inv = 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.
1521
        wt = WorkingTree(a_bzrdir.root_transport.base,
1522
                         branch,
1523
                         inv,
1524
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1525
                         _format=self,
1526
                         _bzrdir=a_bzrdir)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1527
        wt._write_inventory(inv)
1528
        wt.set_root_id(inv.root.file_id)
1529
        wt.set_last_revision(revision)
1530
        wt.set_pending_merges([])
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1531
        build_tree(wt.basis_tree(), wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1532
        return wt
1533
1534
    def __init__(self):
1535
        super(WorkingTreeFormat2, self).__init__()
1536
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1537
1538
    def open(self, a_bzrdir, _found=False):
1539
        """Return the WorkingTree object for a_bzrdir
1540
1541
        _found is a private parameter, do not use it. It is used to indicate
1542
               if format probing has already been done.
1543
        """
1544
        if not _found:
1545
            # we are being called directly and must probe.
1546
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1547
        if not isinstance(a_bzrdir.transport, LocalTransport):
1548
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1549
        return WorkingTree(a_bzrdir.root_transport.base,
1550
                           _internal=True,
1551
                           _format=self,
1552
                           _bzrdir=a_bzrdir)
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1553
1554
1555
class WorkingTreeFormat3(WorkingTreeFormat):
1556
    """The second working tree format updated to record a format marker.
1557
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1558
    This format:
1559
        - exists within a metadir controlling .bzr
1560
        - includes an explicit version marker for the workingtree control
1561
          files, separate from the BzrDir format
1562
        - modifies the hash cache format
1563
        - is new in bzr 0.8
1564
        - uses a LockDir to guard access to the repository
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1565
    """
1566
1567
    def get_format_string(self):
1568
        """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
1569
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1570
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1571
    def get_format_description(self):
1572
        """See WorkingTreeFormat.get_format_description()."""
1573
        return "Working tree format 3"
1574
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1575
    _lock_file_name = 'lock'
1576
    _lock_class = LockDir
1577
1578
    def _open_control_files(self, a_bzrdir):
1579
        transport = a_bzrdir.get_workingtree_transport(None)
1580
        return LockableFiles(transport, self._lock_file_name, 
1581
                             self._lock_class)
1582
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1583
    def initialize(self, a_bzrdir, revision_id=None):
1584
        """See WorkingTreeFormat.initialize().
1585
        
1586
        revision_id allows creating a working tree at a differnet
1587
        revision than the branch is at.
1588
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1589
        if not isinstance(a_bzrdir.transport, LocalTransport):
1590
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1591
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1592
        control_files = self._open_control_files(a_bzrdir)
1593
        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.
1594
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1595
        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.
1596
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1597
        if revision_id is None:
1598
            revision_id = branch.last_revision()
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1599
        inv = Inventory() 
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1600
        wt = WorkingTree3(a_bzrdir.root_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.
1601
                         branch,
1602
                         inv,
1603
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1604
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1605
                         _bzrdir=a_bzrdir,
1606
                         _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.
1607
        wt.lock_write()
1608
        try:
1609
            wt._write_inventory(inv)
1610
            wt.set_root_id(inv.root.file_id)
1611
            wt.set_last_revision(revision_id)
1612
            wt.set_pending_merges([])
1613
            build_tree(wt.basis_tree(), wt)
1614
        finally:
1615
            wt.unlock()
1616
            control_files.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1617
        return wt
1618
1619
    def __init__(self):
1620
        super(WorkingTreeFormat3, self).__init__()
1621
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1622
1623
    def open(self, a_bzrdir, _found=False):
1624
        """Return the WorkingTree object for a_bzrdir
1625
1626
        _found is a private parameter, do not use it. It is used to indicate
1627
               if format probing has already been done.
1628
        """
1629
        if not _found:
1630
            # we are being called directly and must probe.
1631
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1632
        if not isinstance(a_bzrdir.transport, LocalTransport):
1633
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1634
        control_files = self._open_control_files(a_bzrdir)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1635
        return WorkingTree3(a_bzrdir.root_transport.base,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1636
                           _internal=True,
1637
                           _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1638
                           _bzrdir=a_bzrdir,
1639
                           _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1640
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
1641
    def __str__(self):
1642
        return self.get_format_string()
1643
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1644
1645
# formats which have no format string are not discoverable
1646
# and not independently creatable, so are not registered.
1647
__default_format = WorkingTreeFormat3()
1648
WorkingTreeFormat.register_format(__default_format)
1649
WorkingTreeFormat.set_default_format(__default_format)
1650
_legacy_formats = [WorkingTreeFormat2(),
1651
                   ]
1652
1653
1654
class WorkingTreeTestProviderAdapter(object):
1655
    """A tool to generate a suite testing multiple workingtree formats at once.
1656
1657
    This is done by copying the test once for each transport and injecting
1658
    the transport_server, transport_readonly_server, and workingtree_format
1659
    classes into each copy. Each copy is also given a new id() to make it
1660
    easy to identify.
1661
    """
1662
1663
    def __init__(self, transport_server, transport_readonly_server, formats):
1664
        self._transport_server = transport_server
1665
        self._transport_readonly_server = transport_readonly_server
1666
        self._formats = formats
1667
    
1668
    def adapt(self, test):
1669
        from bzrlib.tests import TestSuite
1670
        result = TestSuite()
1671
        for workingtree_format, bzrdir_format in self._formats:
1672
            new_test = deepcopy(test)
1673
            new_test.transport_server = self._transport_server
1674
            new_test.transport_readonly_server = self._transport_readonly_server
1675
            new_test.bzrdir_format = bzrdir_format
1676
            new_test.workingtree_format = workingtree_format
1677
            def make_new_test_id():
1678
                new_id = "%s(%s)" % (new_test.id(), workingtree_format.__class__.__name__)
1679
                return lambda: new_id
1680
            new_test.id = make_new_test_id()
1681
            result.addTest(new_test)
1682
        return result