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