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