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