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