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