/brz/remove-bazaar

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