~bzr-pqm/bzr/bzr.dev

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