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