/brz/remove-bazaar

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