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