/brz/remove-bazaar

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