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