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