/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2255.7.83 by John Arbash Meinel
Update some obvious copyright headers to include 2007.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
453 by Martin Pool
- Split WorkingTree into its own file
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
453 by Martin Pool
- Split WorkingTree into its own file
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
453 by Martin Pool
- Split WorkingTree into its own file
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
"""WorkingTree object and friends.
18
19
A WorkingTree represents the editable working copy of a branch.
20
Operations which represent the WorkingTree are also done here, 
21
such as renaming or adding files.  The WorkingTree has an inventory 
22
which is updated by these operations.  A commit produces a 
23
new revision based on the workingtree and its inventory.
24
25
At the moment every WorkingTree has its own branch.  Remote
26
WorkingTrees aren't supported.
27
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
28
To get a WorkingTree, call bzrdir.open_workingtree() or
29
WorkingTree.open(dir).
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
30
"""
31
32
# TODO: Give the workingtree sole responsibility for the working inventory;
33
# remove the variable and references to it from the branch.  This may require
34
# updating the commit code so as to update the inventory within the working
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
36
# At the moment they may alias the inventory and have old copies of it in
37
# memory.  (Now done? -- mbp 20060309)
956 by Martin Pool
doc
38
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
39
from cStringIO import StringIO
40
import os
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
41
import sys
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
42
43
from bzrlib.lazy_import import lazy_import
44
lazy_import(globals(), """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
45
from bisect import bisect_left
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
46
import collections
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
47
import errno
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
48
import itertools
49
import operator
1398 by Robert Collins
integrate in Gustavos x-bit patch
50
import stat
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
51
from time import time
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
52
import warnings
2120.7.5 by Aaron Bentley
Merge bzr.dev
53
import re
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
54
1836.1.21 by John Arbash Meinel
Restore the ability to ignore items by modifying DEFAULT_IGNORE
55
import bzrlib
1731.2.17 by Aaron Bentley
Support extracting with checkouts
56
from bzrlib import (
57
    branch,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
58
    bzrdir,
59
    conflicts as _mod_conflicts,
1852.13.23 by Robert Collins
Merge up.
60
    dirstate,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
61
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
62
    generate_ids,
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
63
    globbing,
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
64
    hashcache,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
65
    ignores,
66
    merge,
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:
3113.6.1 by Aaron Bentley
Use source format where available for splitting
1026
            format = self.bzrdir.cloning_metadir()
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()
3113.6.4 by Aaron Bentley
Require the user to upgrade if they run split in a non-rich-root tree.
1033
        if not repo.supports_rich_root():
1034
            raise errors.RootNotRich()
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1035
        new_branch = branch_bzrdir.create_branch()
1731.2.21 by Aaron Bentley
Ensure extracting a subtree dupes the branch
1036
        new_branch.pull(self.branch)
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1037
        for parent_id in self.get_parent_ids():
1038
            new_branch.fetch(self.branch, parent_id)
1039
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1040
        if tree_transport.base != branch_transport.base:
1041
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1731.2.17 by Aaron Bentley
Support extracting with checkouts
1042
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1043
        else:
1044
            tree_bzrdir = branch_bzrdir
1731.2.18 by Aaron Bentley
Get extract in repository under test
1045
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1046
        wt.set_parent_ids(self.get_parent_ids())
1047
        my_inv = self.inventory
1048
        child_inv = Inventory(root_id=None)
1049
        new_root = my_inv[file_id]
1050
        my_inv.remove_recursive_id(file_id)
1051
        new_root.parent_id = None
1052
        child_inv.add(new_root)
1053
        self._write_inventory(my_inv)
1054
        wt._write_inventory(child_inv)
1055
        return wt
1056
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
1057
    def _serialize(self, inventory, out_file):
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
1058
        xml5.serializer_v5.write_inventory(self._inventory, out_file,
1059
            working=True)
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
1060
1061
    def _deserialize(selt, in_file):
1062
        return xml5.serializer_v5.read_inventory(in_file)
453 by Martin Pool
- Split WorkingTree into its own file
1063
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1064
    def flush(self):
1065
        """Write the in memory inventory to disk."""
1066
        # TODO: Maybe this should only write on dirty ?
1067
        if self._control_files._lock_mode != 'w':
1068
            raise errors.NotWriteLocked(self)
1069
        sio = StringIO()
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1070
        self._serialize(self._inventory, sio)
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1071
        sio.seek(0)
1072
        self._control_files.put('inventory', sio)
1073
        self._inventory_is_modified = False
1074
1551.10.29 by Aaron Bentley
Fix tree.list_files when file kind changes
1075
    def _kind(self, relpath):
1076
        return osutils.file_kind(self.abspath(relpath))
1077
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1078
    def list_files(self, include_root=False):
1732.1.6 by John Arbash Meinel
Fix documentation bug in workingtree.list_files
1079
        """Recursively list all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
1080
1081
        Lists, but does not descend into unversioned directories.
1082
1083
        This does not include files that have been deleted in this
1084
        tree.
1085
1086
        Skips the control directory.
1087
        """
2255.2.60 by John Arbash Meinel
Add an explicit exception since tree.list_files() requires a lock (at least for dirstate
1088
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1089
        # with it. So callers should be careful to always read_lock the tree.
1090
        if not self.is_locked():
1091
            raise errors.ObjectNotLocked(self)
1092
2255.2.52 by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.
1093
        inv = self.inventory
1910.2.56 by Aaron Bentley
More work on bundles
1094
        if include_root is True:
1095
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1096
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
1097
        pathjoin = osutils.pathjoin
1551.10.29 by Aaron Bentley
Fix tree.list_files when file kind changes
1098
        file_kind = self._kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1099
1100
        # transport.base ends in a slash, we want the piece
1101
        # between the last two slashes
1102
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1103
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1104
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1105
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1106
        # directory file_id, relative path, absolute path, reverse sorted children
1107
        children = os.listdir(self.basedir)
1108
        children.sort()
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1109
        # jam 20060527 The kernel sized tree seems equivalent whether we 
1110
        # use a deque and popleft to keep them sorted, or if we use a plain
1111
        # 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.
1112
        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
1113
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1114
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1115
            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
1116
1117
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1118
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
1119
                ## TODO: If we find a subdirectory with its own .bzr
1120
                ## directory, then that is a separate tree and we
1121
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1122
1123
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1124
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
1125
                    continue
1126
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1127
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
1128
                # 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
1129
                # than the checks of pathjoin(), all relative paths will have an extra slash
1130
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1131
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
1132
1133
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1134
                fap = from_dir_abspath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
1135
                
1136
                f_ie = inv.get_child(from_dir_id, f)
1137
                if f_ie:
1138
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1139
                elif self.is_ignored(fp[1:]):
1140
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
1141
                else:
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1142
                    # we may not have found this file, because of a unicode issue
1143
                    f_norm, can_access = osutils.normalized_filename(f)
1144
                    if f == f_norm or not can_access:
1145
                        # No change, so treat this file normally
1146
                        c = '?'
1147
                    else:
1148
                        # this file can be accessed by a normalized path
1149
                        # check again if it is versioned
1150
                        # these lines are repeated here for performance
1151
                        f = f_norm
1152
                        fp = from_dir_relpath + '/' + f
1153
                        fap = from_dir_abspath + '/' + f
1154
                        f_ie = inv.get_child(from_dir_id, f)
1155
                        if f_ie:
1156
                            c = 'V'
1157
                        elif self.is_ignored(fp[1:]):
1158
                            c = 'I'
1159
                        else:
1160
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
1161
1162
                fk = file_kind(fap)
1163
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1164
                # make a last minute entry
1165
                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
1166
                    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
1167
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1168
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
1169
                        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
1170
                    except KeyError:
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, TreeEntry()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1172
                    continue
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1173
                
453 by Martin Pool
- Split WorkingTree into its own file
1174
                if fk != 'directory':
1175
                    continue
1176
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1177
                # 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.
1178
                new_children = os.listdir(fap)
1179
                new_children.sort()
1180
                new_children = collections.deque(new_children)
1181
                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
1182
                # Break out of inner loop,
2206.1.7 by Marius Kruger
* errors
1183
                # so that we start outer loop with child
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1184
                break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
1185
            else:
1186
                # 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.
1187
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1188
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1189
    @needs_tree_write_lock
2123.3.8 by Steffen Eichenberg
new parameter to_dir must be a named parameter
1190
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1191
        """Rename files.
1192
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1193
        to_dir must exist in the inventory.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
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
        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.
1196
        it, keeping their old names.  
1197
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1198
        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.
1199
        this doesn't change the directory.
1200
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1201
        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
1202
        independently.
1203
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1204
        The first mode moves the file in the filesystem and updates the
1205
        inventory. The second mode only updates the inventory without
1206
        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
1207
        in version 0.15.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1208
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1209
        move uses the second mode if 'after == True' and the target is not
1210
        versioned but present in the working tree.
1211
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1212
        move uses the second mode if 'after == False' and the source is
1213
        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
1214
        versioned but present in the working tree.
1215
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1216
        move uses the first mode if 'after == False' and the source is
1217
        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
1218
        versioned and not present in the working tree.
1219
1220
        Everything else results in an error.
1221
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1222
        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
1223
        entry that is moved.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1224
        """
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1225
        rename_entries = []
1226
        rename_tuples = []
1227
1228
        # check for deprecated use of signature
1229
        if to_dir is None:
1230
            to_dir = kwargs.get('to_name', None)
1231
            if to_dir is None:
1232
                raise TypeError('You must supply a target directory')
1233
            else:
1234
                symbol_versioning.warn('The parameter to_name was deprecated'
1235
                                       ' in version 0.13. Use to_dir instead',
1236
                                       DeprecationWarning)
1237
1238
        # check destination directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1239
        assert not isinstance(from_paths, basestring)
1240
        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
1241
        to_abs = self.abspath(to_dir)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1242
        if not isdir(to_abs):
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1243
            raise errors.BzrMoveFailedError('',to_dir,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1244
                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
1245
        if not self.has_filename(to_dir):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1246
            raise errors.BzrMoveFailedError('',to_dir,
1247
                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
1248
        to_dir_id = inv.path2id(to_dir)
2123.3.6 by Steffen Eichenberg
unified error messages
1249
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1250
            raise errors.BzrMoveFailedError('',to_dir,
1251
                errors.NotVersionedError(path=str(to_dir)))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1252
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1253
        to_dir_ie = inv[to_dir_id]
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
1254
        if to_dir_ie.kind != 'directory':
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1255
            raise errors.BzrMoveFailedError('',to_dir,
1256
                errors.NotADirectory(to_abs))
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1257
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1258
        # create rename entries and tuples
1259
        for from_rel in from_paths:
1260
            from_tail = splitpath(from_rel)[-1]
1261
            from_id = inv.path2id(from_rel)
1262
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1263
                raise errors.BzrMoveFailedError(from_rel,to_dir,
1264
                    errors.NotVersionedError(path=str(from_rel)))
2206.1.4 by Marius Kruger
Improved WorkingTree.move excptions. (as requested)
1265
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1266
            from_entry = inv[from_id]
1267
            from_parent_id = from_entry.parent_id
1268
            to_rel = pathjoin(to_dir, from_tail)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1269
            rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1270
                                         from_id=from_id,
1271
                                         from_tail=from_tail,
1272
                                         from_parent_id=from_parent_id,
1273
                                         to_rel=to_rel, to_tail=from_tail,
1274
                                         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
1275
            rename_entries.append(rename_entry)
1276
            rename_tuples.append((from_rel, to_rel))
1277
1278
        # determine which move mode to use. checks also for movability
1279
        rename_entries = self._determine_mv_mode(rename_entries, after)
1280
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1281
        original_modified = self._inventory_is_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1282
        try:
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
1283
            if len(from_paths):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1284
                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
1285
            self._move(rename_entries)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1286
        except:
1287
            # 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
1288
            self._inventory_is_modified = original_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1289
            raise
1290
        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
1291
        return rename_tuples
1292
1293
    def _determine_mv_mode(self, rename_entries, after=False):
1294
        """Determines for each from-to pair if both inventory and working tree
1295
        or only the inventory has to be changed.
1296
1297
        Also does basic plausability tests.
1298
        """
1299
        inv = self.inventory
1300
1301
        for rename_entry in rename_entries:
1302
            # store to local variables for easier reference
1303
            from_rel = rename_entry.from_rel
1304
            from_id = rename_entry.from_id
1305
            to_rel = rename_entry.to_rel
1306
            to_id = inv.path2id(to_rel)
1307
            only_change_inv = False
1308
1309
            # check the inventory for source and destination
1310
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1311
                raise errors.BzrMoveFailedError(from_rel,to_rel,
1312
                    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
1313
            if to_id is not None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1314
                raise errors.BzrMoveFailedError(from_rel,to_rel,
1315
                    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
1316
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1317
            # 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
1318
            # inv and file system)
1319
            if after:
1320
                if not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1321
                    raise errors.BzrMoveFailedError(from_id,to_rel,
1322
                        errors.NoSuchFile(path=str(to_rel),
1323
                        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
1324
                only_change_inv = True
1325
            elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1326
                only_change_inv = True
1327
            elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1328
                only_change_inv = False
2978.8.1 by Alexander Belchenko
Rename on Windows is able to change filename case. (#77740)
1329
            elif (sys.platform == 'win32'
1330
                and from_rel.lower() == to_rel.lower()
1331
                and self.has_filename(from_rel)):
1332
                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
1333
            else:
1334
                # something is wrong, so lets determine what exactly
1335
                if not self.has_filename(from_rel) and \
1336
                   not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1337
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1338
                        errors.PathsDoNotExist(paths=(str(from_rel),
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1339
                        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
1340
                else:
2967.3.6 by Daniel Watkins
Extracted the string from every use of RenameFailedFilesExist to RenameFailedFilesExist itself.
1341
                    raise errors.RenameFailedFilesExist(from_rel, to_rel)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1342
            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
1343
        return rename_entries
1344
1345
    def _move(self, rename_entries):
1346
        """Moves a list of files.
1347
1348
        Depending on the value of the flag 'only_change_inv', the
1349
        file will be moved on the file system or not.
1350
        """
1351
        inv = self.inventory
1352
        moved = []
1353
1354
        for entry in rename_entries:
1355
            try:
1356
                self._move_entry(entry)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1357
            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
1358
                self._rollback_move(moved)
1359
                raise
1360
            moved.append(entry)
1361
1362
    def _rollback_move(self, moved):
2220.1.12 by Marius Kruger
* Fix errors.py import order
1363
        """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
1364
        inv = self.inventory
1365
        for entry in moved:
1366
            try:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1367
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1368
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1369
                    entry.from_tail, entry.from_parent_id,
1370
                    entry.only_change_inv))
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1371
            except errors.BzrMoveFailedError, e:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1372
                raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1373
                        " The working tree is in an inconsistent state."
1374
                        " Please consider doing a 'bzr revert'."
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1375
                        " 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
1376
2220.1.12 by Marius Kruger
* Fix errors.py import order
1377
    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
1378
        inv = self.inventory
1379
        from_rel_abs = self.abspath(entry.from_rel)
1380
        to_rel_abs = self.abspath(entry.to_rel)
1381
        if from_rel_abs == to_rel_abs:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1382
            raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1383
                "Source and target are identical.")
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1384
2220.1.12 by Marius Kruger
* Fix errors.py import order
1385
        if not entry.only_change_inv:
1386
            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
1387
                osutils.rename(from_rel_abs, to_rel_abs)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1388
            except OSError, e:
1389
                raise errors.BzrMoveFailedError(entry.from_rel,
1390
                    entry.to_rel, e[1])
1391
        inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1392
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1393
    @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
1394
    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).
1395
        """Rename one file.
1396
1397
        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
1398
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1399
        rename_one has several 'modes' to work. First, it can rename a physical
1400
        file and change the file_id. That is the normal mode. Second, it can
1401
        only change the file_id without touching any physical file. This is
1402
        the new mode introduced in version 0.15.
1403
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1404
        rename_one uses the second mode if 'after == True' and 'to_rel' is not
1405
        versioned but present in the working tree.
1406
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1407
        rename_one uses the second mode if 'after == False' and 'from_rel' is
1408
        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
1409
        versioned but present in the working tree.
1410
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1411
        rename_one uses the first mode if 'after == False' and 'from_rel' is
1412
        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
1413
        versioned and not present in the working tree.
1414
1415
        Everything else results in an error.
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1416
        """
1417
        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
1418
        rename_entries = []
1419
1420
        # create rename entries and tuples
1421
        from_tail = splitpath(from_rel)[-1]
1422
        from_id = inv.path2id(from_rel)
1423
        if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1424
            raise errors.BzrRenameFailedError(from_rel,to_rel,
1425
                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
1426
        from_entry = inv[from_id]
1427
        from_parent_id = from_entry.parent_id
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1428
        to_dir, to_tail = os.path.split(to_rel)
1429
        to_dir_id = inv.path2id(to_dir)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1430
        rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1431
                                     from_id=from_id,
1432
                                     from_tail=from_tail,
1433
                                     from_parent_id=from_parent_id,
1434
                                     to_rel=to_rel, to_tail=to_tail,
1435
                                     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
1436
        rename_entries.append(rename_entry)
1437
1438
        # determine which move mode to use. checks also for movability
1439
        rename_entries = self._determine_mv_mode(rename_entries, after)
1440
1441
        # check if the target changed directory and if the target directory is
1442
        # versioned
2123.3.6 by Steffen Eichenberg
unified error messages
1443
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1444
            raise errors.BzrMoveFailedError(from_rel,to_rel,
1445
                errors.NotVersionedError(path=str(to_dir)))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1446
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1447
        # all checks done. now we can continue with our actual work
1448
        mutter('rename_one:\n'
1449
               '  from_id   {%s}\n'
1450
               '  from_rel: %r\n'
1451
               '  to_rel:   %r\n'
1452
               '  to_dir    %r\n'
1453
               '  to_dir_id {%s}\n',
1454
               from_id, from_rel, to_rel, to_dir, to_dir_id)
1455
1456
        self._move(rename_entries)
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1457
        self._write_inventory(inv)
1458
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1459
    class _RenameEntry(object):
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1460
        def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2220.1.12 by Marius Kruger
* Fix errors.py import order
1461
                     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
1462
            self.from_rel = from_rel
1463
            self.from_id = from_id
1464
            self.from_tail = from_tail
1465
            self.from_parent_id = from_parent_id
1466
            self.to_rel = to_rel
1467
            self.to_tail = to_tail
1468
            self.to_parent_id = to_parent_id
2220.1.12 by Marius Kruger
* Fix errors.py import order
1469
            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
1470
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1471
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
1472
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
1473
        """Return all unknown files.
1474
1475
        These are files in the working directory that are not versioned or
1476
        control files or ignored.
1477
        """
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1478
        # force the extras method to be fully executed before returning, to 
1479
        # prevent race conditions with the lock
1480
        return iter(
1481
            [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
1482
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1483
    @needs_tree_write_lock
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1484
    def unversion(self, file_ids):
1485
        """Remove the file ids in file_ids from the current versioned set.
1486
1487
        When a file_id is unversioned, all of its children are automatically
1488
        unversioned.
1489
1490
        :param file_ids: The file ids to stop versioning.
1491
        :raises: NoSuchId if any fileid is not currently versioned.
1492
        """
1493
        for file_id in file_ids:
1494
            if self._inventory.has_id(file_id):
1988.2.6 by Robert Collins
Review feedback.
1495
                self._inventory.remove_recursive_id(file_id)
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1496
            else:
1497
                raise errors.NoSuchId(self, file_id)
1498
        if len(file_ids):
1499
            # in the future this should just set a dirty bit to wait for the 
1500
            # final unlock. However, until all methods of workingtree start
1501
            # with the current in -memory inventory rather than triggering 
1502
            # a read, it is more complex - we need to teach read_inventory
1503
            # to know when to read, and when to not read first... and possibly
1504
            # to save first when the in memory one may be corrupted.
1505
            # so for now, we just only write it if it is indeed dirty.
1506
            # - RBC 20060907
1507
            self._write_inventory(self._inventory)
1508
    
1534.10.16 by Aaron Bentley
Small tweaks
1509
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1510
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
1511
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1512
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
1513
        return self._iter_conflicts()
1514
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1515
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1516
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1517
        for info in self.list_files():
1518
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1519
            stem = get_conflicted_stem(path)
1520
            if stem is None:
1521
                continue
1522
            if stem not in conflicted:
1523
                conflicted.add(stem)
1524
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
1525
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1526
    @needs_write_lock
1551.11.10 by Aaron Bentley
Add change reporting to pull
1527
    def pull(self, source, overwrite=False, stop_revision=None,
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1528
             change_reporter=None, possible_transports=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1529
        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().
1530
        source.lock_read()
1531
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1532
            pp = ProgressPhase("Pull phase", 2, top_pb)
1533
            pp.next_phase()
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
1534
            old_revision_info = self.branch.last_revision_info()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
1535
            basis_tree = self.basis_tree()
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1536
            count = self.branch.pull(source, overwrite, stop_revision,
1537
                                     possible_transports=possible_transports)
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
1538
            new_revision_info = self.branch.last_revision_info()
1539
            if new_revision_info != old_revision_info:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1540
                pp.next_phase()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1541
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1542
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1543
                basis_tree.lock_read()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1544
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1545
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1546
                    merge.merge_inner(
1547
                                self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1548
                                new_basis_tree,
1549
                                basis_tree,
1550
                                this_tree=self,
1551.11.10 by Aaron Bentley
Add change reporting to pull
1551
                                pb=pb,
1552
                                change_reporter=change_reporter)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1553
                    if (basis_tree.inventory.root is None and
1731.1.47 by Aaron Bentley
Merge bzr.dev
1554
                        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('')
1555
                        self.set_root_id(new_basis_tree.get_root_id())
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1556
                finally:
1557
                    pb.finished()
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1558
                    basis_tree.unlock()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1559
                # 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.
1560
                # reuse the revisiontree we merged against to set the new
1561
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1562
                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.
1563
                # we have to pull the merge trees out again, because 
1564
                # merge_inner has set the ids. - this corner is not yet 
1565
                # layered well enough to prevent double handling.
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1566
                # XXX TODO: Fix the double handling: telling the tree about
1567
                # 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.
1568
                merges = self.get_parent_ids()[1:]
1569
                parent_trees.extend([
1570
                    (parent, repository.revision_tree(parent)) for
1571
                     parent in merges])
1572
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1573
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1574
        finally:
1575
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1576
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1577
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1578
    @needs_write_lock
1579
    def put_file_bytes_non_atomic(self, file_id, bytes):
1580
        """See MutableTree.put_file_bytes_non_atomic."""
1581
        stream = file(self.id2abspath(file_id), 'wb')
1582
        try:
1583
            stream.write(bytes)
1584
        finally:
1585
            stream.close()
1586
        # TODO: update the hashcache here ?
1587
453 by Martin Pool
- Split WorkingTree into its own file
1588
    def extras(self):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1589
        """Yield all unversioned files in this WorkingTree.
453 by Martin Pool
- Split WorkingTree into its own file
1590
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1591
        If there are any unversioned directories then only the directory is
1592
        returned, not all its children.  But if there are unversioned files
453 by Martin Pool
- Split WorkingTree into its own file
1593
        under a versioned subdirectory, they are returned.
1594
1595
        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.
1596
        This is the same order used by 'osutils.walkdirs'.
453 by Martin Pool
- Split WorkingTree into its own file
1597
        """
1598
        ## TODO: Work from given directory downwards
1599
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1600
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1601
            dirabs = self.abspath(path)
1602
            if not isdir(dirabs):
1603
                # e.g. directory deleted
1604
                continue
1605
1606
            fl = []
1607
            for subf in os.listdir(dirabs):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1608
                if subf == '.bzr':
1609
                    continue
1610
                if subf not in dir_entry.children:
1611
                    subf_norm, can_access = osutils.normalized_filename(subf)
1612
                    if subf_norm != subf and can_access:
1613
                        if subf_norm not in dir_entry.children:
1614
                            fl.append(subf_norm)
1615
                    else:
1616
                        fl.append(subf)
453 by Martin Pool
- Split WorkingTree into its own file
1617
            
1618
            fl.sort()
1619
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1620
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1621
                yield subp
1622
1623
    def ignored_files(self):
1624
        """Yield list of PATH, IGNORE_PATTERN"""
1625
        for subp in self.extras():
1626
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1627
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1628
                yield subp, pat
1629
1630
    def get_ignore_list(self):
1631
        """Return list of ignore patterns.
1632
1633
        Cached in the Tree object after the first call.
1634
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1635
        ignoreset = getattr(self, '_ignoreset', None)
1636
        if ignoreset is not None:
1637
            return ignoreset
1638
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
1639
        ignore_globs = set()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1640
        ignore_globs.update(ignores.get_runtime_ignores())
1641
        ignore_globs.update(ignores.get_user_ignores())
453 by Martin Pool
- Split WorkingTree into its own file
1642
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1643
            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
1644
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1645
                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
1646
            finally:
1647
                f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1648
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1649
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1650
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1651
    def _flush_ignore_list_cache(self):
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1652
        """Resets the cached ignore list to force a cache rebuild."""
1653
        self._ignoreset = None
1654
        self._ignoreglobster = None
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1655
453 by Martin Pool
- Split WorkingTree into its own file
1656
    def is_ignored(self, filename):
1657
        r"""Check whether the filename matches an ignore pattern.
1658
1659
        Patterns containing '/' or '\' need to match the whole path;
1660
        others match against only the last component.
1661
1662
        If the file is ignored, returns the pattern which caused it to
1663
        be ignored, otherwise None.  So this can simply be used as a
1664
        boolean if desired."""
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1665
        if getattr(self, '_ignoreglobster', None) is None:
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1666
            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)
1667
        return self._ignoreglobster.match(filename)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1668
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1669
    def kind(self, file_id):
1670
        return file_kind(self.id2abspath(file_id))
1671
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1672
    def _comparison_data(self, entry, path):
1673
        abspath = self.abspath(path)
1674
        try:
1675
            stat_value = os.lstat(abspath)
1676
        except OSError, e:
1677
            if getattr(e, 'errno', None) == errno.ENOENT:
1678
                stat_value = None
1679
                kind = None
1680
                executable = False
1681
            else:
1682
                raise
1683
        else:
1684
            mode = stat_value.st_mode
1685
            kind = osutils.file_kind_from_stat_mode(mode)
1686
            if not supports_executable():
2409.1.2 by Dmitry Vasiliev
Used one-line conditional expression instead of the multi-line one
1687
                executable = entry is not None and entry.executable
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1688
            else:
1689
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1690
        return kind, executable, stat_value
1691
1692
    def _file_size(self, entry, stat_value):
1693
        return stat_value.st_size
1694
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1695
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1696
        """Return the last revision of the branch for this tree.
1697
1698
        This format tree does not support a separate marker for last-revision
1699
        compared to the branch.
1700
1701
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1702
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1703
        return self._last_revision()
1704
1705
    @needs_read_lock
1706
    def _last_revision(self):
1707
        """helper for get_parent_ids."""
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
1708
        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()
1709
1694.2.6 by Martin Pool
[merge] bzr.dev
1710
    def is_locked(self):
1711
        return self._control_files.is_locked()
1712
2298.1.1 by Martin Pool
Add test for merge_modified
1713
    def _must_be_locked(self):
1714
        if not self.is_locked():
1715
            raise errors.ObjectNotLocked(self)
1716
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1717
    def lock_read(self):
1718
        """See Branch.lock_read, and WorkingTree.unlock."""
2255.2.204 by Robert Collins
Fix info and status again.
1719
        if not self.is_locked():
1720
            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.
1721
        self.branch.lock_read()
1722
        try:
1723
            return self._control_files.lock_read()
1724
        except:
1725
            self.branch.unlock()
1726
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1727
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1728
    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.
1729
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
2255.2.204 by Robert Collins
Fix info and status again.
1730
        if not self.is_locked():
1731
            self._reset_data()
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1732
        self.branch.lock_read()
1733
        try:
1734
            return self._control_files.lock_write()
1735
        except:
1736
            self.branch.unlock()
1737
            raise
1738
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1739
    def lock_write(self):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1740
        """See MutableTree.lock_write, and WorkingTree.unlock."""
2255.2.204 by Robert Collins
Fix info and status again.
1741
        if not self.is_locked():
1742
            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.
1743
        self.branch.lock_write()
1744
        try:
1745
            return self._control_files.lock_write()
1746
        except:
1747
            self.branch.unlock()
1748
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1749
1694.2.6 by Martin Pool
[merge] bzr.dev
1750
    def get_physical_lock_status(self):
1751
        return self._control_files.get_physical_lock_status()
1752
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1753
    def _basis_inventory_name(self):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1754
        return 'basis-inventory-cache'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1755
2255.2.204 by Robert Collins
Fix info and status again.
1756
    def _reset_data(self):
1757
        """Reset transient data that cannot be revalidated."""
1758
        self._inventory_is_modified = False
1759
        result = self._deserialize(self._control_files.get('inventory'))
1760
        self._set_inventory(result, dirty=False)
1761
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1762
    @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.
1763
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1764
        """Change the last revision in the working tree."""
1765
        if self._change_last_revision(new_revision):
1766
            self._cache_basis_inventory(new_revision)
1767
1768
    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.
1769
        """Template method part of set_last_revision to perform the change.
1770
        
1771
        This is used to allow WorkingTree3 instances to not affect branch
1772
        when their last revision is set.
1773
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1774
        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()
1775
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1776
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1777
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1778
            self.branch.generate_revision_history(new_revision)
1779
        except errors.NoSuchRevision:
1780
            # not present in the repo - dont try to set it deeper than the tip
1781
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1782
        return True
1783
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1784
    def _write_basis_inventory(self, xml):
1785
        """Write the basis inventory XML to the basis-inventory file"""
1786
        assert isinstance(xml, str), 'serialised xml must be bytestring.'
1787
        path = self._basis_inventory_name()
1788
        sio = StringIO(xml)
1789
        self._control_files.put(path, sio)
1790
1791
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1792
        """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)
1793
        inventory.revision_id = revision_id
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
1794
        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.
1795
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1796
    def _cache_basis_inventory(self, new_revision):
1797
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1798
        # TODO: this should allow the ready-to-use inventory to be passed in,
1799
        # as commit already has that ready-to-use [while the format is the
1800
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1801
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1802
            # this double handles the inventory - unpack and repack - 
1803
            # but is easier to understand. We can/should put a conditional
1804
            # in here based on whether the inventory is in the latest format
1805
            # - perhaps we should repack all inventories on a repository
1806
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1807
            # the fast path is to copy the raw xml from the repository. If the
1808
            # xml contains 'revision_id="', then we assume the right 
1809
            # revision_id is set. We must check for this full string, because a
1810
            # root node id can legitimately look like 'revision_id' but cannot
1811
            # contain a '"'.
1812
            xml = self.branch.repository.get_inventory_xml(new_revision)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1813
            firstline = xml.split('\n', 1)[0]
1814
            if (not 'revision_id="' in firstline or 
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
1815
                'format="7"' not in firstline):
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1816
                inv = self.branch.repository.deserialise_inventory(
1817
                    new_revision, xml)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1818
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1819
            self._write_basis_inventory(xml)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1820
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1821
            pass
1822
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1823
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1824
        """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.
1825
        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.
1826
        return self._control_files.get(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1827
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1828
    @needs_read_lock
1829
    def read_working_inventory(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1830
        """Read the working inventory.
1831
        
1986.5.7 by Robert Collins
Merge reviews.
1832
        :raises errors.InventoryModified: read_working_inventory will fail
1833
            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
1834
        """
1835
        # conceptually this should be an implementation detail of the tree. 
1836
        # XXX: Deprecate this.
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1837
        # ElementTree does its own conversion from UTF-8, so open in
1838
        # binary.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1839
        if self._inventory_is_modified:
1840
            raise errors.InventoryModified(self)
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1841
        result = self._deserialize(self._control_files.get('inventory'))
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1842
        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()
1843
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1844
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1845
    @needs_tree_write_lock
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1846
    def remove(self, files, verbose=False, to_file=None, keep_files=True,
2292.1.10 by Marius Kruger
* workingtree.remove
1847
        force=False):
2475.5.2 by Marius Kruger
* blackbox/test_remove
1848
        """Remove nominated files from the working inventory.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1849
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1850
        :files: File paths relative to the basedir.
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
1851
        :keep_files: If true, the files will also be kept.
2292.1.10 by Marius Kruger
* workingtree.remove
1852
        :force: Delete files and directories, even if they are changed and
1853
            even if the directories are not empty.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1854
        """
1855
        if isinstance(files, basestring):
1856
            files = [files]
1857
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1858
        inv_delta = []
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1859
1860
        new_files=set()
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1861
        unknown_nested_files=set()
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1862
1863
        def recurse_directory_to_add_files(directory):
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1864
            # 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()
1865
            # so we can check if they have changed.
1551.15.11 by Aaron Bentley
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees
1866
            for parent_info, file_infos in\
1867
                osutils.walkdirs(self.abspath(directory),
1868
                    directory):
1869
                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
1870
                    # Is it versioned or ignored?
1871
                    if self.path2id(relpath) or self.is_ignored(relpath):
1872
                        # Add nested content for deletion.
2655.2.6 by Marius Kruger
* workingtree.remove
1873
                        new_files.add(relpath)
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1874
                    else:
1875
                        # Files which are not versioned and not ignored
1876
                        # should be treated as unknown.
1877
                        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()
1878
1879
        for filename in files:
1880
            # Get file name into canonical form.
1551.15.11 by Aaron Bentley
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees
1881
            abspath = self.abspath(filename)
1882
            filename = self.relpath(abspath)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1883
            if len(filename) > 0:
1884
                new_files.add(filename)
1551.15.15 by Aaron Bentley
Remove redundant listdir
1885
                if osutils.isdir(abspath):
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
1886
                    recurse_directory_to_add_files(filename)
2655.2.4 by Marius Kruger
* workingtree.remove
1887
2655.2.15 by Marius Kruger
Apply Alexander's comments:
1888
        files = list(new_files)
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1889
2475.5.2 by Marius Kruger
* blackbox/test_remove
1890
        if len(files) == 0:
1891
            return # nothing to do
1892
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
1893
        # Sort needed to first handle directory content before the directory
1894
        files.sort(reverse=True)
2655.2.6 by Marius Kruger
* workingtree.remove
1895
2655.2.4 by Marius Kruger
* workingtree.remove
1896
        # Bail out if we are going to delete files we shouldn't
2292.1.11 by Marius Kruger
* workingtree.remove
1897
        if not keep_files and not force:
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1898
            has_changed_files = len(unknown_nested_files) > 0
2475.5.2 by Marius Kruger
* blackbox/test_remove
1899
            if not has_changed_files:
1900
                for (file_id, path, content_change, versioned, parent_id, name,
1901
                     kind, executable) in self._iter_changes(self.basis_tree(),
1902
                         include_unchanged=True, require_versioned=False,
1903
                         want_unversioned=True, specific_files=files):
3042.2.1 by Lukáš Lalinský
Fix ``bzr rm`` to not delete modified and ignored files.
1904
                    if versioned == (False, False):
3042.2.2 by John Arbash Meinel
Minor comment cleanup.
1905
                        # The record is unknown ...
3042.2.1 by Lukáš Lalinský
Fix ``bzr rm`` to not delete modified and ignored files.
1906
                        if not self.is_ignored(path[1]):
3042.2.2 by John Arbash Meinel
Minor comment cleanup.
1907
                            # ... but not ignored
3042.2.1 by Lukáš Lalinský
Fix ``bzr rm`` to not delete modified and ignored files.
1908
                            has_changed_files = True
1909
                            break
1910
                    elif content_change and (kind[1] != None):
3042.2.2 by John Arbash Meinel
Minor comment cleanup.
1911
                        # Versioned and changed, but not deleted
2475.5.2 by Marius Kruger
* blackbox/test_remove
1912
                        has_changed_files = True
1913
                        break
1914
1915
            if has_changed_files:
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1916
                # Make delta show ALL applicable changes in error message.
2475.5.2 by Marius Kruger
* blackbox/test_remove
1917
                tree_delta = self.changes_from(self.basis_tree(),
2655.2.4 by Marius Kruger
* workingtree.remove
1918
                    require_versioned=False, want_unversioned=True,
2475.5.2 by Marius Kruger
* blackbox/test_remove
1919
                    specific_files=files)
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
1920
                for unknown_file in unknown_nested_files:
2655.2.6 by Marius Kruger
* workingtree.remove
1921
                    if unknown_file not in tree_delta.unversioned:
1922
                        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()
1923
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
1924
2655.2.4 by Marius Kruger
* workingtree.remove
1925
        # Build inv_delta and delete files where applicaple,
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1926
        # do this before any modifications to inventory.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1927
        for f in files:
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1928
            fid = self.path2id(f)
2655.2.4 by Marius Kruger
* workingtree.remove
1929
            message = None
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1930
            if not fid:
2655.2.4 by Marius Kruger
* workingtree.remove
1931
                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.
1932
            else:
1933
                if verbose:
2292.1.10 by Marius Kruger
* workingtree.remove
1934
                    # 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.
1935
                    if self.is_ignored(f):
1936
                        new_status = 'I'
1937
                    else:
1938
                        new_status = '?'
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1939
                    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.
1940
                                       to_file=to_file)
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1941
                # Unversion file
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1942
                inv_delta.append((f, None, fid, None))
2655.2.4 by Marius Kruger
* workingtree.remove
1943
                message = "removed %s" % (f,)
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
1944
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
1945
            if not keep_files:
2292.1.30 by Marius Kruger
* Minor text fixes.
1946
                abs_path = self.abspath(f)
1947
                if osutils.lexists(abs_path):
1948
                    if (osutils.isdir(abs_path) and
1949
                        len(os.listdir(abs_path)) > 0):
2655.2.4 by Marius Kruger
* workingtree.remove
1950
                        if force:
1951
                            osutils.rmtree(abs_path)
1952
                        else:
2655.2.6 by Marius Kruger
* workingtree.remove
1953
                            message = "%s is not an empty directory "\
2655.2.4 by Marius Kruger
* workingtree.remove
1954
                                "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()
1955
                    else:
2292.1.30 by Marius Kruger
* Minor text fixes.
1956
                        osutils.delete_any(abs_path)
2655.2.4 by Marius Kruger
* workingtree.remove
1957
                        message = "deleted %s" % (f,)
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
1958
                elif message is not None:
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1959
                    # Only care if we haven't done anything yet.
1960
                    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()
1961
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
1962
            # 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.
1963
            if message is not None:
1964
                note(message)
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
1965
        self.apply_inventory_delta(inv_delta)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1966
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1967
    @needs_tree_write_lock
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
1968
    def revert(self, filenames=None, old_tree=None, backups=True,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1969
               pb=DummyProgress(), report_changes=False):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1970
        from bzrlib.conflicts import resolve
2748.3.3 by Aaron Bentley
Add a deprecation warning for revert([]), and handle as revert(None) for now
1971
        if filenames == []:
1972
            filenames = None
1973
            symbol_versioning.warn('Using [] to revert all files is deprecated'
1974
                ' as of bzr 0.91.  Please use None (the default) instead.',
1975
                DeprecationWarning, stacklevel=2)
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1976
        if old_tree is None:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
1977
            basis_tree = self.basis_tree()
1978
            basis_tree.lock_read()
1979
            old_tree = basis_tree
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1980
        else:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
1981
            basis_tree = None
1982
        try:
1983
            conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1984
                                         report_changes)
2949.2.2 by Robert Collins
Avoid dirstate parent resetting when it is not needed during revert.
1985
            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
1986
                parent_trees = []
1987
                last_revision = self.last_revision()
1988
                if last_revision != NULL_REVISION:
1989
                    if basis_tree is None:
1990
                        basis_tree = self.basis_tree()
1991
                        basis_tree.lock_read()
1992
                    parent_trees.append((last_revision, basis_tree))
1993
                self.set_parent_trees(parent_trees)
1994
                resolve(self)
1995
            else:
3017.2.1 by Aaron Bentley
Revert now resolves conflicts recursively (#102739)
1996
                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
1997
        finally:
1998
            if basis_tree is not None:
1999
                basis_tree.unlock()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
2000
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
2001
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2002
    def revision_tree(self, revision_id):
2003
        """See Tree.revision_tree.
2004
2005
        WorkingTree can supply revision_trees for the basis revision only
2006
        because there is only one cached inventory in the bzr directory.
2007
        """
2008
        if revision_id == self.last_revision():
2009
            try:
2010
                xml = self.read_basis_inventory()
1852.16.5 by John Arbash Meinel
[merge] bzr.dev 2255, resolve conflicts, update copyrights
2011
            except errors.NoSuchFile:
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2012
                pass
2013
            else:
1908.11.3 by Robert Collins
Merge bzr.dev
2014
                try:
2255.6.5 by Aaron Bentley
fix revision_tree tests
2015
                    inv = xml7.serializer_v7.read_inventory_from_string(xml)
1908.11.3 by Robert Collins
Merge bzr.dev
2016
                    # dont use the repository revision_tree api because we want
2017
                    # to supply the inventory.
2018
                    if inv.revision_id == revision_id:
1908.11.5 by John Arbash Meinel
[merge] bzr.dev 2240
2019
                        return revisiontree.RevisionTree(self.branch.repository,
1908.11.3 by Robert Collins
Merge bzr.dev
2020
                            inv, revision_id)
2021
                except errors.BadInventoryFormat:
2022
                    pass
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2023
        # raise if there was no inventory, or if we read the wrong inventory.
2024
        raise errors.NoSuchRevisionInTree(self, revision_id)
2025
1658.1.3 by Martin Pool
Doc
2026
    # XXX: This method should be deprecated in favour of taking in a proper
2027
    # new Inventory object.
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2028
    @needs_tree_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2029
    def set_inventory(self, new_inventory_list):
2030
        from bzrlib.inventory import (Inventory,
2031
                                      InventoryDirectory,
2032
                                      InventoryEntry,
2033
                                      InventoryFile,
2034
                                      InventoryLink)
2035
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
2036
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2037
            name = os.path.basename(path)
2038
            if name == "":
2039
                continue
2040
            # fixme, there should be a factory function inv,add_?? 
2041
            if kind == 'directory':
2042
                inv.add(InventoryDirectory(file_id, name, parent))
2043
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
2044
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2045
            elif kind == 'symlink':
2046
                inv.add(InventoryLink(file_id, name, parent))
2047
            else:
2206.1.7 by Marius Kruger
* errors
2048
                raise errors.BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
2049
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2050
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2051
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2052
    def set_root_id(self, file_id):
2053
        """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)
2054
        # for compatability 
2055
        if file_id is None:
2056
            symbol_versioning.warn(symbol_versioning.zero_twelve
2057
                % 'WorkingTree.set_root_id with fileid=None',
2058
                DeprecationWarning,
2059
                stacklevel=3)
2060
            file_id = ROOT_ID
2061
        else:
2062
            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.
2063
        self._set_root_id(file_id)
2064
2065
    def _set_root_id(self, file_id):
2066
        """Set the root id for this tree, in a format specific manner.
2067
2068
        :param file_id: The file id to assign to the root. It must not be 
2069
            present in the current inventory or an error will occur. It must
2070
            not be None, but rather a valid file id.
2071
        """
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
2072
        inv = self._inventory
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2073
        orig_root_id = inv.root.file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2074
        # TODO: it might be nice to exit early if there was nothing
2075
        # to do, saving us from trigger a sync on unlock.
2076
        self._inventory_is_modified = True
2077
        # we preserve the root inventory entry object, but
2078
        # unlinkit from the byid index
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2079
        del inv._byid[inv.root.file_id]
2080
        inv.root.file_id = file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2081
        # and link it into the index with the new changed id.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2082
        inv._byid[inv.root.file_id] = inv.root
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2083
        # and finally update all children to reference the new id.
2084
        # XXX: this should be safe to just look at the root.children
2085
        # list, not the WHOLE INVENTORY.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2086
        for fid in inv:
2087
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2088
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2089
                entry.parent_id = inv.root.file_id
2090
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2091
    def unlock(self):
2092
        """See Branch.unlock.
2093
        
2094
        WorkingTree locking just uses the Branch locking facilities.
2095
        This is current because all working trees have an embedded branch
2096
        within them. IF in the future, we were to make branch data shareable
2097
        between multiple working trees, i.e. via shared storage, then we 
2098
        would probably want to lock both the local tree, and the branch.
2099
        """
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.
2100
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2101
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2102
    def update(self, change_reporter=None, possible_transports=None):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2103
        """Update a working tree along its branch.
2104
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2105
        This will update the branch if its bound too, which means we have
2106
        multiple trees involved:
2107
2108
        - The new basis tree of the master.
2109
        - The old basis tree of the branch.
2110
        - The old basis tree of the working tree.
2111
        - The current working tree state.
2112
2113
        Pathologically, all three may be different, and non-ancestors of each
2114
        other.  Conceptually we want to:
2115
2116
        - Preserve the wt.basis->wt.state changes
2117
        - Transform the wt.basis to the new master basis.
2118
        - Apply a merge of the old branch basis to get any 'local' changes from
2119
          it into the tree.
2120
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2121
2122
        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
2123
        - Merge current state -> basis tree of the master w.r.t. the old tree
2124
          basis.
2125
        - 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.
2126
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2127
        if self.branch.get_master_branch(possible_transports) is not None:
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2128
            self.lock_write()
2129
            update_branch = True
2130
        else:
2131
            self.lock_tree_write()
2132
            update_branch = False
2133
        try:
2134
            if update_branch:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2135
                old_tip = self.branch.update(possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2136
            else:
2137
                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.
2138
            return self._update_tree(old_tip, change_reporter)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2139
        finally:
2140
            self.unlock()
2141
2142
    @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.
2143
    def _update_tree(self, old_tip=None, change_reporter=None):
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2144
        """Update a tree to the master branch.
2145
2146
        :param old_tip: if supplied, the previous tip revision the branch,
2147
            before it was changed to the master branch's tip.
2148
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2149
        # here if old_tip is not None, it is the old tip of the branch before
2150
        # it was updated from the master branch. This should become a pending
2151
        # merge in the working tree to preserve the user existing work.  we
2152
        # cant set that until we update the working trees last revision to be
2153
        # one from the new branch, because it will just get absorbed by the
2154
        # parent de-duplication logic.
2155
        # 
2156
        # We MUST save it even if an error occurs, because otherwise the users
2157
        # local work is unreferenced and will appear to have been lost.
2158
        # 
2159
        result = 0
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2160
        try:
2161
            last_rev = self.get_parent_ids()[0]
2162
        except IndexError:
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
2163
            last_rev = _mod_revision.NULL_REVISION
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2164
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2165
            # merge tree state up to new branch tip.
2166
            basis = self.basis_tree()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
2167
            basis.lock_read()
2168
            try:
2169
                to_tree = self.branch.basis_tree()
2255.6.6 by Aaron Bentley
Fix update to set unique roots, and work with dirstate
2170
                if basis.inventory.root is None:
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
2171
                    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
2172
                    self.flush()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
2173
                result += merge.merge_inner(
2174
                                      self.branch,
2175
                                      to_tree,
2176
                                      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.
2177
                                      this_tree=self,
2178
                                      change_reporter=change_reporter)
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
2179
            finally:
2180
                basis.unlock()
1908.6.6 by Robert Collins
Merge updated set_parents api.
2181
            # TODO - dedup parents list with things merged by pull ?
2182
            # reuse the tree we've updated to to set the basis:
2183
            parent_trees = [(self.branch.last_revision(), to_tree)]
2184
            merges = self.get_parent_ids()[1:]
2185
            # Ideally we ask the tree for the trees here, that way the working
2186
            # tree can decide whether to give us teh entire tree or give us a
2187
            # lazy initialised tree. dirstate for instance will have the trees
2188
            # in ram already, whereas a last-revision + basis-inventory tree
2189
            # will not, but also does not need them when setting parents.
2190
            for parent in merges:
2191
                parent_trees.append(
2192
                    (parent, self.branch.repository.revision_tree(parent)))
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
2193
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
1908.6.6 by Robert Collins
Merge updated set_parents api.
2194
                parent_trees.append(
2195
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2196
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2197
            last_rev = parent_trees[0][0]
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2198
        else:
2199
            # the working tree had the same last-revision as the master
2200
            # branch did. We may still have pivot local work from the local
2201
            # branch into old_tip:
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
2202
            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.
2203
                self.add_parent_tree_id(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)
2205
            and old_tip != last_rev):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2206
            # our last revision was not the prior branch last revision
2207
            # and we have converted that last revision to a pending merge.
2208
            # base is somewhere between the branch tip now
2209
            # and the now pending merge
2255.2.55 by John Arbash Meinel
add extra flush() call to make _update_tree work for dirstate.
2210
2211
            # Since we just modified the working tree and inventory, flush out
2212
            # the current state, before we modify it again.
2213
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2214
            #       requires it only because TreeTransform directly munges the
2215
            #       inventory and calls tree._write_inventory(). Ultimately we
2216
            #       should be able to remove this extra flush.
2217
            self.flush()
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
2218
            graph = self.branch.repository.get_graph()
2219
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2220
                                                old_tip)
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2221
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2222
            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.
2223
            result += merge.merge_inner(
2224
                                  self.branch,
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2225
                                  other_tree,
2226
                                  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.
2227
                                  this_tree=self,
2228
                                  change_reporter=change_reporter)
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2229
        return result
1508.1.24 by Robert Collins
Add update command for use with checkouts.
2230
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2231
    def _write_hashcache_if_dirty(self):
2232
        """Write out the hashcache if it is dirty."""
2233
        if self._hashcache.needs_write:
2234
            try:
2235
                self._hashcache.write()
2236
            except OSError, e:
2237
                if e.errno not in (errno.EPERM, errno.EACCES):
2238
                    raise
2239
                # TODO: jam 20061219 Should this be a warning? A single line
2240
                #       warning might be sufficient to let the user know what
2241
                #       is going on.
2242
                mutter('Could not write hashcache for %s\nError: %s',
2243
                       self._hashcache.cache_file_name(), e)
2244
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2245
    @needs_tree_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
2246
    def _write_inventory(self, inv):
2247
        """Write inventory as the current inventory."""
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2248
        self._set_inventory(inv, dirty=True)
2249
        self.flush()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2250
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2251
    def set_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
2252
        raise errors.UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2253
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2254
    def add_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
2255
        raise errors.UnsupportedOperation(self.add_conflicts, self)
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2256
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2257
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2258
    def conflicts(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2259
        conflicts = _mod_conflicts.ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
2260
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2261
            text = True
2262
            try:
2263
                if file_kind(self.abspath(conflicted)) != "file":
2264
                    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.
2265
            except errors.NoSuchFile:
2266
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2267
            if text is True:
2268
                for suffix in ('.THIS', '.OTHER'):
2269
                    try:
2270
                        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.
2271
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2272
                            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.
2273
                    except errors.NoSuchFile:
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
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2276
                        break
2277
            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.
2278
            conflicts.append(_mod_conflicts.Conflict.factory(ctype,
2279
                             path=conflicted,
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2280
                             file_id=self.path2id(conflicted)))
2281
        return conflicts
2282
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2283
    def walkdirs(self, prefix=""):
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2284
        """Walk the directories of this tree.
2285
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2286
        returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
2287
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2288
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
2289
                   file1_kind), ... ])
2290
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2291
        This API returns a generator, which is only valid during the current
2292
        tree transaction - within a single lock_read or lock_write duration.
2293
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2294
        If the tree is not locked, it may cause an error to be raised,
2295
        depending on the tree implementation.
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2296
        """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2297
        disk_top = self.abspath(prefix)
2298
        if disk_top.endswith('/'):
2299
            disk_top = disk_top[:-1]
2300
        top_strip_len = len(disk_top) + 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2301
        inventory_iterator = self._walkdirs(prefix)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2302
        disk_iterator = osutils.walkdirs(disk_top, prefix)
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2303
        try:
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2304
            current_disk = disk_iterator.next()
2305
            disk_finished = False
2306
        except OSError, e:
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
2307
            if not (e.errno == errno.ENOENT or
2308
                (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2309
                raise
2310
            current_disk = None
2311
            disk_finished = True
2312
        try:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2313
            current_inv = inventory_iterator.next()
2314
            inv_finished = False
2315
        except StopIteration:
2316
            current_inv = None
2317
            inv_finished = True
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2318
        while not inv_finished or not disk_finished:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2319
            if current_disk:
2320
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2321
                    cur_disk_dir_content) = current_disk
2322
            else:
2323
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2324
                    cur_disk_dir_content) = ((None, None), None)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2325
            if not disk_finished:
2326
                # strip out .bzr dirs
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2327
                if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2328
                    len(cur_disk_dir_content) > 0):
2329
                    # osutils.walkdirs can be made nicer -
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2330
                    # yield the path-from-prefix rather than the pathjoined
2331
                    # value.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2332
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2333
                        ('.bzr', '.bzr'))
2334
                    if cur_disk_dir_content[bzrdir_loc][0] == '.bzr':
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2335
                        # we dont yield the contents of, or, .bzr itself.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2336
                        del cur_disk_dir_content[bzrdir_loc]
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2337
            if inv_finished:
2338
                # 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.
2339
                direction = 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2340
            elif disk_finished:
2341
                # 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.
2342
                direction = -1
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2343
            else:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2344
                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.
2345
            if direction > 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2346
                # disk is before inventory - unknown
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2347
                dirblock = [(relpath, basename, kind, stat, None, None) for
2457.2.7 by Marius Kruger
extract method as per review request
2348
                    relpath, basename, kind, stat, top_path in
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2349
                    cur_disk_dir_content]
2350
                yield (cur_disk_dir_relpath, None), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2351
                try:
2352
                    current_disk = disk_iterator.next()
2353
                except StopIteration:
2354
                    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.
2355
            elif direction < 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2356
                # inventory is before disk - missing.
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2357
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2457.2.7 by Marius Kruger
extract method as per review request
2358
                    for relpath, basename, dkind, stat, fileid, kind in
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2359
                    current_inv[1]]
2360
                yield (current_inv[0][0], current_inv[0][1]), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2361
                try:
2362
                    current_inv = inventory_iterator.next()
2363
                except StopIteration:
2364
                    inv_finished = True
2365
            else:
2366
                # versioned present directory
2367
                # merge the inventory and disk data together
2368
                dirblock = []
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2369
                for relpath, subiterator in itertools.groupby(sorted(
2457.2.7 by Marius Kruger
extract method as per review request
2370
                    current_inv[1] + cur_disk_dir_content,
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2371
                    key=operator.itemgetter(0)), operator.itemgetter(1)):
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2372
                    path_elements = list(subiterator)
2373
                    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.
2374
                        inv_row, disk_row = path_elements
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2375
                        # 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.
2376
                        dirblock.append((inv_row[0],
2377
                            inv_row[1], disk_row[2],
2378
                            disk_row[3], inv_row[4],
2379
                            inv_row[5]))
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2380
                    elif len(path_elements[0]) == 5:
2381
                        # unknown disk file
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2382
                        dirblock.append((path_elements[0][0],
2383
                            path_elements[0][1], path_elements[0][2],
2384
                            path_elements[0][3], None, None))
2385
                    elif len(path_elements[0]) == 6:
2386
                        # versioned, absent file.
2387
                        dirblock.append((path_elements[0][0],
2388
                            path_elements[0][1], 'unknown', None,
2389
                            path_elements[0][4], path_elements[0][5]))
2390
                    else:
2391
                        raise NotImplementedError('unreachable code')
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2392
                yield current_inv[0], dirblock
2393
                try:
2394
                    current_inv = inventory_iterator.next()
2395
                except StopIteration:
2396
                    inv_finished = True
2397
                try:
2398
                    current_disk = disk_iterator.next()
2399
                except StopIteration:
2400
                    disk_finished = True
2401
2402
    def _walkdirs(self, prefix=""):
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2403
        """Walk the directories of this tree.
2404
2405
           :prefix: is used as the directrory to start with.
2406
           returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
2407
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2408
                 [(file1_path, file1_name, file1_kind, None, file1_id,
2409
                   file1_kind), ... ])
2410
        """
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2411
        _directory = 'directory'
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2412
        # get the root in the inventory
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2413
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2414
        top_id = inv.path2id(prefix)
2415
        if top_id is None:
2416
            pending = []
2417
        else:
2418
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2419
        while pending:
2420
            dirblock = []
2421
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2422
            # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2423
            top_id = currentdir[4]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2424
            if currentdir[0]:
2425
                relroot = currentdir[0] + '/'
2426
            else:
2427
                relroot = ""
2428
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2429
            entry = inv[top_id]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2430
            for name, child in entry.sorted_children():
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2431
                dirblock.append((relroot + name, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2432
                    child.file_id, child.kind
2433
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2434
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2435
            # push the user specified dirs from dirblock
2436
            for dir in reversed(dirblock):
2437
                if dir[2] == _directory:
2438
                    pending.append(dir)
2439
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
2440
    @needs_tree_write_lock
2441
    def auto_resolve(self):
2442
        """Automatically resolve text conflicts according to contents.
2443
2444
        Only text conflicts are auto_resolvable. Files with no conflict markers
2445
        are considered 'resolved', because bzr always puts conflict markers
2446
        into files that have text conflicts.  The corresponding .THIS .BASE and
2447
        .OTHER files are deleted, as per 'resolve'.
2448
        :return: a tuple of ConflictLists: (un_resolved, resolved).
2449
        """
2450
        un_resolved = _mod_conflicts.ConflictList()
2451
        resolved = _mod_conflicts.ConflictList()
2452
        conflict_re = re.compile('^(<{7}|={7}|>{7})')
2453
        for conflict in self.conflicts():
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
2454
            if (conflict.typestring != 'text conflict' or
2455
                self.kind(conflict.file_id) != 'file'):
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
2456
                un_resolved.append(conflict)
2457
                continue
2458
            my_file = open(self.id2abspath(conflict.file_id), 'rb')
2459
            try:
2460
                for line in my_file:
2461
                    if conflict_re.search(line):
2462
                        un_resolved.append(conflict)
2463
                        break
2464
                else:
2465
                    resolved.append(conflict)
2466
            finally:
2467
                my_file.close()
2468
        resolved.remove_files(self)
2469
        self.set_conflicts(un_resolved)
2470
        return un_resolved, resolved
2471
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2472
    def _validate(self):
2473
        """Validate internal structures.
2474
2475
        This is meant mostly for the test suite. To give it a chance to detect
2476
        corruption after actions have occurred. The default implementation is a
2477
        just a no-op.
2478
2479
        :return: None. An exception should be raised if there is an error.
2480
        """
2481
        return
2482
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2483
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
2484
class WorkingTree2(WorkingTree):
2485
    """This is the Format 2 working tree.
2486
2487
    This was the first weave based working tree. 
2488
     - uses os locks for locking.
2489
     - uses the branch last-revision.
2490
    """
2491
2334.1.4 by John Arbash Meinel
WT2 needs to have an _inventory without a lock.
2492
    def __init__(self, *args, **kwargs):
2493
        super(WorkingTree2, self).__init__(*args, **kwargs)
2494
        # WorkingTree2 has more of a constraint that self._inventory must
2495
        # exist. Because this is an older format, we don't mind the overhead
2496
        # caused by the extra computation here.
2497
2498
        # Newer WorkingTree's should only have self._inventory set when they
2499
        # have a read lock.
2500
        if self._inventory is None:
2501
            self.read_working_inventory()
2502
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
2503
    def lock_tree_write(self):
2504
        """See WorkingTree.lock_tree_write().
2505
2506
        In Format2 WorkingTrees we have a single lock for the branch and tree
2507
        so lock_tree_write() degrades to lock_write().
2508
        """
2509
        self.branch.lock_write()
2510
        try:
2511
            return self._control_files.lock_write()
2512
        except:
2513
            self.branch.unlock()
2514
            raise
2515
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
2516
    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.
2517
        # do non-implementation specific cleanup
2518
        self._cleanup()
2519
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.
2520
        # we share control files:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2521
        if self._control_files._lock_count == 3:
2522
            # _inventory_is_modified is always False during a read lock.
2523
            if self._inventory_is_modified:
2524
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2525
            self._write_hashcache_if_dirty()
2526
                    
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.
2527
        # reverse order of locking.
2528
        try:
2529
            return self._control_files.unlock()
2530
        finally:
2531
            self.branch.unlock()
2532
2533
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2534
class WorkingTree3(WorkingTree):
2535
    """This is the Format 3 working tree.
2536
2537
    This differs from the base WorkingTree by:
2538
     - having its own file lock
2539
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2540
2541
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2542
    """
2543
2544
    @needs_read_lock
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2545
    def _last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
2546
        """See Mutable.last_revision."""
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2547
        try:
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
2548
            return self._control_files.get('last-revision').read()
2206.1.7 by Marius Kruger
* errors
2549
        except errors.NoSuchFile:
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
2550
            return _mod_revision.NULL_REVISION
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2551
2552
    def _change_last_revision(self, revision_id):
2553
        """See WorkingTree._change_last_revision."""
2554
        if revision_id is None or revision_id == NULL_REVISION:
2555
            try:
2556
                self._control_files._transport.delete('last-revision')
2557
            except errors.NoSuchFile:
2558
                pass
2559
            return False
2560
        else:
2294.1.1 by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic.
2561
            self._control_files.put_bytes('last-revision', revision_id)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2562
            return True
2563
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2564
    @needs_tree_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2565
    def set_conflicts(self, conflicts):
2566
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
2567
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2568
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2569
    @needs_tree_write_lock
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2570
    def add_conflicts(self, new_conflicts):
2571
        conflict_set = set(self.conflicts())
2572
        conflict_set.update(set(list(new_conflicts)))
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2573
        self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
2574
                                       key=_mod_conflicts.Conflict.sort_key)))
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2575
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2576
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2577
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2578
        try:
2579
            confile = self._control_files.get('conflicts')
2206.1.7 by Marius Kruger
* errors
2580
        except errors.NoSuchFile:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2581
            return _mod_conflicts.ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2582
        try:
2583
            if confile.next() != CONFLICT_HEADER_1 + '\n':
2206.1.7 by Marius Kruger
* errors
2584
                raise errors.ConflictFormatError()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2585
        except StopIteration:
2206.1.7 by Marius Kruger
* errors
2586
            raise errors.ConflictFormatError()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2587
        return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2588
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.
2589
    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.
2590
        # do non-implementation specific cleanup
2591
        self._cleanup()
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2592
        if self._control_files._lock_count == 1:
2593
            # _inventory_is_modified is always False during a read lock.
2594
            if self._inventory_is_modified:
2595
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2596
            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.
2597
        # reverse order of locking.
2598
        try:
2599
            return self._control_files.unlock()
2600
        finally:
2601
            self.branch.unlock()
2602
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2603
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2604
def get_conflicted_stem(path):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2605
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2606
        if path.endswith(suffix):
2607
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2608
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.
2609
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
2610
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2611
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
2612
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2613
    ## FIXME: better check
2614
    filename = normpath(filename)
2615
    while filename != '':
2616
        head, tail = os.path.split(filename)
2617
        ## 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.
2618
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2619
            return True
2620
        if filename == head:
2621
            break
2622
        filename = head
2623
    return False
2624
2625
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2626
class WorkingTreeFormat(object):
2627
    """An encapsulation of the initialization and open routines for a format.
2628
2629
    Formats provide three things:
2630
     * An initialization routine,
2631
     * a format string,
2632
     * an open routine.
2633
2634
    Formats are placed in an dict by their format string for reference 
2635
    during workingtree opening. Its not required that these be instances, they
2636
    can be classes themselves with class methods - it simply depends on 
2637
    whether state is needed for a given format or not.
2638
2639
    Once a format is deprecated, just deprecate the initialize and open
2640
    methods on the format class. Do not deprecate the object, as the 
2641
    object will be created every time regardless.
2642
    """
2643
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2644
    _default_format = None
2645
    """The default format used for new trees."""
2646
2647
    _formats = {}
2648
    """The known formats."""
2649
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
2650
    requires_rich_root = False
2651
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2652
    upgrade_recommended = False
2653
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2654
    @classmethod
2655
    def find_format(klass, a_bzrdir):
2656
        """Return the format for the working tree object in a_bzrdir."""
2657
        try:
2658
            transport = a_bzrdir.get_workingtree_transport(None)
2659
            format_string = transport.get("format").read()
2660
            return klass._formats[format_string]
2206.1.7 by Marius Kruger
* errors
2661
        except errors.NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2662
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2663
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
2664
            raise errors.UnknownFormatError(format=format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2665
2100.3.35 by Aaron Bentley
equality operations on bzrdir
2666
    def __eq__(self, other):
2667
        return self.__class__ is other.__class__
2668
2669
    def __ne__(self, other):
2670
        return not (self == other)
2671
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2672
    @classmethod
2673
    def get_default_format(klass):
2674
        """Return the current default format."""
2675
        return klass._default_format
2676
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2677
    def get_format_string(self):
2678
        """Return the ASCII format string that identifies this format."""
2679
        raise NotImplementedError(self.get_format_string)
2680
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2681
    def get_format_description(self):
2682
        """Return the short description for this format."""
2683
        raise NotImplementedError(self.get_format_description)
2684
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2685
    def is_supported(self):
2686
        """Is this format supported?
2687
2688
        Supported formats can be initialized and opened.
2689
        Unsupported formats may not support initialization or committing or 
2690
        some other features depending on the reason for not being supported.
2691
        """
2692
        return True
2693
2694
    @classmethod
2695
    def register_format(klass, format):
2696
        klass._formats[format.get_format_string()] = format
2697
2698
    @classmethod
2699
    def set_default_format(klass, format):
2700
        klass._default_format = format
2701
2702
    @classmethod
2703
    def unregister_format(klass, format):
2704
        assert klass._formats[format.get_format_string()] is format
2705
        del klass._formats[format.get_format_string()]
2706
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2707
2708
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2709
    """The second working tree format. 
2710
2711
    This format modified the hash cache from the format 1 hash cache.
2712
    """
2713
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2714
    upgrade_recommended = True
2715
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2716
    def get_format_description(self):
2717
        """See WorkingTreeFormat.get_format_description()."""
2718
        return "Working tree format 2"
2719
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
2720
    def stub_initialize_remote(self, control_files):
2721
        """As a special workaround create critical control files for a remote working tree
2722
        
2723
        This ensures that it can later be updated and dealt with locally,
2724
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
2725
        no working tree.  (See bug #43064).
2726
        """
2727
        sio = StringIO()
2728
        inv = Inventory()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2729
        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)
2730
        sio.seek(0)
2731
        control_files.put('inventory', sio)
2732
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
2733
        control_files.put_bytes('pending-merges', '')
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
2734
        
2735
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
2736
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2737
        """See WorkingTreeFormat.initialize()."""
2738
        if not isinstance(a_bzrdir.transport, LocalTransport):
2739
            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.
2740
        if from_branch is not None:
2741
            branch = from_branch
2742
        else:
2743
            branch = a_bzrdir.open_branch()
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2744
        if revision_id is None:
2745
            revision_id = _mod_revision.ensure_null(branch.last_revision())
2746
        branch.lock_write()
2747
        try:
2748
            branch.generate_revision_history(revision_id)
2749
        finally:
2750
            branch.unlock()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2751
        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.
2752
        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.
2753
                         branch,
2754
                         inv,
2755
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2756
                         _format=self,
2757
                         _bzrdir=a_bzrdir)
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2758
        basis_tree = branch.repository.revision_tree(revision_id)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2759
        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('')
2760
            wt.set_root_id(basis_tree.get_root_id())
1986.5.8 by Robert Collins
Merge bzr.dev.
2761
        # 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
2762
        if _mod_revision.is_null(revision_id):
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
2763
            parent_trees = []
2764
        else:
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2765
            parent_trees = [(revision_id, basis_tree)]
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
2766
        wt.set_parent_trees(parent_trees)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2767
        transform.build_tree(basis_tree, wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2768
        return wt
2769
2770
    def __init__(self):
2771
        super(WorkingTreeFormat2, self).__init__()
2772
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2773
2774
    def open(self, a_bzrdir, _found=False):
2775
        """Return the WorkingTree object for a_bzrdir
2776
2777
        _found is a private parameter, do not use it. It is used to indicate
2778
               if format probing has already been done.
2779
        """
2780
        if not _found:
2781
            # we are being called directly and must probe.
2782
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2783
        if not isinstance(a_bzrdir.transport, LocalTransport):
2784
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2785
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2786
                           _internal=True,
2787
                           _format=self,
2788
                           _bzrdir=a_bzrdir)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2789
        return wt
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2790
2791
class WorkingTreeFormat3(WorkingTreeFormat):
2792
    """The second working tree format updated to record a format marker.
2793
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2794
    This format:
2795
        - exists within a metadir controlling .bzr
2796
        - includes an explicit version marker for the workingtree control
2797
          files, separate from the BzrDir format
2798
        - modifies the hash cache format
2799
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2800
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2801
    """
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2802
    
2803
    upgrade_recommended = True
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2804
2805
    def get_format_string(self):
2806
        """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
2807
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2808
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2809
    def get_format_description(self):
2810
        """See WorkingTreeFormat.get_format_description()."""
2811
        return "Working tree format 3"
2812
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2813
    _lock_file_name = 'lock'
2814
    _lock_class = LockDir
2815
2100.3.3 by Aaron Bentley
Start of work on format 4 trees
2816
    _tree_class = WorkingTree3
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2817
2100.3.15 by Aaron Bentley
get test suite passing
2818
    def __get_matchingbzrdir(self):
2819
        return bzrdir.BzrDirMetaFormat1()
2820
2821
    _matchingbzrdir = property(__get_matchingbzrdir)
2822
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2823
    def _open_control_files(self, a_bzrdir):
2824
        transport = a_bzrdir.get_workingtree_transport(None)
2825
        return LockableFiles(transport, self._lock_file_name, 
2826
                             self._lock_class)
2827
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
2828
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2829
        """See WorkingTreeFormat.initialize().
2830
        
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2831
        revision_id allows creating a working tree at a different
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2832
        revision than the branch is at.
2833
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2834
        if not isinstance(a_bzrdir.transport, LocalTransport):
2835
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2836
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2837
        control_files = self._open_control_files(a_bzrdir)
2838
        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.
2839
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2840
        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.
2841
        if from_branch is not None:
2842
            branch = from_branch
2843
        else:
2844
            branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2845
        if revision_id is None:
2598.5.7 by Aaron Bentley
Updates from review
2846
            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
2847
        # WorkingTree3 can handle an inventory which has a unique root id.
2848
        # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2849
        # those trees. And because there isn't a format bump inbetween, we
2850
        # are maintaining compatibility with older clients.
2851
        # inv = Inventory(root_id=gen_root_id())
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
2852
        inv = self._initial_inventory()
2100.3.8 by Aaron Bentley
Add add_reference
2853
        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.
2854
                         branch,
2855
                         inv,
2856
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2857
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2858
                         _bzrdir=a_bzrdir,
2859
                         _control_files=control_files)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
2860
        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.
2861
        try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2862
            basis_tree = branch.repository.revision_tree(revision_id)
1986.5.8 by Robert Collins
Merge bzr.dev.
2863
            # only set an explicit root id if there is one to set.
2864
            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('')
2865
                wt.set_root_id(basis_tree.get_root_id())
2598.5.7 by Aaron Bentley
Updates from review
2866
            if revision_id == NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
2867
                wt.set_parent_trees([])
2868
            else:
2869
                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.
2870
            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.
2871
        finally:
1986.5.7 by Robert Collins
Merge reviews.
2872
            # 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)
2873
            # WorkingTree is given a chance to fire.
2874
            control_files.unlock()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
2875
            wt.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2876
        return wt
2877
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
2878
    def _initial_inventory(self):
2879
        return Inventory()
2880
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2881
    def __init__(self):
2882
        super(WorkingTreeFormat3, self).__init__()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2883
2884
    def open(self, a_bzrdir, _found=False):
2885
        """Return the WorkingTree object for a_bzrdir
2886
2887
        _found is a private parameter, do not use it. It is used to indicate
2888
               if format probing has already been done.
2889
        """
2890
        if not _found:
2891
            # we are being called directly and must probe.
2892
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2893
        if not isinstance(a_bzrdir.transport, LocalTransport):
2894
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2895
        wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2896
        return wt
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2897
2898
    def _open(self, a_bzrdir, control_files):
2899
        """Open the tree itself.
2900
        
2901
        :param a_bzrdir: the dir for the tree.
2902
        :param control_files: the control files for the tree.
2903
        """
2100.3.3 by Aaron Bentley
Start of work on format 4 trees
2904
        return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
2905
                                _internal=True,
2906
                                _format=self,
2907
                                _bzrdir=a_bzrdir,
2908
                                _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2909
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
2910
    def __str__(self):
2911
        return self.get_format_string()
2912
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2913
2255.2.173 by Martin Pool
Set default wt to 4, as in dirstate branch
2914
__default_format = WorkingTreeFormat4()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2915
WorkingTreeFormat.register_format(__default_format)
2255.2.173 by Martin Pool
Set default wt to 4, as in dirstate branch
2916
WorkingTreeFormat.register_format(WorkingTreeFormat3())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2917
WorkingTreeFormat.set_default_format(__default_format)
1852.13.2 by Robert Collins
Introduce a WorkingTree Format 4, which is the new dirstate format.
2918
# formats which have no format string are not discoverable
2919
# and not independently creatable, so are not registered.
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2920
_legacy_formats = [WorkingTreeFormat2(),
2921
                   ]