~bzr-pqm/bzr/bzr.dev

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