~bzr-pqm/bzr/bzr.dev

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