/brz/remove-bazaar

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