~bzr-pqm/bzr/bzr.dev

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