~bzr-pqm/bzr/bzr.dev

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