~bzr-pqm/bzr/bzr.dev

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