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