/brz/remove-bazaar

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