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