/brz/remove-bazaar

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