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