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