/brz/remove-bazaar

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