~bzr-pqm/bzr/bzr.dev

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