/brz/remove-bazaar

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