/brz/remove-bazaar

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