/brz/remove-bazaar

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