/brz/remove-bazaar

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