/brz/remove-bazaar

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