/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
        """
2255.2.60 by John Arbash Meinel
Add an explicit exception since tree.list_files() requires a lock (at least for dirstate
882
        # list_files is an iterator, so @needs_read_lock doesn't work properly
883
        # with it. So callers should be careful to always read_lock the tree.
884
        if not self.is_locked():
885
            raise errors.ObjectNotLocked(self)
886
2255.2.52 by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.
887
        inv = self.inventory
1910.2.56 by Aaron Bentley
More work on bundles
888
        if include_root is True:
889
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
890
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
891
        pathjoin = osutils.pathjoin
892
        file_kind = osutils.file_kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
893
894
        # transport.base ends in a slash, we want the piece
895
        # between the last two slashes
896
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
897
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
898
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
899
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
900
        # directory file_id, relative path, absolute path, reverse sorted children
901
        children = os.listdir(self.basedir)
902
        children.sort()
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
903
        # jam 20060527 The kernel sized tree seems equivalent whether we 
904
        # use a deque and popleft to keep them sorted, or if we use a plain
905
        # 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.
906
        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
907
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
908
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
909
            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
910
911
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
912
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
913
                ## TODO: If we find a subdirectory with its own .bzr
914
                ## directory, then that is a separate tree and we
915
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
916
917
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
918
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
919
                    continue
920
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
921
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
922
                # 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
923
                # than the checks of pathjoin(), all relative paths will have an extra slash
924
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
925
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
926
927
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
928
                fap = from_dir_abspath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
929
                
930
                f_ie = inv.get_child(from_dir_id, f)
931
                if f_ie:
932
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
933
                elif self.is_ignored(fp[1:]):
934
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
935
                else:
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
936
                    # we may not have found this file, because of a unicode issue
937
                    f_norm, can_access = osutils.normalized_filename(f)
938
                    if f == f_norm or not can_access:
939
                        # No change, so treat this file normally
940
                        c = '?'
941
                    else:
942
                        # this file can be accessed by a normalized path
943
                        # check again if it is versioned
944
                        # these lines are repeated here for performance
945
                        f = f_norm
946
                        fp = from_dir_relpath + '/' + f
947
                        fap = from_dir_abspath + '/' + f
948
                        f_ie = inv.get_child(from_dir_id, f)
949
                        if f_ie:
950
                            c = 'V'
951
                        elif self.is_ignored(fp[1:]):
952
                            c = 'I'
953
                        else:
954
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
955
956
                fk = file_kind(fap)
957
958
                if f_ie:
959
                    if f_ie.kind != fk:
2206.1.7 by Marius Kruger
* errors
960
                        raise errors.BzrCheckError(
961
                            "file %r entered as kind %r id %r, now of kind %r"
962
                            % (fap, f_ie.kind, f_ie.file_id, fk))
453 by Martin Pool
- Split WorkingTree into its own file
963
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
964
                # make a last minute entry
965
                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
966
                    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
967
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
968
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
969
                        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
970
                    except KeyError:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
971
                        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.
972
                    continue
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
973
                
453 by Martin Pool
- Split WorkingTree into its own file
974
                if fk != 'directory':
975
                    continue
976
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
977
                # 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.
978
                new_children = os.listdir(fap)
979
                new_children.sort()
980
                new_children = collections.deque(new_children)
981
                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
982
                # Break out of inner loop,
2206.1.7 by Marius Kruger
* errors
983
                # so that we start outer loop with child
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
984
                break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
985
            else:
986
                # 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.
987
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
988
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
989
    @needs_tree_write_lock
2123.3.8 by Steffen Eichenberg
new parameter to_dir must be a named parameter
990
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
991
        """Rename files.
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
        to_dir must exist in the inventory.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
994
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
995
        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.
996
        it, keeping their old names.  
997
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
998
        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.
999
        this doesn't change the directory.
1000
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1001
        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
1002
        independently.
1003
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1004
        The first mode moves the file in the filesystem and updates the
1005
        inventory. The second mode only updates the inventory without
1006
        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
1007
        in version 0.15.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1008
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
        move uses the second mode if 'after == True' and the target is not
1010
        versioned but present in the working tree.
1011
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1012
        move uses the second mode if 'after == False' and the source is
1013
        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
1014
        versioned but present in the working tree.
1015
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1016
        move uses the first mode if 'after == False' and the source is
1017
        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
1018
        versioned and not present in the working tree.
1019
1020
        Everything else results in an error.
1021
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1022
        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
1023
        entry that is moved.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1024
        """
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1025
        rename_entries = []
1026
        rename_tuples = []
1027
1028
        # check for deprecated use of signature
1029
        if to_dir is None:
1030
            to_dir = kwargs.get('to_name', None)
1031
            if to_dir is None:
1032
                raise TypeError('You must supply a target directory')
1033
            else:
1034
                symbol_versioning.warn('The parameter to_name was deprecated'
1035
                                       ' in version 0.13. Use to_dir instead',
1036
                                       DeprecationWarning)
1037
1038
        # check destination directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1039
        assert not isinstance(from_paths, basestring)
1040
        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
1041
        to_abs = self.abspath(to_dir)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1042
        if not isdir(to_abs):
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1043
            raise errors.BzrMoveFailedError('',to_dir,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1044
                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
1045
        if not self.has_filename(to_dir):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1046
            raise errors.BzrMoveFailedError('',to_dir,
1047
                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
1048
        to_dir_id = inv.path2id(to_dir)
2123.3.6 by Steffen Eichenberg
unified error messages
1049
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1050
            raise errors.BzrMoveFailedError('',to_dir,
1051
                errors.NotVersionedError(path=str(to_dir)))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1052
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1053
        to_dir_ie = inv[to_dir_id]
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
1054
        if to_dir_ie.kind != 'directory':
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1055
            raise errors.BzrMoveFailedError('',to_dir,
1056
                errors.NotADirectory(to_abs))
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1057
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1058
        # create rename entries and tuples
1059
        for from_rel in from_paths:
1060
            from_tail = splitpath(from_rel)[-1]
1061
            from_id = inv.path2id(from_rel)
1062
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1063
                raise errors.BzrMoveFailedError(from_rel,to_dir,
1064
                    errors.NotVersionedError(path=str(from_rel)))
2206.1.4 by Marius Kruger
Improved WorkingTree.move excptions. (as requested)
1065
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1066
            from_entry = inv[from_id]
1067
            from_parent_id = from_entry.parent_id
1068
            to_rel = pathjoin(to_dir, from_tail)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1069
            rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1070
                                         from_id=from_id,
1071
                                         from_tail=from_tail,
1072
                                         from_parent_id=from_parent_id,
1073
                                         to_rel=to_rel, to_tail=from_tail,
1074
                                         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
1075
            rename_entries.append(rename_entry)
1076
            rename_tuples.append((from_rel, to_rel))
1077
1078
        # determine which move mode to use. checks also for movability
1079
        rename_entries = self._determine_mv_mode(rename_entries, after)
1080
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1081
        original_modified = self._inventory_is_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1082
        try:
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
1083
            if len(from_paths):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1084
                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
1085
            self._move(rename_entries)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1086
        except:
1087
            # 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
1088
            self._inventory_is_modified = original_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1089
            raise
1090
        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
1091
        return rename_tuples
1092
1093
    def _determine_mv_mode(self, rename_entries, after=False):
1094
        """Determines for each from-to pair if both inventory and working tree
1095
        or only the inventory has to be changed.
1096
1097
        Also does basic plausability tests.
1098
        """
1099
        inv = self.inventory
1100
1101
        for rename_entry in rename_entries:
1102
            # store to local variables for easier reference
1103
            from_rel = rename_entry.from_rel
1104
            from_id = rename_entry.from_id
1105
            to_rel = rename_entry.to_rel
1106
            to_id = inv.path2id(to_rel)
1107
            only_change_inv = False
1108
1109
            # check the inventory for source and destination
1110
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1111
                raise errors.BzrMoveFailedError(from_rel,to_rel,
1112
                    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
1113
            if to_id is not None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1114
                raise errors.BzrMoveFailedError(from_rel,to_rel,
1115
                    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
1116
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1117
            # 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
1118
            # inv and file system)
1119
            if after:
1120
                if not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1121
                    raise errors.BzrMoveFailedError(from_id,to_rel,
1122
                        errors.NoSuchFile(path=str(to_rel),
1123
                        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
1124
                only_change_inv = True
1125
            elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1126
                only_change_inv = True
1127
            elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1128
                only_change_inv = False
1129
            else:
1130
                # something is wrong, so lets determine what exactly
1131
                if not self.has_filename(from_rel) and \
1132
                   not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1133
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1134
                        errors.PathsDoNotExist(paths=(str(from_rel),
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1135
                        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
1136
                else:
2220.1.11 by Marius Kruger
* bzrlib/errors.py
1137
                    raise errors.RenameFailedFilesExist(from_rel, to_rel,
1138
                        extra="(Use --after to update the Bazaar id)")
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1139
            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
1140
        return rename_entries
1141
1142
    def _move(self, rename_entries):
1143
        """Moves a list of files.
1144
1145
        Depending on the value of the flag 'only_change_inv', the
1146
        file will be moved on the file system or not.
1147
        """
1148
        inv = self.inventory
1149
        moved = []
1150
1151
        for entry in rename_entries:
1152
            try:
1153
                self._move_entry(entry)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1154
            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
1155
                self._rollback_move(moved)
1156
                raise
1157
            moved.append(entry)
1158
1159
    def _rollback_move(self, moved):
2220.1.12 by Marius Kruger
* Fix errors.py import order
1160
        """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
1161
        inv = self.inventory
1162
        for entry in moved:
1163
            try:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1164
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1165
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1166
                    entry.from_tail, entry.from_parent_id,
1167
                    entry.only_change_inv))
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1168
            except errors.BzrMoveFailedError, e:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1169
                raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1170
                        " The working tree is in an inconsistent state."
1171
                        " Please consider doing a 'bzr revert'."
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1172
                        " 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
1173
2220.1.12 by Marius Kruger
* Fix errors.py import order
1174
    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
1175
        inv = self.inventory
1176
        from_rel_abs = self.abspath(entry.from_rel)
1177
        to_rel_abs = self.abspath(entry.to_rel)
1178
        if from_rel_abs == to_rel_abs:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1179
            raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1180
                "Source and target are identical.")
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1181
2220.1.12 by Marius Kruger
* Fix errors.py import order
1182
        if not entry.only_change_inv:
1183
            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
1184
                osutils.rename(from_rel_abs, to_rel_abs)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1185
            except OSError, e:
1186
                raise errors.BzrMoveFailedError(entry.from_rel,
1187
                    entry.to_rel, e[1])
1188
        inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1189
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1190
    @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
1191
    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).
1192
        """Rename one file.
1193
1194
        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
1195
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1196
        rename_one has several 'modes' to work. First, it can rename a physical
1197
        file and change the file_id. That is the normal mode. Second, it can
1198
        only change the file_id without touching any physical file. This is
1199
        the new mode introduced in version 0.15.
1200
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
        rename_one uses the second mode if 'after == True' and 'to_rel' is not
1202
        versioned but present in the working tree.
1203
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1204
        rename_one uses the second mode if 'after == False' and 'from_rel' is
1205
        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
1206
        versioned but present in the working tree.
1207
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1208
        rename_one uses the first mode if 'after == False' and 'from_rel' is
1209
        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
1210
        versioned and not present in the working tree.
1211
1212
        Everything else results in an error.
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1213
        """
1214
        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
1215
        rename_entries = []
1216
1217
        # create rename entries and tuples
1218
        from_tail = splitpath(from_rel)[-1]
1219
        from_id = inv.path2id(from_rel)
1220
        if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1221
            raise errors.BzrRenameFailedError(from_rel,to_rel,
1222
                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
1223
        from_entry = inv[from_id]
1224
        from_parent_id = from_entry.parent_id
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1225
        to_dir, to_tail = os.path.split(to_rel)
1226
        to_dir_id = inv.path2id(to_dir)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1227
        rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1228
                                     from_id=from_id,
1229
                                     from_tail=from_tail,
1230
                                     from_parent_id=from_parent_id,
1231
                                     to_rel=to_rel, to_tail=to_tail,
1232
                                     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
1233
        rename_entries.append(rename_entry)
1234
1235
        # determine which move mode to use. checks also for movability
1236
        rename_entries = self._determine_mv_mode(rename_entries, after)
1237
1238
        # check if the target changed directory and if the target directory is
1239
        # versioned
2123.3.6 by Steffen Eichenberg
unified error messages
1240
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1241
            raise errors.BzrMoveFailedError(from_rel,to_rel,
1242
                errors.NotVersionedError(path=str(to_dir)))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1243
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1244
        # all checks done. now we can continue with our actual work
1245
        mutter('rename_one:\n'
1246
               '  from_id   {%s}\n'
1247
               '  from_rel: %r\n'
1248
               '  to_rel:   %r\n'
1249
               '  to_dir    %r\n'
1250
               '  to_dir_id {%s}\n',
1251
               from_id, from_rel, to_rel, to_dir, to_dir_id)
1252
1253
        self._move(rename_entries)
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1254
        self._write_inventory(inv)
1255
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1256
    class _RenameEntry(object):
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1257
        def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2220.1.12 by Marius Kruger
* Fix errors.py import order
1258
                     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
1259
            self.from_rel = from_rel
1260
            self.from_id = from_id
1261
            self.from_tail = from_tail
1262
            self.from_parent_id = from_parent_id
1263
            self.to_rel = to_rel
1264
            self.to_tail = to_tail
1265
            self.to_parent_id = to_parent_id
2220.1.12 by Marius Kruger
* Fix errors.py import order
1266
            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
1267
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1268
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
1269
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
1270
        """Return all unknown files.
1271
1272
        These are files in the working directory that are not versioned or
1273
        control files or ignored.
1274
        """
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1275
        # force the extras method to be fully executed before returning, to 
1276
        # prevent race conditions with the lock
1277
        return iter(
1278
            [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
1279
    
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1280
    @needs_tree_write_lock
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1281
    def unversion(self, file_ids):
1282
        """Remove the file ids in file_ids from the current versioned set.
1283
1284
        When a file_id is unversioned, all of its children are automatically
1285
        unversioned.
1286
1287
        :param file_ids: The file ids to stop versioning.
1288
        :raises: NoSuchId if any fileid is not currently versioned.
1289
        """
1290
        for file_id in file_ids:
1291
            if self._inventory.has_id(file_id):
1988.2.6 by Robert Collins
Review feedback.
1292
                self._inventory.remove_recursive_id(file_id)
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1293
            else:
1294
                raise errors.NoSuchId(self, file_id)
1295
        if len(file_ids):
1296
            # in the future this should just set a dirty bit to wait for the 
1297
            # final unlock. However, until all methods of workingtree start
1298
            # with the current in -memory inventory rather than triggering 
1299
            # a read, it is more complex - we need to teach read_inventory
1300
            # to know when to read, and when to not read first... and possibly
1301
            # to save first when the in memory one may be corrupted.
1302
            # so for now, we just only write it if it is indeed dirty.
1303
            # - RBC 20060907
1304
            self._write_inventory(self._inventory)
1305
    
1534.10.16 by Aaron Bentley
Small tweaks
1306
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1307
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
1308
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1309
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
1310
        return self._iter_conflicts()
1311
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1312
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1313
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1314
        for info in self.list_files():
1315
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1316
            stem = get_conflicted_stem(path)
1317
            if stem is None:
1318
                continue
1319
            if stem not in conflicted:
1320
                conflicted.add(stem)
1321
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
1322
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1323
    @needs_write_lock
1185.76.1 by Erik Bågfors
Support for --revision in pull
1324
    def pull(self, source, overwrite=False, stop_revision=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1325
        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().
1326
        source.lock_read()
1327
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1328
            pp = ProgressPhase("Pull phase", 2, top_pb)
1329
            pp.next_phase()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1330
            old_revision_history = self.branch.revision_history()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
1331
            basis_tree = self.basis_tree()
1534.4.54 by Robert Collins
Merge from integration.
1332
            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().
1333
            new_revision_history = self.branch.revision_history()
1334
            if new_revision_history != old_revision_history:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1335
                pp.next_phase()
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
1336
                if len(old_revision_history):
1337
                    other_revision = old_revision_history[-1]
1338
                else:
1339
                    other_revision = None
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1340
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1341
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1342
                basis_tree.lock_read()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1343
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1344
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1345
                    merge.merge_inner(
1346
                                self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1347
                                new_basis_tree,
1348
                                basis_tree,
1349
                                this_tree=self,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1350
                                pb=pb)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1351
                    if (basis_tree.inventory.root is None and
1731.1.47 by Aaron Bentley
Merge bzr.dev
1352
                        new_basis_tree.inventory.root is not None):
1353
                        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.
1354
                finally:
1355
                    pb.finished()
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1356
                    basis_tree.unlock()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1357
                # 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.
1358
                # reuse the revisiontree we merged against to set the new
1359
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1360
                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.
1361
                # we have to pull the merge trees out again, because 
1362
                # merge_inner has set the ids. - this corner is not yet 
1363
                # layered well enough to prevent double handling.
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1364
                # XXX TODO: Fix the double handling: telling the tree about
1365
                # 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.
1366
                merges = self.get_parent_ids()[1:]
1367
                parent_trees.extend([
1368
                    (parent, repository.revision_tree(parent)) for
1369
                     parent in merges])
1370
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1371
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1372
        finally:
1373
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1374
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1375
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1376
    @needs_write_lock
1377
    def put_file_bytes_non_atomic(self, file_id, bytes):
1378
        """See MutableTree.put_file_bytes_non_atomic."""
1379
        stream = file(self.id2abspath(file_id), 'wb')
1380
        try:
1381
            stream.write(bytes)
1382
        finally:
1383
            stream.close()
1384
        # TODO: update the hashcache here ?
1385
453 by Martin Pool
- Split WorkingTree into its own file
1386
    def extras(self):
1387
        """Yield all unknown files in this WorkingTree.
1388
1389
        If there are any unknown directories then only the directory is
1390
        returned, not all its children.  But if there are unknown files
1391
        under a versioned subdirectory, they are returned.
1392
1393
        Currently returned depth-first, sorted by name within directories.
1394
        """
1395
        ## TODO: Work from given directory downwards
1396
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1397
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1398
            dirabs = self.abspath(path)
1399
            if not isdir(dirabs):
1400
                # e.g. directory deleted
1401
                continue
1402
1403
            fl = []
1404
            for subf in os.listdir(dirabs):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1405
                if subf == '.bzr':
1406
                    continue
1407
                if subf not in dir_entry.children:
1408
                    subf_norm, can_access = osutils.normalized_filename(subf)
1409
                    if subf_norm != subf and can_access:
1410
                        if subf_norm not in dir_entry.children:
1411
                            fl.append(subf_norm)
1412
                    else:
1413
                        fl.append(subf)
453 by Martin Pool
- Split WorkingTree into its own file
1414
            
1415
            fl.sort()
1416
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1417
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1418
                yield subp
1419
1420
    def ignored_files(self):
1421
        """Yield list of PATH, IGNORE_PATTERN"""
1422
        for subp in self.extras():
1423
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1424
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1425
                yield subp, pat
1426
1427
    def get_ignore_list(self):
1428
        """Return list of ignore patterns.
1429
1430
        Cached in the Tree object after the first call.
1431
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1432
        ignoreset = getattr(self, '_ignoreset', None)
1433
        if ignoreset is not None:
1434
            return ignoreset
1435
1436
        ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1437
        ignore_globs.update(ignores.get_runtime_ignores())
1438
        ignore_globs.update(ignores.get_user_ignores())
453 by Martin Pool
- Split WorkingTree into its own file
1439
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1440
            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
1441
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1442
                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
1443
            finally:
1444
                f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1445
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1446
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1447
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1448
    def _flush_ignore_list_cache(self):
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1449
        """Resets the cached ignore list to force a cache rebuild."""
1450
        self._ignoreset = None
1451
        self._ignoreglobster = None
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1452
453 by Martin Pool
- Split WorkingTree into its own file
1453
    def is_ignored(self, filename):
1454
        r"""Check whether the filename matches an ignore pattern.
1455
1456
        Patterns containing '/' or '\' need to match the whole path;
1457
        others match against only the last component.
1458
1459
        If the file is ignored, returns the pattern which caused it to
1460
        be ignored, otherwise None.  So this can simply be used as a
1461
        boolean if desired."""
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1462
        if getattr(self, '_ignoreglobster', None) is None:
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1463
            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)
1464
        return self._ignoreglobster.match(filename)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1465
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1466
    def kind(self, file_id):
1467
        return file_kind(self.id2abspath(file_id))
1468
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1469
    def _comparison_data(self, entry, path):
1470
        abspath = self.abspath(path)
1471
        try:
1472
            stat_value = os.lstat(abspath)
1473
        except OSError, e:
1474
            if getattr(e, 'errno', None) == errno.ENOENT:
1475
                stat_value = None
1476
                kind = None
1477
                executable = False
1478
            else:
1479
                raise
1480
        else:
1481
            mode = stat_value.st_mode
1482
            kind = osutils.file_kind_from_stat_mode(mode)
1483
            if not supports_executable():
1484
                executable = entry.executable
1485
            else:
1486
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1487
        return kind, executable, stat_value
1488
1489
    def _file_size(self, entry, stat_value):
1490
        return stat_value.st_size
1491
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1492
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1493
        """Return the last revision of the branch for this tree.
1494
1495
        This format tree does not support a separate marker for last-revision
1496
        compared to the branch.
1497
1498
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1499
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1500
        return self._last_revision()
1501
1502
    @needs_read_lock
1503
    def _last_revision(self):
1504
        """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()
1505
        return self.branch.last_revision()
1506
1694.2.6 by Martin Pool
[merge] bzr.dev
1507
    def is_locked(self):
1508
        return self._control_files.is_locked()
1509
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1510
    def lock_read(self):
1511
        """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.
1512
        self.branch.lock_read()
1513
        try:
1514
            return self._control_files.lock_read()
1515
        except:
1516
            self.branch.unlock()
1517
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1518
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1519
    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.
1520
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1521
        self.branch.lock_read()
1522
        try:
1523
            return self._control_files.lock_write()
1524
        except:
1525
            self.branch.unlock()
1526
            raise
1527
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1528
    def lock_write(self):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1529
        """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.
1530
        self.branch.lock_write()
1531
        try:
1532
            return self._control_files.lock_write()
1533
        except:
1534
            self.branch.unlock()
1535
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1536
1694.2.6 by Martin Pool
[merge] bzr.dev
1537
    def get_physical_lock_status(self):
1538
        return self._control_files.get_physical_lock_status()
1539
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1540
    def _basis_inventory_name(self):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1541
        return 'basis-inventory-cache'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1542
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1543
    @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.
1544
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1545
        """Change the last revision in the working tree."""
1546
        if self._change_last_revision(new_revision):
1547
            self._cache_basis_inventory(new_revision)
1548
1549
    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.
1550
        """Template method part of set_last_revision to perform the change.
1551
        
1552
        This is used to allow WorkingTree3 instances to not affect branch
1553
        when their last revision is set.
1554
        """
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1555
        if new_revision is None:
1556
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1557
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1558
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1559
            self.branch.generate_revision_history(new_revision)
1560
        except errors.NoSuchRevision:
1561
            # not present in the repo - dont try to set it deeper than the tip
1562
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1563
        return True
1564
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1565
    def _write_basis_inventory(self, xml):
1566
        """Write the basis inventory XML to the basis-inventory file"""
1567
        assert isinstance(xml, str), 'serialised xml must be bytestring.'
1568
        path = self._basis_inventory_name()
1569
        sio = StringIO(xml)
1570
        self._control_files.put(path, sio)
1571
1572
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1573
        """Create the text that will be saved in basis-inventory"""
1574
        inventory.revision_id = revision_id
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
1575
        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.
1576
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1577
    def _cache_basis_inventory(self, new_revision):
1578
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1579
        # TODO: this should allow the ready-to-use inventory to be passed in,
1580
        # as commit already has that ready-to-use [while the format is the
1581
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1582
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1583
            # this double handles the inventory - unpack and repack - 
1584
            # but is easier to understand. We can/should put a conditional
1585
            # in here based on whether the inventory is in the latest format
1586
            # - perhaps we should repack all inventories on a repository
1587
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1588
            # the fast path is to copy the raw xml from the repository. If the
1589
            # xml contains 'revision_id="', then we assume the right 
1590
            # revision_id is set. We must check for this full string, because a
1591
            # root node id can legitimately look like 'revision_id' but cannot
1592
            # contain a '"'.
1593
            xml = self.branch.repository.get_inventory_xml(new_revision)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1594
            firstline = xml.split('\n', 1)[0]
1595
            if (not 'revision_id="' in firstline or 
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1596
                'format="6"' not in firstline):
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1597
                inv = self.branch.repository.deserialise_inventory(
1598
                    new_revision, xml)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1599
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1600
            self._write_basis_inventory(xml)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1601
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1602
            pass
1603
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1604
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1605
        """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.
1606
        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.
1607
        return self._control_files.get(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1608
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1609
    @needs_read_lock
1610
    def read_working_inventory(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1611
        """Read the working inventory.
1612
        
1986.5.7 by Robert Collins
Merge reviews.
1613
        :raises errors.InventoryModified: read_working_inventory will fail
1614
            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
1615
        """
1616
        # conceptually this should be an implementation detail of the tree. 
1617
        # XXX: Deprecate this.
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1618
        # ElementTree does its own conversion from UTF-8, so open in
1619
        # binary.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1620
        if self._inventory_is_modified:
1621
            raise errors.InventoryModified(self)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1622
        result = xml5.serializer_v5.read_inventory(
1534.4.28 by Robert Collins
first cut at merge from integration.
1623
            self._control_files.get('inventory'))
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1624
        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()
1625
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1626
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1627
    @needs_tree_write_lock
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1628
    def remove(self, files, verbose=False, to_file=None):
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1629
        """Remove nominated files from the working inventory..
1630
1631
        This does not remove their text.  This does not run on XXX on what? RBC
1632
1633
        TODO: Refuse to remove modified files unless --force is given?
1634
1635
        TODO: Do something useful with directories.
1636
1637
        TODO: Should this remove the text or not?  Tough call; not
1638
        removing may be useful and the user can just use use rm, and
1639
        is the opposite of add.  Removing it is consistent with most
1640
        other tools.  Maybe an option.
1641
        """
1642
        ## TODO: Normalize names
1643
        ## TODO: Remove nested loops; better scalability
1644
        if isinstance(files, basestring):
1645
            files = [files]
1646
1647
        inv = self.inventory
1648
1649
        # do this before any modifications
1650
        for f in files:
1651
            fid = inv.path2id(f)
1652
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
1653
                # TODO: Perhaps make this just a warning, and continue?
1654
                # This tends to happen when 
2206.1.7 by Marius Kruger
* errors
1655
                raise errors.NotVersionedError(path=f)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1656
            if verbose:
1657
                # having remove it, it must be either ignored or unknown
1658
                if self.is_ignored(f):
1659
                    new_status = 'I'
1660
                else:
1661
                    new_status = '?'
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1662
                textui.show_status(new_status, inv[fid].kind, f,
1663
                                   to_file=to_file)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1664
            del inv[fid]
1665
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1666
        self._write_inventory(inv)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1667
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1668
    @needs_tree_write_lock
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1669
    def revert(self, filenames, old_tree=None, backups=True, 
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1670
               pb=DummyProgress(), report_changes=False):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1671
        from bzrlib.conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1672
        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()
1673
            old_tree = self.basis_tree()
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1674
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1675
                                     report_changes)
1457.1.8 by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner.
1676
        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.
1677
            self.set_parent_ids(self.get_parent_ids()[:1])
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1678
            resolve(self)
1679
        else:
1534.10.15 by Aaron Bentley
Revert does resolve
1680
            resolve(self, filenames, ignore_misses=True)
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1681
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1682
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
1683
    def revision_tree(self, revision_id):
1684
        """See Tree.revision_tree.
1685
1686
        WorkingTree can supply revision_trees for the basis revision only
1687
        because there is only one cached inventory in the bzr directory.
1688
        """
1689
        if revision_id == self.last_revision():
1690
            try:
1691
                xml = self.read_basis_inventory()
1852.16.5 by John Arbash Meinel
[merge] bzr.dev 2255, resolve conflicts, update copyrights
1692
            except errors.NoSuchFile:
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
1693
                pass
1694
            else:
1908.11.3 by Robert Collins
Merge bzr.dev
1695
                try:
1908.11.6 by John Arbash Meinel
Fix an invalid access to bzrlib.xml6 in workingtree.py
1696
                    inv = xml6.serializer_v6.read_inventory_from_string(xml)
1908.11.3 by Robert Collins
Merge bzr.dev
1697
                    # dont use the repository revision_tree api because we want
1698
                    # to supply the inventory.
1699
                    if inv.revision_id == revision_id:
1908.11.5 by John Arbash Meinel
[merge] bzr.dev 2240
1700
                        return revisiontree.RevisionTree(self.branch.repository,
1908.11.3 by Robert Collins
Merge bzr.dev
1701
                            inv, revision_id)
1702
                except errors.BadInventoryFormat:
1703
                    pass
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
1704
        # raise if there was no inventory, or if we read the wrong inventory.
1705
        raise errors.NoSuchRevisionInTree(self, revision_id)
1706
1658.1.3 by Martin Pool
Doc
1707
    # XXX: This method should be deprecated in favour of taking in a proper
1708
    # new Inventory object.
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1709
    @needs_tree_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1710
    def set_inventory(self, new_inventory_list):
1711
        from bzrlib.inventory import (Inventory,
1712
                                      InventoryDirectory,
1713
                                      InventoryEntry,
1714
                                      InventoryFile,
1715
                                      InventoryLink)
1716
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1717
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1718
            name = os.path.basename(path)
1719
            if name == "":
1720
                continue
1721
            # fixme, there should be a factory function inv,add_?? 
1722
            if kind == 'directory':
1723
                inv.add(InventoryDirectory(file_id, name, parent))
1724
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1725
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1726
            elif kind == 'symlink':
1727
                inv.add(InventoryLink(file_id, name, parent))
1728
            else:
2206.1.7 by Marius Kruger
* errors
1729
                raise errors.BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1730
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1731
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1732
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1733
    def set_root_id(self, file_id):
1734
        """Set the root id for this tree."""
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
1735
        # for compatability 
1736
        if file_id is None:
1737
            symbol_versioning.warn(symbol_versioning.zero_twelve
1738
                % 'WorkingTree.set_root_id with fileid=None',
1739
                DeprecationWarning,
1740
                stacklevel=3)
1741
            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.
1742
        self._set_root_id(file_id)
1743
1744
    def _set_root_id(self, file_id):
1745
        """Set the root id for this tree, in a format specific manner.
1746
1747
        :param file_id: The file id to assign to the root. It must not be 
1748
            present in the current inventory or an error will occur. It must
1749
            not be None, but rather a valid file id.
1750
        """
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
1751
        inv = self._inventory
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1752
        orig_root_id = inv.root.file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1753
        # TODO: it might be nice to exit early if there was nothing
1754
        # to do, saving us from trigger a sync on unlock.
1755
        self._inventory_is_modified = True
1756
        # we preserve the root inventory entry object, but
1757
        # unlinkit from the byid index
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1758
        del inv._byid[inv.root.file_id]
1759
        inv.root.file_id = file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1760
        # and link it into the index with the new changed id.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1761
        inv._byid[inv.root.file_id] = inv.root
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1762
        # and finally update all children to reference the new id.
1763
        # XXX: this should be safe to just look at the root.children
1764
        # list, not the WHOLE INVENTORY.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1765
        for fid in inv:
1766
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1767
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1768
                entry.parent_id = inv.root.file_id
1769
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1770
    def unlock(self):
1771
        """See Branch.unlock.
1772
        
1773
        WorkingTree locking just uses the Branch locking facilities.
1774
        This is current because all working trees have an embedded branch
1775
        within them. IF in the future, we were to make branch data shareable
1776
        between multiple working trees, i.e. via shared storage, then we 
1777
        would probably want to lock both the local tree, and the branch.
1778
        """
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.
1779
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1780
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1781
    def update(self):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1782
        """Update a working tree along its branch.
1783
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1784
        This will update the branch if its bound too, which means we have
1785
        multiple trees involved:
1786
1787
        - The new basis tree of the master.
1788
        - The old basis tree of the branch.
1789
        - The old basis tree of the working tree.
1790
        - The current working tree state.
1791
1792
        Pathologically, all three may be different, and non-ancestors of each
1793
        other.  Conceptually we want to:
1794
1795
        - Preserve the wt.basis->wt.state changes
1796
        - Transform the wt.basis to the new master basis.
1797
        - Apply a merge of the old branch basis to get any 'local' changes from
1798
          it into the tree.
1799
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1800
1801
        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
1802
        - Merge current state -> basis tree of the master w.r.t. the old tree
1803
          basis.
1804
        - 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.
1805
        """
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1806
        if self.branch.get_master_branch() is not None:
1807
            self.lock_write()
1808
            update_branch = True
1809
        else:
1810
            self.lock_tree_write()
1811
            update_branch = False
1812
        try:
1813
            if update_branch:
1814
                old_tip = self.branch.update()
1815
            else:
1816
                old_tip = None
1817
            return self._update_tree(old_tip)
1818
        finally:
1819
            self.unlock()
1820
1821
    @needs_tree_write_lock
1822
    def _update_tree(self, old_tip=None):
1823
        """Update a tree to the master branch.
1824
1825
        :param old_tip: if supplied, the previous tip revision the branch,
1826
            before it was changed to the master branch's tip.
1827
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1828
        # here if old_tip is not None, it is the old tip of the branch before
1829
        # it was updated from the master branch. This should become a pending
1830
        # merge in the working tree to preserve the user existing work.  we
1831
        # cant set that until we update the working trees last revision to be
1832
        # one from the new branch, because it will just get absorbed by the
1833
        # parent de-duplication logic.
1834
        # 
1835
        # We MUST save it even if an error occurs, because otherwise the users
1836
        # local work is unreferenced and will appear to have been lost.
1837
        # 
1838
        result = 0
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1839
        try:
1840
            last_rev = self.get_parent_ids()[0]
1841
        except IndexError:
1842
            last_rev = None
1843
        if last_rev != self.branch.last_revision():
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1844
            # merge tree state up to new branch tip.
1845
            basis = self.basis_tree()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
1846
            basis.lock_read()
1847
            try:
1848
                to_tree = self.branch.basis_tree()
1849
                if basis.inventory.root is None:
1850
                    self.set_root_id(to_tree.inventory.root.file_id)
1851
                result += merge.merge_inner(
1852
                                      self.branch,
1853
                                      to_tree,
1854
                                      basis,
1855
                                      this_tree=self)
1856
            finally:
1857
                basis.unlock()
1908.6.6 by Robert Collins
Merge updated set_parents api.
1858
            # TODO - dedup parents list with things merged by pull ?
1859
            # reuse the tree we've updated to to set the basis:
1860
            parent_trees = [(self.branch.last_revision(), to_tree)]
1861
            merges = self.get_parent_ids()[1:]
1862
            # Ideally we ask the tree for the trees here, that way the working
1863
            # tree can decide whether to give us teh entire tree or give us a
1864
            # lazy initialised tree. dirstate for instance will have the trees
1865
            # in ram already, whereas a last-revision + basis-inventory tree
1866
            # will not, but also does not need them when setting parents.
1867
            for parent in merges:
1868
                parent_trees.append(
1869
                    (parent, self.branch.repository.revision_tree(parent)))
1870
            if old_tip is not None:
1871
                parent_trees.append(
1872
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
1873
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1874
            last_rev = parent_trees[0][0]
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1875
        else:
1876
            # the working tree had the same last-revision as the master
1877
            # branch did. We may still have pivot local work from the local
1878
            # 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.
1879
            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.
1880
                self.add_parent_tree_id(old_tip)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1881
        if old_tip and old_tip != last_rev:
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1882
            # our last revision was not the prior branch last revision
1883
            # and we have converted that last revision to a pending merge.
1884
            # base is somewhere between the branch tip now
1885
            # and the now pending merge
2255.2.55 by John Arbash Meinel
add extra flush() call to make _update_tree work for dirstate.
1886
1887
            # Since we just modified the working tree and inventory, flush out
1888
            # the current state, before we modify it again.
1889
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
1890
            #       requires it only because TreeTransform directly munges the
1891
            #       inventory and calls tree._write_inventory(). Ultimately we
1892
            #       should be able to remove this extra flush.
1893
            self.flush()
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1894
            from bzrlib.revision import common_ancestor
1895
            try:
1896
                base_rev_id = common_ancestor(self.branch.last_revision(),
1897
                                              old_tip,
1898
                                              self.branch.repository)
1899
            except errors.NoCommonAncestor:
1900
                base_rev_id = None
1901
            base_tree = self.branch.repository.revision_tree(base_rev_id)
1902
            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.
1903
            result += merge.merge_inner(
1904
                                  self.branch,
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1905
                                  other_tree,
1906
                                  base_tree,
1907
                                  this_tree=self)
1908
        return result
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1909
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
1910
    def _write_hashcache_if_dirty(self):
1911
        """Write out the hashcache if it is dirty."""
1912
        if self._hashcache.needs_write:
1913
            try:
1914
                self._hashcache.write()
1915
            except OSError, e:
1916
                if e.errno not in (errno.EPERM, errno.EACCES):
1917
                    raise
1918
                # TODO: jam 20061219 Should this be a warning? A single line
1919
                #       warning might be sufficient to let the user know what
1920
                #       is going on.
1921
                mutter('Could not write hashcache for %s\nError: %s',
1922
                       self._hashcache.cache_file_name(), e)
1923
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1924
    @needs_tree_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1925
    def _write_inventory(self, inv):
1926
        """Write inventory as the current inventory."""
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1927
        self._set_inventory(inv, dirty=True)
1928
        self.flush()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1929
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1930
    def set_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1931
        raise errors.UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1932
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1933
    def add_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1934
        raise errors.UnsupportedOperation(self.add_conflicts, self)
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1935
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1936
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1937
    def conflicts(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1938
        conflicts = _mod_conflicts.ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1939
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1940
            text = True
1941
            try:
1942
                if file_kind(self.abspath(conflicted)) != "file":
1943
                    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.
1944
            except errors.NoSuchFile:
1945
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1946
            if text is True:
1947
                for suffix in ('.THIS', '.OTHER'):
1948
                    try:
1949
                        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.
1950
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1951
                            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.
1952
                    except errors.NoSuchFile:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1953
                        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.
1954
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1955
                        break
1956
            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.
1957
            conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1958
                             path=conflicted,
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1959
                             file_id=self.path2id(conflicted)))
1960
        return conflicts
1961
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
1962
    def walkdirs(self, prefix=""):
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
1963
        """Walk the directories of this tree.
1964
1965
        This API returns a generator, which is only valid during the current
1966
        tree transaction - within a single lock_read or lock_write duration.
1967
1968
        If the tree is not locked, it may cause an error to be raised, depending
1969
        on the tree implementation.
1970
        """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1971
        disk_top = self.abspath(prefix)
1972
        if disk_top.endswith('/'):
1973
            disk_top = disk_top[:-1]
1974
        top_strip_len = len(disk_top) + 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1975
        inventory_iterator = self._walkdirs(prefix)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1976
        disk_iterator = osutils.walkdirs(disk_top, prefix)
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1977
        try:
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
1978
            current_disk = disk_iterator.next()
1979
            disk_finished = False
1980
        except OSError, e:
1981
            if e.errno != errno.ENOENT:
1982
                raise
1983
            current_disk = None
1984
            disk_finished = True
1985
        try:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
1986
            current_inv = inventory_iterator.next()
1987
            inv_finished = False
1988
        except StopIteration:
1989
            current_inv = None
1990
            inv_finished = True
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
1991
        while not inv_finished or not disk_finished:
1992
            if not disk_finished:
1993
                # strip out .bzr dirs
1994
                if current_disk[0][1][top_strip_len:] == '':
1995
                    # osutils.walkdirs can be made nicer - 
1996
                    # yield the path-from-prefix rather than the pathjoined
1997
                    # value.
1998
                    bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))
1999
                    if current_disk[1][bzrdir_loc][0] == '.bzr':
2000
                        # we dont yield the contents of, or, .bzr itself.
2001
                        del current_disk[1][bzrdir_loc]
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2002
            if inv_finished:
2003
                # 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.
2004
                direction = 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2005
            elif disk_finished:
2006
                # 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.
2007
                direction = -1
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2008
            else:
2009
                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.
2010
            if direction > 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2011
                # disk is before inventory - unknown
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2012
                dirblock = [(relpath, basename, kind, stat, None, None) for
2013
                    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.
2014
                yield (current_disk[0][0], None), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2015
                try:
2016
                    current_disk = disk_iterator.next()
2017
                except StopIteration:
2018
                    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.
2019
            elif direction < 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2020
                # inventory is before disk - missing.
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2021
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2022
                    for relpath, basename, dkind, stat, fileid, kind in 
2023
                    current_inv[1]]
2024
                yield (current_inv[0][0], current_inv[0][1]), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2025
                try:
2026
                    current_inv = inventory_iterator.next()
2027
                except StopIteration:
2028
                    inv_finished = True
2029
            else:
2030
                # versioned present directory
2031
                # merge the inventory and disk data together
2032
                dirblock = []
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2033
                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.
2034
                    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.
2035
                    path_elements = list(subiterator)
2036
                    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.
2037
                        inv_row, disk_row = path_elements
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2038
                        # 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.
2039
                        dirblock.append((inv_row[0],
2040
                            inv_row[1], disk_row[2],
2041
                            disk_row[3], inv_row[4],
2042
                            inv_row[5]))
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2043
                    elif len(path_elements[0]) == 5:
2044
                        # unknown disk file
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2045
                        dirblock.append((path_elements[0][0],
2046
                            path_elements[0][1], path_elements[0][2],
2047
                            path_elements[0][3], None, None))
2048
                    elif len(path_elements[0]) == 6:
2049
                        # versioned, absent file.
2050
                        dirblock.append((path_elements[0][0],
2051
                            path_elements[0][1], 'unknown', None,
2052
                            path_elements[0][4], path_elements[0][5]))
2053
                    else:
2054
                        raise NotImplementedError('unreachable code')
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2055
                yield current_inv[0], dirblock
2056
                try:
2057
                    current_inv = inventory_iterator.next()
2058
                except StopIteration:
2059
                    inv_finished = True
2060
                try:
2061
                    current_disk = disk_iterator.next()
2062
                except StopIteration:
2063
                    disk_finished = True
2064
2065
    def _walkdirs(self, prefix=""):
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2066
        _directory = 'directory'
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2067
        # get the root in the inventory
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2068
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2069
        top_id = inv.path2id(prefix)
2070
        if top_id is None:
2071
            pending = []
2072
        else:
2073
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2074
        while pending:
2075
            dirblock = []
2076
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2077
            # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2078
            top_id = currentdir[4]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2079
            if currentdir[0]:
2080
                relroot = currentdir[0] + '/'
2081
            else:
2082
                relroot = ""
2083
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2084
            entry = inv[top_id]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2085
            for name, child in entry.sorted_children():
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2086
                dirblock.append((relroot + name, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2087
                    child.file_id, child.kind
2088
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2089
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2090
            # push the user specified dirs from dirblock
2091
            for dir in reversed(dirblock):
2092
                if dir[2] == _directory:
2093
                    pending.append(dir)
2094
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2095
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.
2096
class WorkingTree2(WorkingTree):
2097
    """This is the Format 2 working tree.
2098
2099
    This was the first weave based working tree. 
2100
     - uses os locks for locking.
2101
     - uses the branch last-revision.
2102
    """
2103
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
2104
    def lock_tree_write(self):
2105
        """See WorkingTree.lock_tree_write().
2106
2107
        In Format2 WorkingTrees we have a single lock for the branch and tree
2108
        so lock_tree_write() degrades to lock_write().
2109
        """
2110
        self.branch.lock_write()
2111
        try:
2112
            return self._control_files.lock_write()
2113
        except:
2114
            self.branch.unlock()
2115
            raise
2116
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.
2117
    def unlock(self):
2118
        # we share control files:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2119
        if self._control_files._lock_count == 3:
2120
            # _inventory_is_modified is always False during a read lock.
2121
            if self._inventory_is_modified:
2122
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2123
            self._write_hashcache_if_dirty()
2124
                    
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.
2125
        # reverse order of locking.
2126
        try:
2127
            return self._control_files.unlock()
2128
        finally:
2129
            self.branch.unlock()
2130
2131
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2132
class WorkingTree3(WorkingTree):
2133
    """This is the Format 3 working tree.
2134
2135
    This differs from the base WorkingTree by:
2136
     - having its own file lock
2137
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2138
2139
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2140
    """
2141
2142
    @needs_read_lock
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2143
    def _last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
2144
        """See Mutable.last_revision."""
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2145
        try:
2146
            return self._control_files.get_utf8('last-revision').read()
2206.1.7 by Marius Kruger
* errors
2147
        except errors.NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2148
            return None
2149
2150
    def _change_last_revision(self, revision_id):
2151
        """See WorkingTree._change_last_revision."""
2152
        if revision_id is None or revision_id == NULL_REVISION:
2153
            try:
2154
                self._control_files._transport.delete('last-revision')
2155
            except errors.NoSuchFile:
2156
                pass
2157
            return False
2158
        else:
2159
            self._control_files.put_utf8('last-revision', revision_id)
2160
            return True
2161
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2162
    @needs_tree_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2163
    def set_conflicts(self, conflicts):
2164
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
2165
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2166
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2167
    @needs_tree_write_lock
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2168
    def add_conflicts(self, new_conflicts):
2169
        conflict_set = set(self.conflicts())
2170
        conflict_set.update(set(list(new_conflicts)))
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2171
        self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
2172
                                       key=_mod_conflicts.Conflict.sort_key)))
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2173
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2174
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2175
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2176
        try:
2177
            confile = self._control_files.get('conflicts')
2206.1.7 by Marius Kruger
* errors
2178
        except errors.NoSuchFile:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2179
            return _mod_conflicts.ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2180
        try:
2181
            if confile.next() != CONFLICT_HEADER_1 + '\n':
2206.1.7 by Marius Kruger
* errors
2182
                raise errors.ConflictFormatError()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2183
        except StopIteration:
2206.1.7 by Marius Kruger
* errors
2184
            raise errors.ConflictFormatError()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2185
        return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2186
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.
2187
    def unlock(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2188
        if self._control_files._lock_count == 1:
2189
            # _inventory_is_modified is always False during a read lock.
2190
            if self._inventory_is_modified:
2191
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2192
            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.
2193
        # reverse order of locking.
2194
        try:
2195
            return self._control_files.unlock()
2196
        finally:
2197
            self.branch.unlock()
2198
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2199
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2200
def get_conflicted_stem(path):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2201
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2202
        if path.endswith(suffix):
2203
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2204
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.
2205
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
2206
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2207
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
2208
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2209
    ## FIXME: better check
2210
    filename = normpath(filename)
2211
    while filename != '':
2212
        head, tail = os.path.split(filename)
2213
        ## 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.
2214
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2215
            return True
2216
        if filename == head:
2217
            break
2218
        filename = head
2219
    return False
2220
2221
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2222
class WorkingTreeFormat(object):
2223
    """An encapsulation of the initialization and open routines for a format.
2224
2225
    Formats provide three things:
2226
     * An initialization routine,
2227
     * a format string,
2228
     * an open routine.
2229
2230
    Formats are placed in an dict by their format string for reference 
2231
    during workingtree opening. Its not required that these be instances, they
2232
    can be classes themselves with class methods - it simply depends on 
2233
    whether state is needed for a given format or not.
2234
2235
    Once a format is deprecated, just deprecate the initialize and open
2236
    methods on the format class. Do not deprecate the object, as the 
2237
    object will be created every time regardless.
2238
    """
2239
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2240
    _default_format = None
2241
    """The default format used for new trees."""
2242
2243
    _formats = {}
2244
    """The known formats."""
2245
2246
    @classmethod
2247
    def find_format(klass, a_bzrdir):
2248
        """Return the format for the working tree object in a_bzrdir."""
2249
        try:
2250
            transport = a_bzrdir.get_workingtree_transport(None)
2251
            format_string = transport.get("format").read()
2252
            return klass._formats[format_string]
2206.1.7 by Marius Kruger
* errors
2253
        except errors.NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2254
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2255
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
2256
            raise errors.UnknownFormatError(format=format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2257
2258
    @classmethod
2259
    def get_default_format(klass):
2260
        """Return the current default format."""
2261
        return klass._default_format
2262
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2263
    def get_format_string(self):
2264
        """Return the ASCII format string that identifies this format."""
2265
        raise NotImplementedError(self.get_format_string)
2266
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2267
    def get_format_description(self):
2268
        """Return the short description for this format."""
2269
        raise NotImplementedError(self.get_format_description)
2270
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2271
    def is_supported(self):
2272
        """Is this format supported?
2273
2274
        Supported formats can be initialized and opened.
2275
        Unsupported formats may not support initialization or committing or 
2276
        some other features depending on the reason for not being supported.
2277
        """
2278
        return True
2279
2280
    @classmethod
2281
    def register_format(klass, format):
2282
        klass._formats[format.get_format_string()] = format
2283
2284
    @classmethod
2285
    def set_default_format(klass, format):
2286
        klass._default_format = format
2287
2288
    @classmethod
2289
    def unregister_format(klass, format):
2290
        assert klass._formats[format.get_format_string()] is format
2291
        del klass._formats[format.get_format_string()]
2292
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2293
2294
2295
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2296
    """The second working tree format. 
2297
2298
    This format modified the hash cache from the format 1 hash cache.
2299
    """
2300
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2301
    def get_format_description(self):
2302
        """See WorkingTreeFormat.get_format_description()."""
2303
        return "Working tree format 2"
2304
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
2305
    def stub_initialize_remote(self, control_files):
2306
        """As a special workaround create critical control files for a remote working tree
2307
        
2308
        This ensures that it can later be updated and dealt with locally,
2309
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
2310
        no working tree.  (See bug #43064).
2311
        """
2312
        sio = StringIO()
2313
        inv = Inventory()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2314
        xml5.serializer_v5.write_inventory(inv, sio)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
2315
        sio.seek(0)
2316
        control_files.put('inventory', sio)
2317
2318
        control_files.put_utf8('pending-merges', '')
2319
        
2320
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2321
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2322
        """See WorkingTreeFormat.initialize()."""
2323
        if not isinstance(a_bzrdir.transport, LocalTransport):
2324
            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.
2325
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2326
        if revision_id is not None:
2327
            branch.lock_write()
2328
            try:
2329
                revision_history = branch.revision_history()
2330
                try:
2331
                    position = revision_history.index(revision_id)
2332
                except ValueError:
2333
                    raise errors.NoSuchRevision(branch, revision_id)
2334
                branch.set_revision_history(revision_history[:position + 1])
2335
            finally:
2336
                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.
2337
        revision = branch.last_revision()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2338
        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.
2339
        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.
2340
                         branch,
2341
                         inv,
2342
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2343
                         _format=self,
2344
                         _bzrdir=a_bzrdir)
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2345
        basis_tree = branch.repository.revision_tree(revision)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2346
        if basis_tree.inventory.root is not None:
1986.5.8 by Robert Collins
Merge bzr.dev.
2347
            wt.set_root_id(basis_tree.inventory.root.file_id)
2348
        # 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.
2349
        wt.set_parent_trees([(revision, basis_tree)])
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2350
        transform.build_tree(basis_tree, wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2351
        return wt
2352
2353
    def __init__(self):
2354
        super(WorkingTreeFormat2, self).__init__()
2355
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2356
2357
    def open(self, a_bzrdir, _found=False):
2358
        """Return the WorkingTree object for a_bzrdir
2359
2360
        _found is a private parameter, do not use it. It is used to indicate
2361
               if format probing has already been done.
2362
        """
2363
        if not _found:
2364
            # we are being called directly and must probe.
2365
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2366
        if not isinstance(a_bzrdir.transport, LocalTransport):
2367
            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.
2368
        return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2369
                           _internal=True,
2370
                           _format=self,
2371
                           _bzrdir=a_bzrdir)
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2372
2373
2374
class WorkingTreeFormat3(WorkingTreeFormat):
2375
    """The second working tree format updated to record a format marker.
2376
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2377
    This format:
2378
        - exists within a metadir controlling .bzr
2379
        - includes an explicit version marker for the workingtree control
2380
          files, separate from the BzrDir format
2381
        - modifies the hash cache format
2382
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2383
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2384
    """
2385
2386
    def get_format_string(self):
2387
        """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
2388
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2389
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2390
    def get_format_description(self):
2391
        """See WorkingTreeFormat.get_format_description()."""
2392
        return "Working tree format 3"
2393
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2394
    _lock_file_name = 'lock'
2395
    _lock_class = LockDir
2396
2397
    def _open_control_files(self, a_bzrdir):
2398
        transport = a_bzrdir.get_workingtree_transport(None)
2399
        return LockableFiles(transport, self._lock_file_name, 
2400
                             self._lock_class)
2401
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2402
    def initialize(self, a_bzrdir, revision_id=None):
2403
        """See WorkingTreeFormat.initialize().
2404
        
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2405
        revision_id allows creating a working tree at a different
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2406
        revision than the branch is at.
2407
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2408
        if not isinstance(a_bzrdir.transport, LocalTransport):
2409
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2410
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2411
        control_files = self._open_control_files(a_bzrdir)
2412
        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.
2413
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2414
        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.
2415
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2416
        if revision_id is None:
2417
            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
2418
        # WorkingTree3 can handle an inventory which has a unique root id.
2419
        # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2420
        # those trees. And because there isn't a format bump inbetween, we
2421
        # are maintaining compatibility with older clients.
2422
        # inv = Inventory(root_id=gen_root_id())
2423
        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
2424
        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.
2425
                         branch,
2426
                         inv,
2427
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2428
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2429
                         _bzrdir=a_bzrdir,
2430
                         _control_files=control_files)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
2431
        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.
2432
        try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2433
            basis_tree = branch.repository.revision_tree(revision_id)
1986.5.8 by Robert Collins
Merge bzr.dev.
2434
            # only set an explicit root id if there is one to set.
2435
            if basis_tree.inventory.root is not None:
2436
                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.
2437
            if revision_id == NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
2438
                wt.set_parent_trees([])
2439
            else:
2440
                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.
2441
            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.
2442
        finally:
1986.5.7 by Robert Collins
Merge reviews.
2443
            # 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)
2444
            # WorkingTree is given a chance to fire.
2445
            control_files.unlock()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
2446
            wt.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2447
        return wt
2448
2449
    def __init__(self):
2450
        super(WorkingTreeFormat3, self).__init__()
2451
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2452
2453
    def open(self, a_bzrdir, _found=False):
2454
        """Return the WorkingTree object for a_bzrdir
2455
2456
        _found is a private parameter, do not use it. It is used to indicate
2457
               if format probing has already been done.
2458
        """
2459
        if not _found:
2460
            # we are being called directly and must probe.
2461
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2462
        if not isinstance(a_bzrdir.transport, LocalTransport):
2463
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2464
        return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2465
2466
    def _open(self, a_bzrdir, control_files):
2467
        """Open the tree itself.
2468
        
2469
        :param a_bzrdir: the dir for the tree.
2470
        :param control_files: the control files for the tree.
2471
        """
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
2472
        return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2473
                           _internal=True,
2474
                           _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2475
                           _bzrdir=a_bzrdir,
2476
                           _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2477
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
2478
    def __str__(self):
2479
        return self.get_format_string()
2480
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2481
2482
__default_format = WorkingTreeFormat3()
2483
WorkingTreeFormat.register_format(__default_format)
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
2484
WorkingTreeFormat.register_format(WorkingTreeFormat4())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2485
WorkingTreeFormat.set_default_format(__default_format)
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
2486
# formats which have no format string are not discoverable
2487
# and not independently creatable, so are not registered.
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2488
_legacy_formats = [WorkingTreeFormat2(),
2489
                   ]
2490
2491
2492
class WorkingTreeTestProviderAdapter(object):
2493
    """A tool to generate a suite testing multiple workingtree formats at once.
2494
2495
    This is done by copying the test once for each transport and injecting
2496
    the transport_server, transport_readonly_server, and workingtree_format
2497
    classes into each copy. Each copy is also given a new id() to make it
2498
    easy to identify.
2499
    """
2500
2501
    def __init__(self, transport_server, transport_readonly_server, formats):
2502
        self._transport_server = transport_server
2503
        self._transport_readonly_server = transport_readonly_server
2504
        self._formats = formats
2505
    
1852.6.1 by Robert Collins
Start tree implementation tests.
2506
    def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2507
        """Clone test for adaption."""
2508
        new_test = deepcopy(test)
2509
        new_test.transport_server = self._transport_server
2510
        new_test.transport_readonly_server = self._transport_readonly_server
2511
        new_test.bzrdir_format = bzrdir_format
2512
        new_test.workingtree_format = workingtree_format
2513
        def make_new_test_id():
2514
            new_id = "%s(%s)" % (test.id(), variation)
2515
            return lambda: new_id
2516
        new_test.id = make_new_test_id()
2517
        return new_test
2518
    
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2519
    def adapt(self, test):
2520
        from bzrlib.tests import TestSuite
2521
        result = TestSuite()
2522
        for workingtree_format, bzrdir_format in self._formats:
1852.6.1 by Robert Collins
Start tree implementation tests.
2523
            new_test = self._clone_test(
2524
                test,
2525
                bzrdir_format,
2526
                workingtree_format, workingtree_format.__class__.__name__)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2527
            result.addTest(new_test)
2528
        return result