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