~bzr-pqm/bzr/bzr.dev

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