~bzr-pqm/bzr/bzr.dev

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