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