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