/brz/remove-bazaar

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