~bzr-pqm/bzr/bzr.dev

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