/brz/remove-bazaar

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