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