~bzr-pqm/bzr/bzr.dev

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