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