/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 (
5662.3.4 by Jelmer Vernooij
Revert lazy import removal - still need to load default format directly.
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
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1656
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1657
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1658
        for info in self.list_files():
1659
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1660
            stem = get_conflicted_stem(path)
1661
            if stem is None:
1662
                continue
1663
            if stem not in conflicted:
1664
                conflicted.add(stem)
1665
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
1666
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1667
    @needs_write_lock
1551.11.10 by Aaron Bentley
Add change reporting to pull
1668
    def pull(self, source, overwrite=False, stop_revision=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1669
             change_reporter=None, possible_transports=None, local=False,
1670
             show_base=False):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1671
        source.lock_read()
1672
        try:
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
1673
            old_revision_info = self.branch.last_revision_info()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
1674
            basis_tree = self.basis_tree()
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1675
            count = self.branch.pull(source, overwrite, stop_revision,
4056.6.4 by Gary van der Merwe
Implement pull --local.
1676
                                     possible_transports=possible_transports,
1677
                                     local=local)
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
1678
            new_revision_info = self.branch.last_revision_info()
1679
            if new_revision_info != old_revision_info:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1680
                repository = self.branch.repository
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1681
                basis_tree.lock_read()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1682
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1683
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1684
                    merge.merge_inner(
1685
                                self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1686
                                new_basis_tree,
1687
                                basis_tree,
1688
                                this_tree=self,
4961.2.11 by Martin Pool
Pull out pbs and ProgressPhases stored in object state; just use them in single functions
1689
                                pb=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1690
                                change_reporter=change_reporter,
1691
                                show_base=show_base)
4634.123.11 by John Arbash Meinel
fix 'pull' to also set the root id.
1692
                    basis_root_id = basis_tree.get_root_id()
1693
                    new_root_id = new_basis_tree.get_root_id()
1694
                    if basis_root_id != new_root_id:
1695
                        self.set_root_id(new_root_id)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1696
                finally:
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1697
                    basis_tree.unlock()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1698
                # 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.
1699
                # reuse the revisiontree we merged against to set the new
1700
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1701
                parent_trees = [(self.branch.last_revision(), new_basis_tree)]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1702
                # we have to pull the merge trees out again, because
1703
                # 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.
1704
                # layered well enough to prevent double handling.
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1705
                # XXX TODO: Fix the double handling: telling the tree about
1706
                # 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.
1707
                merges = self.get_parent_ids()[1:]
1708
                parent_trees.extend([
1709
                    (parent, repository.revision_tree(parent)) for
1710
                     parent in merges])
1711
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1712
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1713
        finally:
1714
            source.unlock()
1715
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1716
    @needs_write_lock
1717
    def put_file_bytes_non_atomic(self, file_id, bytes):
1718
        """See MutableTree.put_file_bytes_non_atomic."""
1719
        stream = file(self.id2abspath(file_id), 'wb')
1720
        try:
1721
            stream.write(bytes)
1722
        finally:
1723
            stream.close()
1724
        # TODO: update the hashcache here ?
1725
453 by Martin Pool
- Split WorkingTree into its own file
1726
    def extras(self):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1727
        """Yield all unversioned files in this WorkingTree.
453 by Martin Pool
- Split WorkingTree into its own file
1728
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1729
        If there are any unversioned directories then only the directory is
1730
        returned, not all its children.  But if there are unversioned files
453 by Martin Pool
- Split WorkingTree into its own file
1731
        under a versioned subdirectory, they are returned.
1732
1733
        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.
1734
        This is the same order used by 'osutils.walkdirs'.
453 by Martin Pool
- Split WorkingTree into its own file
1735
        """
1736
        ## TODO: Work from given directory downwards
1737
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1738
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1739
            dirabs = self.abspath(path)
1740
            if not isdir(dirabs):
1741
                # e.g. directory deleted
1742
                continue
1743
1744
            fl = []
1745
            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.'
1746
                if self.bzrdir.is_control_filename(subf):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1747
                    continue
1748
                if subf not in dir_entry.children:
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1749
                    try:
1750
                        (subf_norm,
3287.20.4 by John Arbash Meinel
fix trivial typo
1751
                         can_access) = osutils.normalized_filename(subf)
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1752
                    except UnicodeDecodeError:
1753
                        path_os_enc = path.encode(osutils._fs_enc)
1754
                        relpath = path_os_enc + '/' + subf
1755
                        raise errors.BadFilenameEncoding(relpath,
1756
                                                         osutils._fs_enc)
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1757
                    if subf_norm != subf and can_access:
1758
                        if subf_norm not in dir_entry.children:
1759
                            fl.append(subf_norm)
1760
                    else:
1761
                        fl.append(subf)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1762
453 by Martin Pool
- Split WorkingTree into its own file
1763
            fl.sort()
1764
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1765
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1766
                yield subp
1767
1768
    def ignored_files(self):
1769
        """Yield list of PATH, IGNORE_PATTERN"""
1770
        for subp in self.extras():
1771
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1772
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1773
                yield subp, pat
1774
1775
    def get_ignore_list(self):
1776
        """Return list of ignore patterns.
1777
1778
        Cached in the Tree object after the first call.
1779
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1780
        ignoreset = getattr(self, '_ignoreset', None)
1781
        if ignoreset is not None:
1782
            return ignoreset
1783
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
1784
        ignore_globs = set()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1785
        ignore_globs.update(ignores.get_runtime_ignores())
1786
        ignore_globs.update(ignores.get_user_ignores())
453 by Martin Pool
- Split WorkingTree into its own file
1787
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1788
            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
1789
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1790
                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
1791
            finally:
1792
                f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1793
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1794
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1795
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1796
    def _flush_ignore_list_cache(self):
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1797
        """Resets the cached ignore list to force a cache rebuild."""
1798
        self._ignoreset = None
1799
        self._ignoreglobster = None
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1800
453 by Martin Pool
- Split WorkingTree into its own file
1801
    def is_ignored(self, filename):
1802
        r"""Check whether the filename matches an ignore pattern.
1803
1804
        Patterns containing '/' or '\' need to match the whole path;
4948.5.1 by John Whitley
Implementation of ignore exclusions and basic tests for same.
1805
        others match against only the last component.  Patterns starting
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
1806
        with '!' are ignore exceptions.  Exceptions take precedence
4948.5.1 by John Whitley
Implementation of ignore exclusions and basic tests for same.
1807
        over regular patterns and cause the filename to not be ignored.
453 by Martin Pool
- Split WorkingTree into its own file
1808
1809
        If the file is ignored, returns the pattern which caused it to
1810
        be ignored, otherwise None.  So this can simply be used as a
1811
        boolean if desired."""
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1812
        if getattr(self, '_ignoreglobster', None) is None:
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
1813
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
1814
        return self._ignoreglobster.match(filename)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1815
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1816
    def kind(self, file_id):
1817
        return file_kind(self.id2abspath(file_id))
1818
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
1819
    def stored_kind(self, file_id):
1820
        """See Tree.stored_kind"""
1821
        return self.inventory[file_id].kind
1822
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1823
    def _comparison_data(self, entry, path):
1824
        abspath = self.abspath(path)
1825
        try:
1826
            stat_value = os.lstat(abspath)
1827
        except OSError, e:
1828
            if getattr(e, 'errno', None) == errno.ENOENT:
1829
                stat_value = None
1830
                kind = None
1831
                executable = False
1832
            else:
1833
                raise
1834
        else:
1835
            mode = stat_value.st_mode
1836
            kind = osutils.file_kind_from_stat_mode(mode)
1837
            if not supports_executable():
2409.1.2 by Dmitry Vasiliev
Used one-line conditional expression instead of the multi-line one
1838
                executable = entry is not None and entry.executable
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1839
            else:
1840
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1841
        return kind, executable, stat_value
1842
1843
    def _file_size(self, entry, stat_value):
1844
        return stat_value.st_size
1845
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1846
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1847
        """Return the last revision of the branch for this tree.
1848
1849
        This format tree does not support a separate marker for last-revision
1850
        compared to the branch.
1851
1852
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1853
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1854
        return self._last_revision()
1855
1856
    @needs_read_lock
1857
    def _last_revision(self):
1858
        """helper for get_parent_ids."""
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
1859
        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()
1860
1694.2.6 by Martin Pool
[merge] bzr.dev
1861
    def is_locked(self):
1862
        return self._control_files.is_locked()
1863
2298.1.1 by Martin Pool
Add test for merge_modified
1864
    def _must_be_locked(self):
1865
        if not self.is_locked():
1866
            raise errors.ObjectNotLocked(self)
1867
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1868
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1869
        """Lock the tree for reading.
1870
1871
        This also locks the branch, and can be unlocked via self.unlock().
1872
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1873
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1874
        """
2255.2.204 by Robert Collins
Fix info and status again.
1875
        if not self.is_locked():
1876
            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.
1877
        self.branch.lock_read()
1878
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1879
            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.
1880
            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.
1881
        except:
1882
            self.branch.unlock()
1883
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1884
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1885
    def lock_tree_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1886
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1887
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1888
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1889
        """
2255.2.204 by Robert Collins
Fix info and status again.
1890
        if not self.is_locked():
1891
            self._reset_data()
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1892
        self.branch.lock_read()
1893
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1894
            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.
1895
            return LogicalLockResult(self.unlock)
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1896
        except:
1897
            self.branch.unlock()
1898
            raise
1899
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1900
    def lock_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1901
        """See MutableTree.lock_write, and WorkingTree.unlock.
1902
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1903
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1904
        """
2255.2.204 by Robert Collins
Fix info and status again.
1905
        if not self.is_locked():
1906
            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.
1907
        self.branch.lock_write()
1908
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1909
            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.
1910
            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.
1911
        except:
1912
            self.branch.unlock()
1913
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1914
1694.2.6 by Martin Pool
[merge] bzr.dev
1915
    def get_physical_lock_status(self):
1916
        return self._control_files.get_physical_lock_status()
1917
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1918
    def _basis_inventory_name(self):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1919
        return 'basis-inventory-cache'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1920
2255.2.204 by Robert Collins
Fix info and status again.
1921
    def _reset_data(self):
1922
        """Reset transient data that cannot be revalidated."""
1923
        self._inventory_is_modified = False
4852.1.7 by John Arbash Meinel
Lots of tweaks in WorkingTree.
1924
        f = self._transport.get('inventory')
1925
        try:
1926
            result = self._deserialize(f)
1927
        finally:
1928
            f.close()
2255.2.204 by Robert Collins
Fix info and status again.
1929
        self._set_inventory(result, dirty=False)
1930
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1931
    @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.
1932
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1933
        """Change the last revision in the working tree."""
1934
        if self._change_last_revision(new_revision):
1935
            self._cache_basis_inventory(new_revision)
1936
1937
    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.
1938
        """Template method part of set_last_revision to perform the change.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1939
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1940
        This is used to allow WorkingTree3 instances to not affect branch
1941
        when their last revision is set.
1942
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1943
        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()
1944
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1945
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1946
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1947
            self.branch.generate_revision_history(new_revision)
1948
        except errors.NoSuchRevision:
1949
            # not present in the repo - dont try to set it deeper than the tip
1950
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1951
        return True
1952
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1953
    def _write_basis_inventory(self, xml):
1954
        """Write the basis inventory XML to the basis-inventory file"""
1955
        path = self._basis_inventory_name()
1956
        sio = StringIO(xml)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
1957
        self._transport.put_file(path, sio,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
1958
            mode=self.bzrdir._get_file_mode())
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1959
1960
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1961
        """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)
1962
        inventory.revision_id = revision_id
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
1963
        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.
1964
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1965
    def _cache_basis_inventory(self, new_revision):
1966
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1967
        # TODO: this should allow the ready-to-use inventory to be passed in,
1968
        # as commit already has that ready-to-use [while the format is the
1969
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1970
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1971
            # 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.
1972
            # but is easier to understand. We can/should put a conditional
1973
            # in here based on whether the inventory is in the latest format
1974
            # - perhaps we should repack all inventories on a repository
1975
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1976
            # 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
1977
            # xml contains 'revision_id="', then we assume the right
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1978
            # revision_id is set. We must check for this full string, because a
1979
            # root node id can legitimately look like 'revision_id' but cannot
1980
            # contain a '"'.
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
1981
            xml = self.branch.repository._get_inventory_xml(new_revision)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1982
            firstline = xml.split('\n', 1)[0]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1983
            if (not 'revision_id="' in firstline or
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
1984
                'format="7"' not in firstline):
4606.5.1 by Robert Collins
Support get_inventory_xml on CHKRepository.
1985
                inv = self.branch.repository._serializer.read_inventory_from_string(
1986
                    xml, new_revision)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1987
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1988
            self._write_basis_inventory(xml)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1989
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1990
            pass
1991
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1992
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1993
        """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.
1994
        path = self._basis_inventory_name()
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
1995
        return self._transport.get_bytes(path)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1996
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1997
    @needs_read_lock
1998
    def read_working_inventory(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1999
        """Read the working inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2000
1986.5.7 by Robert Collins
Merge reviews.
2001
        :raises errors.InventoryModified: read_working_inventory will fail
2002
            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
2003
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2004
        # 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
2005
        # XXX: Deprecate this.
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2006
        # ElementTree does its own conversion from UTF-8, so open in
2007
        # binary.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2008
        if self._inventory_is_modified:
2009
            raise errors.InventoryModified(self)
4852.1.7 by John Arbash Meinel
Lots of tweaks in WorkingTree.
2010
        f = self._transport.get('inventory')
2011
        try:
2012
            result = self._deserialize(f)
2013
        finally:
2014
            f.close()
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2015
        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()
2016
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2017
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2018
    @needs_tree_write_lock
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2019
    def remove(self, files, verbose=False, to_file=None, keep_files=True,
2292.1.10 by Marius Kruger
* workingtree.remove
2020
        force=False):
2475.5.2 by Marius Kruger
* blackbox/test_remove
2021
        """Remove nominated files from the working inventory.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2022
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2023
        :files: File paths relative to the basedir.
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
2024
        :keep_files: If true, the files will also be kept.
2292.1.10 by Marius Kruger
* workingtree.remove
2025
        :force: Delete files and directories, even if they are changed and
2026
            even if the directories are not empty.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2027
        """
2028
        if isinstance(files, basestring):
2029
            files = [files]
2030
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2031
        inv_delta = []
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2032
5340.8.3 by Marius Kruger
new_files => all_files
2033
        all_files = set() # specified and nested files 
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2034
        unknown_nested_files=set()
4792.5.2 by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user
2035
        if to_file is None:
2036
            to_file = sys.stdout
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2037
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2038
        files_to_backup = []
2039
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2040
        def recurse_directory_to_add_files(directory):
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2041
            # 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()
2042
            # so we can check if they have changed.
5160.2.2 by Marius Kruger
check if changed file isStillInDirToBeRemoved before bailing out
2043
            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
2044
                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
2045
                    # Is it versioned or ignored?
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2046
                    if self.path2id(relpath):
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2047
                        # Add nested content for deletion.
5340.8.3 by Marius Kruger
new_files => all_files
2048
                        all_files.add(relpath)
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2049
                    else:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2050
                        # Files which are not versioned
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2051
                        # should be treated as unknown.
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2052
                        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()
2053
2054
        for filename in files:
2055
            # Get file name into canonical form.
1551.15.11 by Aaron Bentley
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees
2056
            abspath = self.abspath(filename)
2057
            filename = self.relpath(abspath)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2058
            if len(filename) > 0:
5340.8.3 by Marius Kruger
new_files => all_files
2059
                all_files.add(filename)
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
2060
                recurse_directory_to_add_files(filename)
2655.2.4 by Marius Kruger
* workingtree.remove
2061
5340.8.3 by Marius Kruger
new_files => all_files
2062
        files = list(all_files)
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2063
2475.5.2 by Marius Kruger
* blackbox/test_remove
2064
        if len(files) == 0:
2065
            return # nothing to do
2066
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2067
        # Sort needed to first handle directory content before the directory
2068
        files.sort(reverse=True)
2655.2.6 by Marius Kruger
* workingtree.remove
2069
2655.2.4 by Marius Kruger
* workingtree.remove
2070
        # Bail out if we are going to delete files we shouldn't
2292.1.11 by Marius Kruger
* workingtree.remove
2071
        if not keep_files and not force:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2072
            for (file_id, path, content_change, versioned, parent_id, name,
2073
                 kind, executable) in self.iter_changes(self.basis_tree(),
2074
                     include_unchanged=True, require_versioned=False,
2075
                     want_unversioned=True, specific_files=files):
2076
                if versioned[0] == False:
2077
                    # The record is unknown or newly added
2078
                    files_to_backup.append(path[1])
2079
                elif (content_change and (kind[1] is not None) and
2080
                        osutils.is_inside_any(files, path[1])):
2081
                    # Versioned and changed, but not deleted, and still
2082
                    # in one of the dirs to be deleted.
2083
                    files_to_backup.append(path[1])
2475.5.2 by Marius Kruger
* blackbox/test_remove
2084
5340.8.5 by Marius Kruger
* extract backup_files
2085
        def backup(file_to_backup):
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
2086
            backup_name = self.bzrdir._available_backup_name(file_to_backup)
5340.8.5 by Marius Kruger
* extract backup_files
2087
            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.
2088
            return "removed %s (but kept a copy: %s)" % (file_to_backup,
2089
                                                         backup_name)
5340.8.5 by Marius Kruger
* extract backup_files
2090
4031.3.1 by Frank Aspell
Fixing various typos
2091
        # Build inv_delta and delete files where applicable,
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2092
        # do this before any modifications to inventory.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2093
        for f in files:
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2094
            fid = self.path2id(f)
2655.2.4 by Marius Kruger
* workingtree.remove
2095
            message = None
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2096
            if not fid:
2655.2.4 by Marius Kruger
* workingtree.remove
2097
                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.
2098
            else:
2099
                if verbose:
2292.1.10 by Marius Kruger
* workingtree.remove
2100
                    # 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.
2101
                    if self.is_ignored(f):
2102
                        new_status = 'I'
2103
                    else:
2104
                        new_status = '?'
4792.5.2 by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user
2105
                    # XXX: Really should be a more abstract reporter interface
4792.5.3 by Martin Pool
Further cleanup of removal reporting code
2106
                    kind_ch = osutils.kind_marker(self.kind(fid))
2107
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2108
                # Unversion file
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2109
                inv_delta.append((f, None, fid, None))
2655.2.4 by Marius Kruger
* workingtree.remove
2110
                message = "removed %s" % (f,)
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
2111
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
2112
            if not keep_files:
2292.1.30 by Marius Kruger
* Minor text fixes.
2113
                abs_path = self.abspath(f)
2114
                if osutils.lexists(abs_path):
2115
                    if (osutils.isdir(abs_path) and
2116
                        len(os.listdir(abs_path)) > 0):
2655.2.4 by Marius Kruger
* workingtree.remove
2117
                        if force:
2118
                            osutils.rmtree(abs_path)
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2119
                            message = "deleted %s" % (f,)
2655.2.4 by Marius Kruger
* workingtree.remove
2120
                        else:
5340.8.5 by Marius Kruger
* extract backup_files
2121
                            message = backup(f)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2122
                    else:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2123
                        if f in files_to_backup:
5340.8.5 by Marius Kruger
* extract backup_files
2124
                            message = backup(f)
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2125
                        else:
2126
                            osutils.delete_any(abs_path)
2127
                            message = "deleted %s" % (f,)
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
2128
                elif message is not None:
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2129
                    # Only care if we haven't done anything yet.
2130
                    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()
2131
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2132
            # 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.
2133
            if message is not None:
2134
                note(message)
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2135
        self.apply_inventory_delta(inv_delta)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2136
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2137
    @needs_tree_write_lock
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
2138
    def revert(self, filenames=None, old_tree=None, backups=True,
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2139
               pb=None, report_changes=False):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2140
        from bzrlib.conflicts import resolve
2748.3.3 by Aaron Bentley
Add a deprecation warning for revert([]), and handle as revert(None) for now
2141
        if filenames == []:
2142
            filenames = None
2143
            symbol_versioning.warn('Using [] to revert all files is deprecated'
2144
                ' as of bzr 0.91.  Please use None (the default) instead.',
2145
                DeprecationWarning, stacklevel=2)
1501 by Robert Collins
Move revert from Branch to WorkingTree.
2146
        if old_tree is None:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
2147
            basis_tree = self.basis_tree()
2148
            basis_tree.lock_read()
2149
            old_tree = basis_tree
1534.10.14 by Aaron Bentley
Made revert clear conflicts
2150
        else:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
2151
            basis_tree = None
2152
        try:
2153
            conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2154
                                         report_changes)
2949.2.2 by Robert Collins
Avoid dirstate parent resetting when it is not needed during revert.
2155
            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
2156
                parent_trees = []
2157
                last_revision = self.last_revision()
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
2158
                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
2159
                    if basis_tree is None:
2160
                        basis_tree = self.basis_tree()
2161
                        basis_tree.lock_read()
2162
                    parent_trees.append((last_revision, basis_tree))
2163
                self.set_parent_trees(parent_trees)
2164
                resolve(self)
2165
            else:
3017.2.1 by Aaron Bentley
Revert now resolves conflicts recursively (#102739)
2166
                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
2167
        finally:
2168
            if basis_tree is not None:
2169
                basis_tree.unlock()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
2170
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
2171
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2172
    def revision_tree(self, revision_id):
2173
        """See Tree.revision_tree.
2174
2175
        WorkingTree can supply revision_trees for the basis revision only
2176
        because there is only one cached inventory in the bzr directory.
2177
        """
2178
        if revision_id == self.last_revision():
2179
            try:
2180
                xml = self.read_basis_inventory()
1852.16.5 by John Arbash Meinel
[merge] bzr.dev 2255, resolve conflicts, update copyrights
2181
            except errors.NoSuchFile:
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2182
                pass
2183
            else:
1908.11.3 by Robert Collins
Merge bzr.dev
2184
                try:
2255.6.5 by Aaron Bentley
fix revision_tree tests
2185
                    inv = xml7.serializer_v7.read_inventory_from_string(xml)
1908.11.3 by Robert Collins
Merge bzr.dev
2186
                    # dont use the repository revision_tree api because we want
2187
                    # to supply the inventory.
2188
                    if inv.revision_id == revision_id:
1908.11.5 by John Arbash Meinel
[merge] bzr.dev 2240
2189
                        return revisiontree.RevisionTree(self.branch.repository,
1908.11.3 by Robert Collins
Merge bzr.dev
2190
                            inv, revision_id)
2191
                except errors.BadInventoryFormat:
2192
                    pass
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2193
        # raise if there was no inventory, or if we read the wrong inventory.
2194
        raise errors.NoSuchRevisionInTree(self, revision_id)
2195
1658.1.3 by Martin Pool
Doc
2196
    # XXX: This method should be deprecated in favour of taking in a proper
2197
    # new Inventory object.
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2198
    @needs_tree_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2199
    def set_inventory(self, new_inventory_list):
2200
        from bzrlib.inventory import (Inventory,
2201
                                      InventoryDirectory,
2202
                                      InventoryFile,
2203
                                      InventoryLink)
2204
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
2205
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2206
            name = os.path.basename(path)
2207
            if name == "":
2208
                continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2209
            # fixme, there should be a factory function inv,add_??
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2210
            if kind == 'directory':
2211
                inv.add(InventoryDirectory(file_id, name, parent))
2212
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
2213
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2214
            elif kind == 'symlink':
2215
                inv.add(InventoryLink(file_id, name, parent))
2216
            else:
2206.1.7 by Marius Kruger
* errors
2217
                raise errors.BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
2218
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2219
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2220
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2221
    def set_root_id(self, file_id):
2222
        """Set the root id for this tree."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2223
        # for compatability
2858.2.4 by Martin Pool
Restore deprecated behaviour of accepting None for WorkingTree.set_root_id (thanks igc)
2224
        if file_id is None:
3400.3.6 by Martin Pool
Remove code deprecated prior to 1.1 and its tests
2225
            raise ValueError(
2226
                'WorkingTree.set_root_id with fileid=None')
2227
        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.
2228
        self._set_root_id(file_id)
2229
2230
    def _set_root_id(self, file_id):
2231
        """Set the root id for this tree, in a format specific manner.
2232
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2233
        :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.
2234
            present in the current inventory or an error will occur. It must
2235
            not be None, but rather a valid file id.
2236
        """
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
2237
        inv = self._inventory
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2238
        orig_root_id = inv.root.file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2239
        # TODO: it might be nice to exit early if there was nothing
2240
        # to do, saving us from trigger a sync on unlock.
2241
        self._inventory_is_modified = True
2242
        # we preserve the root inventory entry object, but
2243
        # unlinkit from the byid index
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2244
        del inv._byid[inv.root.file_id]
2245
        inv.root.file_id = file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2246
        # and link it into the index with the new changed id.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2247
        inv._byid[inv.root.file_id] = inv.root
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2248
        # and finally update all children to reference the new id.
2249
        # XXX: this should be safe to just look at the root.children
2250
        # list, not the WHOLE INVENTORY.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2251
        for fid in inv:
2252
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2253
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2254
                entry.parent_id = inv.root.file_id
2255
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2256
    def unlock(self):
2257
        """See Branch.unlock.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2258
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2259
        WorkingTree locking just uses the Branch locking facilities.
2260
        This is current because all working trees have an embedded branch
2261
        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
2262
        between multiple working trees, i.e. via shared storage, then we
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2263
        would probably want to lock both the local tree, and the branch.
2264
        """
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.
2265
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2266
1907.5.7 by Matthieu Moy
Coding style fixes thanks to jam.
2267
    _marker = object()
2268
2009.1.4 by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are
2269
    def update(self, change_reporter=None, possible_transports=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2270
               revision=None, old_tip=_marker, show_base=False):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2271
        """Update a working tree along its branch.
2272
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2273
        This will update the branch if its bound too, which means we have
2274
        multiple trees involved:
2275
2276
        - The new basis tree of the master.
2277
        - The old basis tree of the branch.
2278
        - The old basis tree of the working tree.
2279
        - The current working tree state.
2280
2281
        Pathologically, all three may be different, and non-ancestors of each
2282
        other.  Conceptually we want to:
2283
2284
        - Preserve the wt.basis->wt.state changes
2285
        - Transform the wt.basis to the new master basis.
2286
        - Apply a merge of the old branch basis to get any 'local' changes from
2287
          it into the tree.
2288
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2289
2290
        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
2291
        - Merge current state -> basis tree of the master w.r.t. the old tree
2292
          basis.
2293
        - 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.
2294
2009.1.2 by John Arbash Meinel
minor whitespace cleanup.
2295
        :param revision: The target revision to update to. Must be in the
2296
            revision history.
2297
        :param old_tip: If branch.update() has already been run, the value it
2298
            returned (old tip of the branch or None). _marker is used
2299
            otherwise.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2300
        """
3280.5.1 by John Arbash Meinel
Avoid opening the master branch when we won't use it.
2301
        if self.branch.get_bound_location() is not None:
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2302
            self.lock_write()
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
2303
            update_branch = (old_tip is self._marker)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2304
        else:
2305
            self.lock_tree_write()
2306
            update_branch = False
2307
        try:
2308
            if update_branch:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2309
                old_tip = self.branch.update(possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2310
            else:
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
2311
                if old_tip is self._marker:
2312
                    old_tip = None
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2313
            return self._update_tree(old_tip, change_reporter, revision, show_base)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2314
        finally:
2315
            self.unlock()
2316
2317
    @needs_tree_write_lock
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2318
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2319
                     show_base=False):
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2320
        """Update a tree to the master branch.
2321
2322
        :param old_tip: if supplied, the previous tip revision the branch,
2323
            before it was changed to the master branch's tip.
2324
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2325
        # here if old_tip is not None, it is the old tip of the branch before
2326
        # it was updated from the master branch. This should become a pending
2327
        # merge in the working tree to preserve the user existing work.  we
2328
        # cant set that until we update the working trees last revision to be
2329
        # one from the new branch, because it will just get absorbed by the
2330
        # parent de-duplication logic.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2331
        #
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2332
        # We MUST save it even if an error occurs, because otherwise the users
2333
        # local work is unreferenced and will appear to have been lost.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2334
        #
4985.3.17 by Vincent Ladeuil
Some cleanup.
2335
        nb_conflicts = 0
1907.5.13 by Matthieu Moy
Fixed bad conflict resolution.
2336
        try:
2337
            last_rev = self.get_parent_ids()[0]
2338
        except IndexError:
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
2339
            last_rev = _mod_revision.NULL_REVISION
1907.5.8 by Matthieu Moy
merge (with conflicts)
2340
        if revision is None:
1907.5.13 by Matthieu Moy
Fixed bad conflict resolution.
2341
            revision = self.branch.last_revision()
4985.3.17 by Vincent Ladeuil
Some cleanup.
2342
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
2343
        old_tip = old_tip or _mod_revision.NULL_REVISION
4985.3.17 by Vincent Ladeuil
Some cleanup.
2344
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2345
        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.
2346
            # the branch we are bound to was updated
2347
            # merge those changes in first
2348
            base_tree  = self.basis_tree()
4985.3.1 by Gerard Krol
Werkt wel ok
2349
            other_tree = self.branch.repository.revision_tree(old_tip)
4985.3.17 by Vincent Ladeuil
Some cleanup.
2350
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2351
                                             base_tree, this_tree=self,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2352
                                             change_reporter=change_reporter,
2353
                                             show_base=show_base)
4985.3.17 by Vincent Ladeuil
Some cleanup.
2354
            if nb_conflicts:
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
2355
                self.add_parent_tree((old_tip, other_tree))
4985.3.6 by Gerard Krol
Message after aborting update after the first merge
2356
                trace.note('Rerun update after fixing the conflicts.')
4985.3.17 by Vincent Ladeuil
Some cleanup.
2357
                return nb_conflicts
4985.3.1 by Gerard Krol
Werkt wel ok
2358
2009.1.4 by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are
2359
        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)
2360
            # the working tree is up to date with the branch
2361
            # we can merge the specified revision from master
2362
            to_tree = self.branch.repository.revision_tree(revision)
2363
            to_root_id = to_tree.get_root_id()
2364
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2365
            basis = self.basis_tree()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
2366
            basis.lock_read()
2367
            try:
4634.123.10 by John Arbash Meinel
update now properly handles root-id changes.
2368
                if (basis.inventory.root is None
2369
                    or basis.inventory.root.file_id != to_root_id):
2370
                    self.set_root_id(to_root_id)
2255.6.6 by Aaron Bentley
Fix update to set unique roots, and work with dirstate
2371
                    self.flush()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
2372
            finally:
2373
                basis.unlock()
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2374
2375
            # determine the branch point
2376
            graph = self.branch.repository.get_graph()
4985.3.17 by Vincent Ladeuil
Some cleanup.
2377
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2378
                                                last_rev)
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2379
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2380
4985.3.17 by Vincent Ladeuil
Some cleanup.
2381
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2382
                                             this_tree=self,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2383
                                             change_reporter=change_reporter,
2384
                                             show_base=show_base)
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2385
            self.set_last_revision(revision)
1908.6.6 by Robert Collins
Merge updated set_parents api.
2386
            # TODO - dedup parents list with things merged by pull ?
2387
            # 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)
2388
            parent_trees = [(revision, to_tree)]
1908.6.6 by Robert Collins
Merge updated set_parents api.
2389
            merges = self.get_parent_ids()[1:]
2390
            # Ideally we ask the tree for the trees here, that way the working
1907.5.12 by Matthieu Moy
Manage InvalidRevisionSpec in update command.
2391
            # 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.
2392
            # lazy initialised tree. dirstate for instance will have the trees
2393
            # in ram already, whereas a last-revision + basis-inventory tree
2394
            # will not, but also does not need them when setting parents.
2395
            for parent in merges:
2396
                parent_trees.append(
2397
                    (parent, self.branch.repository.revision_tree(parent)))
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
2398
            if not _mod_revision.is_null(old_tip):
2399
                parent_trees.append(
2400
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
1908.6.6 by Robert Collins
Merge updated set_parents api.
2401
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2402
            last_rev = parent_trees[0][0]
4985.3.17 by Vincent Ladeuil
Some cleanup.
2403
        return nb_conflicts
1508.1.24 by Robert Collins
Add update command for use with checkouts.
2404
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2405
    def _write_hashcache_if_dirty(self):
2406
        """Write out the hashcache if it is dirty."""
2407
        if self._hashcache.needs_write:
2408
            try:
2409
                self._hashcache.write()
2410
            except OSError, e:
2411
                if e.errno not in (errno.EPERM, errno.EACCES):
2412
                    raise
2413
                # TODO: jam 20061219 Should this be a warning? A single line
2414
                #       warning might be sufficient to let the user know what
2415
                #       is going on.
2416
                mutter('Could not write hashcache for %s\nError: %s',
2417
                       self._hashcache.cache_file_name(), e)
2418
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2419
    @needs_tree_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
2420
    def _write_inventory(self, inv):
2421
        """Write inventory as the current inventory."""
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2422
        self._set_inventory(inv, dirty=True)
2423
        self.flush()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2424
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2425
    def set_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
2426
        raise errors.UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2427
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2428
    def add_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
2429
        raise errors.UnsupportedOperation(self.add_conflicts, self)
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2430
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2431
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2432
    def conflicts(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2433
        conflicts = _mod_conflicts.ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
2434
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2435
            text = True
2436
            try:
2437
                if file_kind(self.abspath(conflicted)) != "file":
2438
                    text = False
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
2439
            except errors.NoSuchFile:
2440
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2441
            if text is True:
2442
                for suffix in ('.THIS', '.OTHER'):
2443
                    try:
2444
                        kind = file_kind(self.abspath(conflicted+suffix))
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
2445
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2446
                            text = False
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
2447
                    except errors.NoSuchFile:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2448
                        text = False
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
2449
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2450
                        break
2451
            ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2452
            conflicts.append(_mod_conflicts.Conflict.factory(ctype,
2453
                             path=conflicted,
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2454
                             file_id=self.path2id(conflicted)))
2455
        return conflicts
2456
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2457
    def walkdirs(self, prefix=""):
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2458
        """Walk the directories of this tree.
2459
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2460
        returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
2461
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2462
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
2463
                   file1_kind), ... ])
2464
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2465
        This API returns a generator, which is only valid during the current
2466
        tree transaction - within a single lock_read or lock_write duration.
2467
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2468
        If the tree is not locked, it may cause an error to be raised,
2469
        depending on the tree implementation.
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2470
        """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2471
        disk_top = self.abspath(prefix)
2472
        if disk_top.endswith('/'):
2473
            disk_top = disk_top[:-1]
2474
        top_strip_len = len(disk_top) + 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2475
        inventory_iterator = self._walkdirs(prefix)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2476
        disk_iterator = osutils.walkdirs(disk_top, prefix)
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2477
        try:
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2478
            current_disk = disk_iterator.next()
2479
            disk_finished = False
2480
        except OSError, e:
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
2481
            if not (e.errno == errno.ENOENT or
2482
                (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2483
                raise
2484
            current_disk = None
2485
            disk_finished = True
2486
        try:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2487
            current_inv = inventory_iterator.next()
2488
            inv_finished = False
2489
        except StopIteration:
2490
            current_inv = None
2491
            inv_finished = True
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2492
        while not inv_finished or not disk_finished:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2493
            if current_disk:
2494
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2495
                    cur_disk_dir_content) = current_disk
2496
            else:
2497
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2498
                    cur_disk_dir_content) = ((None, None), None)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2499
            if not disk_finished:
2500
                # strip out .bzr dirs
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2501
                if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2502
                    len(cur_disk_dir_content) > 0):
2503
                    # osutils.walkdirs can be made nicer -
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2504
                    # yield the path-from-prefix rather than the pathjoined
2505
                    # value.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2506
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2507
                        ('.bzr', '.bzr'))
3719.1.1 by Vincent Ladeuil
Fix bug #272648
2508
                    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.'
2509
                        and self.bzrdir.is_control_filename(
2510
                            cur_disk_dir_content[bzrdir_loc][0])):
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2511
                        # we dont yield the contents of, or, .bzr itself.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2512
                        del cur_disk_dir_content[bzrdir_loc]
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2513
            if inv_finished:
2514
                # 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.
2515
                direction = 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2516
            elif disk_finished:
2517
                # 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.
2518
                direction = -1
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2519
            else:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2520
                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.
2521
            if direction > 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2522
                # disk is before inventory - unknown
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2523
                dirblock = [(relpath, basename, kind, stat, None, None) for
2457.2.7 by Marius Kruger
extract method as per review request
2524
                    relpath, basename, kind, stat, top_path in
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2525
                    cur_disk_dir_content]
2526
                yield (cur_disk_dir_relpath, None), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2527
                try:
2528
                    current_disk = disk_iterator.next()
2529
                except StopIteration:
2530
                    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.
2531
            elif direction < 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2532
                # inventory is before disk - missing.
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2533
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2457.2.7 by Marius Kruger
extract method as per review request
2534
                    for relpath, basename, dkind, stat, fileid, kind in
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2535
                    current_inv[1]]
2536
                yield (current_inv[0][0], current_inv[0][1]), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2537
                try:
2538
                    current_inv = inventory_iterator.next()
2539
                except StopIteration:
2540
                    inv_finished = True
2541
            else:
2542
                # versioned present directory
2543
                # merge the inventory and disk data together
2544
                dirblock = []
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2545
                for relpath, subiterator in itertools.groupby(sorted(
2457.2.7 by Marius Kruger
extract method as per review request
2546
                    current_inv[1] + cur_disk_dir_content,
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2547
                    key=operator.itemgetter(0)), operator.itemgetter(1)):
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2548
                    path_elements = list(subiterator)
2549
                    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.
2550
                        inv_row, disk_row = path_elements
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2551
                        # 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.
2552
                        dirblock.append((inv_row[0],
2553
                            inv_row[1], disk_row[2],
2554
                            disk_row[3], inv_row[4],
2555
                            inv_row[5]))
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2556
                    elif len(path_elements[0]) == 5:
2557
                        # unknown disk file
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2558
                        dirblock.append((path_elements[0][0],
2559
                            path_elements[0][1], path_elements[0][2],
2560
                            path_elements[0][3], None, None))
2561
                    elif len(path_elements[0]) == 6:
2562
                        # versioned, absent file.
2563
                        dirblock.append((path_elements[0][0],
2564
                            path_elements[0][1], 'unknown', None,
2565
                            path_elements[0][4], path_elements[0][5]))
2566
                    else:
2567
                        raise NotImplementedError('unreachable code')
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2568
                yield current_inv[0], dirblock
2569
                try:
2570
                    current_inv = inventory_iterator.next()
2571
                except StopIteration:
2572
                    inv_finished = True
2573
                try:
2574
                    current_disk = disk_iterator.next()
2575
                except StopIteration:
2576
                    disk_finished = True
2577
2578
    def _walkdirs(self, prefix=""):
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2579
        """Walk the directories of this tree.
2580
2581
           :prefix: is used as the directrory to start with.
2582
           returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
2583
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2584
                 [(file1_path, file1_name, file1_kind, None, file1_id,
2585
                   file1_kind), ... ])
2586
        """
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2587
        _directory = 'directory'
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2588
        # get the root in the inventory
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2589
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2590
        top_id = inv.path2id(prefix)
2591
        if top_id is None:
2592
            pending = []
2593
        else:
2594
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2595
        while pending:
2596
            dirblock = []
2597
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2598
            # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2599
            top_id = currentdir[4]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2600
            if currentdir[0]:
2601
                relroot = currentdir[0] + '/'
2602
            else:
2603
                relroot = ""
2604
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2605
            entry = inv[top_id]
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
2606
            if entry.kind == 'directory':
2607
                for name, child in entry.sorted_children():
2608
                    dirblock.append((relroot + name, name, child.kind, None,
2609
                        child.file_id, child.kind
2610
                        ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2611
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2612
            # push the user specified dirs from dirblock
2613
            for dir in reversed(dirblock):
2614
                if dir[2] == _directory:
2615
                    pending.append(dir)
2616
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
2617
    @needs_tree_write_lock
2618
    def auto_resolve(self):
2619
        """Automatically resolve text conflicts according to contents.
2620
2621
        Only text conflicts are auto_resolvable. Files with no conflict markers
2622
        are considered 'resolved', because bzr always puts conflict markers
2623
        into files that have text conflicts.  The corresponding .THIS .BASE and
2624
        .OTHER files are deleted, as per 'resolve'.
2625
        :return: a tuple of ConflictLists: (un_resolved, resolved).
2626
        """
2627
        un_resolved = _mod_conflicts.ConflictList()
2628
        resolved = _mod_conflicts.ConflictList()
2629
        conflict_re = re.compile('^(<{7}|={7}|>{7})')
2630
        for conflict in self.conflicts():
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
2631
            if (conflict.typestring != 'text conflict' or
2632
                self.kind(conflict.file_id) != 'file'):
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
2633
                un_resolved.append(conflict)
2634
                continue
2635
            my_file = open(self.id2abspath(conflict.file_id), 'rb')
2636
            try:
2637
                for line in my_file:
2638
                    if conflict_re.search(line):
2639
                        un_resolved.append(conflict)
2640
                        break
2641
                else:
2642
                    resolved.append(conflict)
2643
            finally:
2644
                my_file.close()
2645
        resolved.remove_files(self)
2646
        self.set_conflicts(un_resolved)
2647
        return un_resolved, resolved
2648
3015.3.30 by Daniel Watkins
Moved check to WorkingTree.
2649
    @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.
2650
    def _check(self, references):
2651
        """Check the tree for consistency.
2652
2653
        :param references: A dict with keys matching the items returned by
2654
            self._get_check_refs(), and values from looking those keys up in
2655
            the repository.
2656
        """
3015.3.30 by Daniel Watkins
Moved check to WorkingTree.
2657
        tree_basis = self.basis_tree()
2658
        tree_basis.lock_read()
2659
        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.
2660
            repo_basis = references[('trees', self.last_revision())]
3015.3.58 by Daniel Watkins
Various other cleanup as requested by reviews.
2661
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
3015.3.30 by Daniel Watkins
Moved check to WorkingTree.
2662
                raise errors.BzrCheckError(
2663
                    "Mismatched basis inventory content.")
2664
            self._validate()
2665
        finally:
2666
            tree_basis.unlock()
2667
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2668
    def _validate(self):
2669
        """Validate internal structures.
2670
2671
        This is meant mostly for the test suite. To give it a chance to detect
2672
        corruption after actions have occurred. The default implementation is a
2673
        just a no-op.
2674
2675
        :return: None. An exception should be raised if there is an error.
2676
        """
2677
        return
2678
5630.2.4 by John Arbash Meinel
Basically works in the case where the dirstate isn't corrupted.
2679
    @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.
2680
    def check_state(self):
2681
        """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.
2682
        check_refs = self._get_check_refs()
2683
        refs = {}
2684
        for ref in check_refs:
2685
            kind, value = ref
2686
            if kind == 'trees':
2687
                refs[ref] = self.branch.repository.revision_tree(value)
2688
        self._check(refs)
2689
2690
    @needs_tree_write_lock
2691
    def reset_state(self, revision_ids=None):
2692
        """Reset the state of the working tree.
2693
2694
        This does a hard-reset to a last-known-good state. This is a way to
2695
        fix if something got corrupted (like the .bzr/checkout/dirstate file)
2696
        """
2697
        if revision_ids is None:
2698
            revision_ids = self.get_parent_ids()
2699
        if not revision_ids:
2700
            rt = self.branch.repository.revision_tree(
2701
                _mod_revision.NULL_REVISION)
2702
        else:
2703
            rt = self.branch.repository.revision_tree(revision_ids[0])
2704
        self._write_inventory(rt.inventory)
2705
        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.
2706
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
2707
    def _get_rules_searcher(self, default_searcher):
2708
        """See Tree._get_rules_searcher."""
2709
        if self._rules_searcher is None:
2710
            self._rules_searcher = super(WorkingTree,
2711
                self)._get_rules_searcher(default_searcher)
2712
        return self._rules_searcher
2713
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
2714
    def get_shelf_manager(self):
2715
        """Return the ShelfManager for this WorkingTree."""
2716
        from bzrlib.shelf import ShelfManager
2717
        return ShelfManager(self, self._transport)
2718
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2719
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.
2720
class WorkingTree2(WorkingTree):
2721
    """This is the Format 2 working tree.
2722
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2723
    This was the first weave based working tree.
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
2724
     - uses os locks for locking.
2725
     - uses the branch last-revision.
2726
    """
2727
2334.1.4 by John Arbash Meinel
WT2 needs to have an _inventory without a lock.
2728
    def __init__(self, *args, **kwargs):
2729
        super(WorkingTree2, self).__init__(*args, **kwargs)
2730
        # WorkingTree2 has more of a constraint that self._inventory must
2731
        # exist. Because this is an older format, we don't mind the overhead
2732
        # caused by the extra computation here.
2733
2734
        # Newer WorkingTree's should only have self._inventory set when they
2735
        # have a read lock.
2736
        if self._inventory is None:
2737
            self.read_working_inventory()
2738
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.
2739
    def _get_check_refs(self):
2740
        """Return the references needed to perform a check of this tree."""
2741
        return [('trees', self.last_revision())]
2742
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
2743
    def lock_tree_write(self):
2744
        """See WorkingTree.lock_tree_write().
2745
2746
        In Format2 WorkingTrees we have a single lock for the branch and tree
2747
        so lock_tree_write() degrades to lock_write().
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2748
2749
        :return: An object with an unlock method which will release the lock
2750
            obtained.
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
2751
        """
2752
        self.branch.lock_write()
2753
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2754
            self._control_files.lock_write()
2755
            return self
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
2756
        except:
2757
            self.branch.unlock()
2758
            raise
2759
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.
2760
    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.
2761
        # do non-implementation specific cleanup
2762
        self._cleanup()
2763
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.
2764
        # we share control files:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2765
        if self._control_files._lock_count == 3:
2766
            # _inventory_is_modified is always False during a read lock.
2767
            if self._inventory_is_modified:
2768
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2769
            self._write_hashcache_if_dirty()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2770
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.
2771
        # reverse order of locking.
2772
        try:
2773
            return self._control_files.unlock()
2774
        finally:
2775
            self.branch.unlock()
2776
2777
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2778
class WorkingTree3(WorkingTree):
2779
    """This is the Format 3 working tree.
2780
2781
    This differs from the base WorkingTree by:
2782
     - having its own file lock
2783
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2784
2785
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2786
    """
2787
2788
    @needs_read_lock
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2789
    def _last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
2790
        """See Mutable.last_revision."""
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2791
        try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2792
            return self._transport.get_bytes('last-revision')
2206.1.7 by Marius Kruger
* errors
2793
        except errors.NoSuchFile:
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
2794
            return _mod_revision.NULL_REVISION
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2795
2796
    def _change_last_revision(self, revision_id):
2797
        """See WorkingTree._change_last_revision."""
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
2798
        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.
2799
            try:
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
2800
                self._transport.delete('last-revision')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2801
            except errors.NoSuchFile:
2802
                pass
2803
            return False
2804
        else:
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2805
            self._transport.put_bytes('last-revision', revision_id,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2806
                mode=self.bzrdir._get_file_mode())
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2807
            return True
2808
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.
2809
    def _get_check_refs(self):
2810
        """Return the references needed to perform a check of this tree."""
2811
        return [('trees', self.last_revision())]
2812
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2813
    @needs_tree_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2814
    def set_conflicts(self, conflicts):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2815
        self._put_rio('conflicts', conflicts.to_stanzas(),
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
2816
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2817
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2818
    @needs_tree_write_lock
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2819
    def add_conflicts(self, new_conflicts):
2820
        conflict_set = set(self.conflicts())
2821
        conflict_set.update(set(list(new_conflicts)))
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2822
        self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
2823
                                       key=_mod_conflicts.Conflict.sort_key)))
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2824
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2825
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2826
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2827
        try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2828
            confile = self._transport.get('conflicts')
2206.1.7 by Marius Kruger
* errors
2829
        except errors.NoSuchFile:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2830
            return _mod_conflicts.ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2831
        try:
3619.6.2 by Mark Hammond
ensure the conflict list file is closed before returning.
2832
            try:
2833
                if confile.next() != CONFLICT_HEADER_1 + '\n':
2834
                    raise errors.ConflictFormatError()
2835
            except StopIteration:
2206.1.7 by Marius Kruger
* errors
2836
                raise errors.ConflictFormatError()
3619.6.2 by Mark Hammond
ensure the conflict list file is closed before returning.
2837
            return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2838
        finally:
2839
            confile.close()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2840
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.
2841
    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.
2842
        # do non-implementation specific cleanup
2843
        self._cleanup()
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2844
        if self._control_files._lock_count == 1:
2845
            # _inventory_is_modified is always False during a read lock.
2846
            if self._inventory_is_modified:
2847
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2848
            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.
2849
        # reverse order of locking.
2850
        try:
2851
            return self._control_files.unlock()
2852
        finally:
2853
            self.branch.unlock()
2854
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2855
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2856
def get_conflicted_stem(path):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2857
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2858
        if path.endswith(suffix):
2859
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2860
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
2861
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2862
class WorkingTreeFormatRegistry(registry.FormatRegistry):
2863
    """Registry for working tree formats."""
2864
2865
    def __init__(self, other_registry=None):
2866
        super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2867
        self._extra_formats = []
2868
        self._default_format = None
2869
2870
    def register(self, format):
2871
        """Register a new repository format."""
2872
        super(WorkingTreeFormatRegistry, self).register(
2873
            format.get_format_string(), format)
2874
2875
    def remove(self, format):
2876
        """Remove a registered repository format."""
2877
        super(WorkingTreeFormatRegistry, self).remove(format.get_format_string())
2878
2879
    def register_extra(self, format):
2880
        """Register a repository format that can not be used in a metadir.
2881
2882
        This is mainly useful to allow custom repository formats, such as older
2883
        Bazaar formats and foreign formats, to be tested.
2884
        """
2885
        self._extra_formats.append(registry._ObjectGetter(format))
2886
2887
    def remove_extra(self, format):
2888
        """Remove an extra repository format.
2889
        """
2890
        self._extra_formats.remove(registry._ObjectGetter(format))
2891
2892
    def register_extra_lazy(self, module_name, member_name):
2893
        """Register a repository format lazily.
2894
        """
2895
        self._extra_formats.append(
2896
            registry._LazyObjectGetter(module_name, member_name))
2897
2898
    def get_default(self):
2899
        """Return the current default format."""
2900
        return self._default_format
2901
2902
    def set_default(self, format):
2903
        self._default_format = format
2904
2905
    def _get_extra(self):
2906
        result = []
2907
        for getter in self._extra_formats:
2908
            f = getter.get_obj()
2909
            if callable(f):
2910
                f = f()
2911
            result.append(f)
2912
        return result
2913
2914
    def _get_all(self):
2915
        """Return all repository formats, even those not usable in metadirs.
2916
        """
2917
        return [self.get(k) for k in self.keys()] + self._get_extra()
2918
2919
2920
format_registry = WorkingTreeFormatRegistry()
2921
2922
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2923
class WorkingTreeFormat(object):
2924
    """An encapsulation of the initialization and open routines for a format.
2925
2926
    Formats provide three things:
2927
     * An initialization routine,
2928
     * a format string,
2929
     * an open routine.
2930
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2931
    Formats are placed in an dict by their format string for reference
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2932
    during workingtree opening. Its not required that these be instances, they
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2933
    can be classes themselves with class methods - it simply depends on
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2934
    whether state is needed for a given format or not.
2935
2936
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2937
    methods on the format class. Do not deprecate the object, as the
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2938
    object will be created every time regardless.
2939
    """
2940
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
2941
    requires_rich_root = False
2942
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2943
    upgrade_recommended = False
2944
5582.9.18 by Jelmer Vernooij
Add requires_normalize_unicode_filenames flag, avoid explicitly using WorkingTreeFormat2.
2945
    requires_normalized_unicode_filenames = False
2946
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
2947
    case_sensitive_filename = "FoRMaT"
2948
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
2949
    missing_parent_conflicts = False
2950
    """If this format supports missing parent conflicts."""
2951
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2952
    @classmethod
2953
    def find_format(klass, a_bzrdir):
2954
        """Return the format for the working tree object in a_bzrdir."""
2955
        try:
2956
            transport = a_bzrdir.get_workingtree_transport(None)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2957
            format_string = transport.get_bytes("format")
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2958
            return format_registry.get(format_string)
2206.1.7 by Marius Kruger
* errors
2959
        except errors.NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2960
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2961
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
2962
            raise errors.UnknownFormatError(format=format_string,
2963
                                            kind="working tree")
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2964
5683.1.1 by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize().
2965
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2966
                   accelerator_tree=None, hardlink=False):
2967
        """Initialize a new working tree in a_bzrdir.
2968
2969
        :param a_bzrdir: BzrDir to initialize the working tree in.
2970
        :param revision_id: allows creating a working tree at a different
2971
            revision than the branch is at.
2972
        :param from_branch: Branch to checkout
2973
        :param accelerator_tree: A tree which can be used for retrieving file
2974
            contents more quickly than the revision tree, i.e. a workingtree.
2975
            The revision tree will be used for cases where accelerator_tree's
2976
            content is different.
2977
        :param hardlink: If true, hard-link files from accelerator_tree,
2978
            where possible.
2979
        """
2980
        raise NotImplementedError(self.initialize)
2981
2100.3.35 by Aaron Bentley
equality operations on bzrdir
2982
    def __eq__(self, other):
2983
        return self.__class__ is other.__class__
2984
2985
    def __ne__(self, other):
2986
        return not (self == other)
2987
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2988
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2989
    @symbol_versioning.deprecated_method(
2990
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2991
    def get_default_format(klass):
2992
        """Return the current default format."""
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2993
        return format_registry.get_default()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2994
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2995
    def get_format_string(self):
2996
        """Return the ASCII format string that identifies this format."""
2997
        raise NotImplementedError(self.get_format_string)
2998
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2999
    def get_format_description(self):
3000
        """Return the short description for this format."""
3001
        raise NotImplementedError(self.get_format_description)
3002
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3003
    def is_supported(self):
3004
        """Is this format supported?
3005
3006
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3007
        Unsupported formats may not support initialization or committing or
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3008
        some other features depending on the reason for not being supported.
3009
        """
3010
        return True
3011
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
3012
    def supports_content_filtering(self):
3013
        """True if this format supports content filtering."""
3014
        return False
3015
3586.1.4 by Ian Clatworthy
first cut at tree-level view tests
3016
    def supports_views(self):
3017
        """True if this format supports stored views."""
3018
        return False
3019
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3020
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3021
    @symbol_versioning.deprecated_method(
3022
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3023
    def register_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3024
        format_registry.register(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3025
3026
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3027
    @symbol_versioning.deprecated_method(
3028
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3029
    def register_extra_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3030
        format_registry.register_extra(format)
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3031
3032
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3033
    @symbol_versioning.deprecated_method(
3034
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3035
    def unregister_extra_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3036
        format_registry.unregister_extra(format)
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3037
3038
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3039
    @symbol_versioning.deprecated_method(
3040
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3041
    def get_formats(klass):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3042
        return format_registry._get_all()
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
3043
3044
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3045
    @symbol_versioning.deprecated_method(
3046
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3047
    def set_default_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3048
        format_registry.set_default(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3049
3050
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3051
    @symbol_versioning.deprecated_method(
3052
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3053
    def unregister_format(klass, format):
5662.3.3 by Jelmer Vernooij
add tests
3054
        format_registry.remove(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3055
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3056
3057
class WorkingTreeFormat2(WorkingTreeFormat):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3058
    """The second working tree format.
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
3059
3060
    This format modified the hash cache from the format 1 hash cache.
3061
    """
3062
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
3063
    upgrade_recommended = True
3064
5582.9.18 by Jelmer Vernooij
Add requires_normalize_unicode_filenames flag, avoid explicitly using WorkingTreeFormat2.
3065
    requires_normalized_unicode_filenames = True
3066
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
3067
    case_sensitive_filename = "Branch-FoRMaT"
3068
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
3069
    missing_parent_conflicts = False
3070
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
3071
    def get_format_description(self):
3072
        """See WorkingTreeFormat.get_format_description()."""
3073
        return "Working tree format 2"
3074
3650.5.7 by Aaron Bentley
Fix working tree initialization
3075
    def _stub_initialize_on_transport(self, transport, file_mode):
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
3076
        """Workaround: create control files for a remote working tree.
3077
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
3078
        This ensures that it can later be updated and dealt with locally,
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
3079
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
3080
        no working tree.  (See bug #43064).
3081
        """
3082
        sio = StringIO()
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
3083
        inv = inventory.Inventory()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
3084
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
3085
        sio.seek(0)
3650.5.7 by Aaron Bentley
Fix working tree initialization
3086
        transport.put_file('inventory', sio, file_mode)
3087
        transport.put_bytes('pending-merges', '', file_mode)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
3088
3123.5.3 by Aaron Bentley
Get tests passing with accelerator_tree
3089
    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
3090
                   accelerator_tree=None, hardlink=False):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
3091
        """See WorkingTreeFormat.initialize()."""
3092
        if not isinstance(a_bzrdir.transport, LocalTransport):
3093
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
3094
        if from_branch is not None:
3095
            branch = from_branch
3096
        else:
3097
            branch = a_bzrdir.open_branch()
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
3098
        if revision_id is None:
3099
            revision_id = _mod_revision.ensure_null(branch.last_revision())
3100
        branch.lock_write()
3101
        try:
3102
            branch.generate_revision_history(revision_id)
3103
        finally:
3104
            branch.unlock()
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
3105
        inv = inventory.Inventory()
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
3106
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
3107
                         branch,
3108
                         inv,
3109
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
3110
                         _format=self,
5582.9.4 by Jelmer Vernooij
Remove hack for loading version 2 working trees from WorkingTree.
3111
                         _bzrdir=a_bzrdir,
3112
                         _control_files=branch.control_files)
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
3113
        basis_tree = branch.repository.revision_tree(revision_id)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
3114
        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('')
3115
            wt.set_root_id(basis_tree.get_root_id())
1986.5.8 by Robert Collins
Merge bzr.dev.
3116
        # set the parent list and cache the basis tree.
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
3117
        if _mod_revision.is_null(revision_id):
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
3118
            parent_trees = []
3119
        else:
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
3120
            parent_trees = [(revision_id, basis_tree)]
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
3121
        wt.set_parent_trees(parent_trees)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
3122
        transform.build_tree(basis_tree, wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3123
        return wt
3124
3125
    def __init__(self):
3126
        super(WorkingTreeFormat2, self).__init__()
3127
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
3128
3129
    def open(self, a_bzrdir, _found=False):
3130
        """Return the WorkingTree object for a_bzrdir
3131
3132
        _found is a private parameter, do not use it. It is used to indicate
3133
               if format probing has already been done.
3134
        """
3135
        if not _found:
3136
            # we are being called directly and must probe.
3137
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3138
        if not isinstance(a_bzrdir.transport, LocalTransport):
3139
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
3140
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
3141
                           _internal=True,
3142
                           _format=self,
5582.9.4 by Jelmer Vernooij
Remove hack for loading version 2 working trees from WorkingTree.
3143
                           _bzrdir=a_bzrdir,
3144
                           _control_files=a_bzrdir.open_branch().control_files)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
3145
        return wt
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3146
3147
class WorkingTreeFormat3(WorkingTreeFormat):
3148
    """The second working tree format updated to record a format marker.
3149
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3150
    This format:
3151
        - exists within a metadir controlling .bzr
3152
        - includes an explicit version marker for the workingtree control
3153
          files, separate from the BzrDir format
3154
        - modifies the hash cache format
3155
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
3156
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3157
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3158
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
3159
    upgrade_recommended = True
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3160
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
3161
    missing_parent_conflicts = True
3162
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3163
    def get_format_string(self):
3164
        """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
3165
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3166
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
3167
    def get_format_description(self):
3168
        """See WorkingTreeFormat.get_format_description()."""
3169
        return "Working tree format 3"
3170
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3171
    _lock_file_name = 'lock'
3172
    _lock_class = LockDir
3173
2100.3.3 by Aaron Bentley
Start of work on format 4 trees
3174
    _tree_class = WorkingTree3
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3175
2100.3.15 by Aaron Bentley
get test suite passing
3176
    def __get_matchingbzrdir(self):
3177
        return bzrdir.BzrDirMetaFormat1()
3178
3179
    _matchingbzrdir = property(__get_matchingbzrdir)
3180
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3181
    def _open_control_files(self, a_bzrdir):
3182
        transport = a_bzrdir.get_workingtree_transport(None)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3183
        return LockableFiles(transport, self._lock_file_name,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3184
                             self._lock_class)
3185
3123.5.3 by Aaron Bentley
Get tests passing with accelerator_tree
3186
    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
3187
                   accelerator_tree=None, hardlink=False):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
3188
        """See WorkingTreeFormat.initialize().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3189
3123.5.17 by Aaron Bentley
Update docs
3190
        :param revision_id: if supplied, create a working tree at a different
3191
            revision than the branch is at.
3192
        :param accelerator_tree: A tree which can be used for retrieving file
3193
            contents more quickly than the revision tree, i.e. a workingtree.
3194
            The revision tree will be used for cases where accelerator_tree's
3195
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
3196
        :param hardlink: If true, hard-link files from accelerator_tree,
3197
            where possible.
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
3198
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3199
        if not isinstance(a_bzrdir.transport, LocalTransport):
3200
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3201
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3202
        control_files = self._open_control_files(a_bzrdir)
3203
        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.
3204
        control_files.lock_write()
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
3205
        transport.put_bytes('format', self.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
3206
            mode=a_bzrdir._get_file_mode())
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
3207
        if from_branch is not None:
3208
            branch = from_branch
3209
        else:
3210
            branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
3211
        if revision_id is None:
2598.5.7 by Aaron Bentley
Updates from review
3212
            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
3213
        # WorkingTree3 can handle an inventory which has a unique root id.
3214
        # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
3215
        # those trees. And because there isn't a format bump inbetween, we
3216
        # are maintaining compatibility with older clients.
3217
        # inv = Inventory(root_id=gen_root_id())
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
3218
        inv = self._initial_inventory()
2100.3.8 by Aaron Bentley
Add add_reference
3219
        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.
3220
                         branch,
3221
                         inv,
3222
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
3223
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3224
                         _bzrdir=a_bzrdir,
3225
                         _control_files=control_files)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
3226
        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.
3227
        try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
3228
            basis_tree = branch.repository.revision_tree(revision_id)
1986.5.8 by Robert Collins
Merge bzr.dev.
3229
            # only set an explicit root id if there is one to set.
3230
            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('')
3231
                wt.set_root_id(basis_tree.get_root_id())
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
3232
            if revision_id == _mod_revision.NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
3233
                wt.set_parent_trees([])
3234
            else:
3235
                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.
3236
            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.
3237
        finally:
1986.5.7 by Robert Collins
Merge reviews.
3238
            # 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)
3239
            # WorkingTree is given a chance to fire.
3240
            control_files.unlock()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
3241
            wt.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3242
        return wt
3243
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
3244
    def _initial_inventory(self):
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
3245
        return inventory.Inventory()
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
3246
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3247
    def __init__(self):
3248
        super(WorkingTreeFormat3, self).__init__()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3249
3250
    def open(self, a_bzrdir, _found=False):
3251
        """Return the WorkingTree object for a_bzrdir
3252
3253
        _found is a private parameter, do not use it. It is used to indicate
3254
               if format probing has already been done.
3255
        """
3256
        if not _found:
3257
            # we are being called directly and must probe.
3258
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3259
        if not isinstance(a_bzrdir.transport, LocalTransport):
3260
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
3261
        wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3262
        return wt
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
3263
3264
    def _open(self, a_bzrdir, control_files):
3265
        """Open the tree itself.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3266
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
3267
        :param a_bzrdir: the dir for the tree.
3268
        :param control_files: the control files for the tree.
3269
        """
2100.3.3 by Aaron Bentley
Start of work on format 4 trees
3270
        return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3271
                                _internal=True,
3272
                                _format=self,
3273
                                _bzrdir=a_bzrdir,
3274
                                _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3275
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
3276
    def __str__(self):
3277
        return self.get_format_string()
3278
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3279
4599.4.4 by Robert Collins
Change the working tree default format to match 2a in the bzrdir registry.
3280
__default_format = WorkingTreeFormat6()
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3281
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3282
    "bzrlib.workingtree_4", "WorkingTreeFormat4")
3283
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3284
    "bzrlib.workingtree_4", "WorkingTreeFormat5")
3285
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3286
    "bzrlib.workingtree_4", "WorkingTreeFormat6")
3287
format_registry.register(WorkingTreeFormat3())
3288
format_registry.set_default(__default_format)
5642.2.6 by Jelmer Vernooij
Review comments from vila.
3289
# Register extra formats which have no format string are not discoverable
3290
# and not independently creatable. They are implicitly created as part of
3291
# e.g. older Bazaar formats or foreign formats.
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3292
format_registry.register_extra(WorkingTreeFormat2())