/brz/remove-bazaar

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