/brz/remove-bazaar

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