~bzr-pqm/bzr/bzr.dev

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