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