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