/brz/remove-bazaar

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