← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2010-02-27 01:34:49 UTC
  • mto: This revision was merged to the branch mainline in revision 5064.
  • Revision ID: mbp@canonical.com-20100227013449-zxostilwfoendxfv
Handle "Directory not empty" from ftp as DirectoryNotEmpty.

FtpTransport._translate_ftp_error can handle all ftp errors; there's no clear
distinction between 'temporary' and 'permament'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
65
65
    merge,
66
66
    revision as _mod_revision,
67
67
    revisiontree,
68
 
    textui,
69
68
    trace,
70
69
    transform,
71
70
    ui,
102
101
from bzrlib.filters import filtered_input_file
103
102
from bzrlib.trace import mutter, note
104
103
from bzrlib.transport.local import LocalTransport
105
 
from bzrlib.progress import DummyProgress, ProgressPhase
 
104
from bzrlib.progress import ProgressPhase
106
105
from bzrlib.revision import CURRENT_REVISION
107
106
from bzrlib.rio import RioReader, rio_file, Stanza
108
107
from bzrlib.symbol_versioning import (
112
111
 
113
112
 
114
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
 
114
# TODO: Modifying the conflict objects or their type is currently nearly
 
115
# impossible as there is no clear relationship between the working tree format
 
116
# and the conflict list file format.
115
117
CONFLICT_HEADER_1 = "BZR conflict list format 1"
116
118
 
117
119
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
281
283
        self._control_files.break_lock()
282
284
        self.branch.break_lock()
283
285
 
 
286
    def _get_check_refs(self):
 
287
        """Return the references needed to perform a check of this tree.
 
288
        
 
289
        The default implementation returns no refs, and is only suitable for
 
290
        trees that have no local caching and can commit on ghosts at any time.
 
291
 
 
292
        :seealso: bzrlib.check for details about check_refs.
 
293
        """
 
294
        return []
 
295
 
284
296
    def requires_rich_root(self):
285
297
        return self._format.requires_rich_root
286
298
 
534
546
        else:
535
547
            parents = [last_rev]
536
548
        try:
537
 
            merges_file = self._transport.get('pending-merges')
 
549
            merges_bytes = self._transport.get_bytes('pending-merges')
538
550
        except errors.NoSuchFile:
539
551
            pass
540
552
        else:
541
 
            for l in merges_file.readlines():
 
553
            for l in osutils.split_lines(merges_bytes):
542
554
                revision_id = l.rstrip('\n')
543
555
                parents.append(revision_id)
544
556
        return parents
603
615
 
604
616
    def get_file_size(self, file_id):
605
617
        """See Tree.get_file_size"""
 
618
        # XXX: this returns the on-disk size; it should probably return the
 
619
        # canonical size
606
620
        try:
607
621
            return os.path.getsize(self.id2abspath(file_id))
608
622
        except OSError, e:
624
638
 
625
639
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
626
640
        file_id = self.path2id(path)
 
641
        if file_id is None:
 
642
            # For unversioned files on win32, we just assume they are not
 
643
            # executable
 
644
            return False
627
645
        return self._inventory[file_id].executable
628
646
 
629
647
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
739
757
            raise
740
758
        kind = _mapper(stat_result.st_mode)
741
759
        if kind == 'file':
742
 
            size = stat_result.st_size
743
 
            # try for a stat cache lookup
744
 
            executable = self._is_executable_from_path_and_stat(path, stat_result)
745
 
            return (kind, size, executable, self._sha_from_stat(
746
 
                path, stat_result))
 
760
            return self._file_content_summary(path, stat_result)
747
761
        elif kind == 'directory':
748
762
            # perhaps it looks like a plain directory, but it's really a
749
763
            # reference.
756
770
        else:
757
771
            return (kind, None, None, None)
758
772
 
 
773
    def _file_content_summary(self, path, stat_result):
 
774
        size = stat_result.st_size
 
775
        executable = self._is_executable_from_path_and_stat(path, stat_result)
 
776
        # try for a stat cache lookup
 
777
        return ('file', size, executable, self._sha_from_stat(
 
778
            path, stat_result))
 
779
 
759
780
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
760
781
        """Common ghost checking functionality from set_parent_*.
761
782
 
881
902
 
882
903
    @needs_write_lock # because merge pulls data into the branch.
883
904
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
884
 
        merge_type=None):
 
905
                          merge_type=None, force=False):
885
906
        """Merge from a branch into this working tree.
886
907
 
887
908
        :param branch: The branch to merge from.
891
912
            branch.last_revision().
892
913
        """
893
914
        from bzrlib.merge import Merger, Merge3Merger
894
 
        pb = ui.ui_factory.nested_progress_bar()
895
 
        try:
896
 
            merger = Merger(self.branch, this_tree=self, pb=pb)
897
 
            merger.pp = ProgressPhase("Merge phase", 5, pb)
898
 
            merger.pp.next_phase()
899
 
            # check that there are no
900
 
            # local alterations
901
 
            merger.check_basis(check_clean=True, require_commits=False)
902
 
            if to_revision is None:
903
 
                to_revision = _mod_revision.ensure_null(branch.last_revision())
904
 
            merger.other_rev_id = to_revision
905
 
            if _mod_revision.is_null(merger.other_rev_id):
906
 
                raise errors.NoCommits(branch)
907
 
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
908
 
            merger.other_basis = merger.other_rev_id
909
 
            merger.other_tree = self.branch.repository.revision_tree(
910
 
                merger.other_rev_id)
911
 
            merger.other_branch = branch
912
 
            merger.pp.next_phase()
913
 
            if from_revision is None:
914
 
                merger.find_base()
915
 
            else:
916
 
                merger.set_base_revision(from_revision, branch)
917
 
            if merger.base_rev_id == merger.other_rev_id:
918
 
                raise errors.PointlessMerge
919
 
            merger.backup_files = False
920
 
            if merge_type is None:
921
 
                merger.merge_type = Merge3Merger
922
 
            else:
923
 
                merger.merge_type = merge_type
924
 
            merger.set_interesting_files(None)
925
 
            merger.show_base = False
926
 
            merger.reprocess = False
927
 
            conflicts = merger.do_merge()
928
 
            merger.set_pending()
929
 
        finally:
930
 
            pb.finished()
 
915
        merger = Merger(self.branch, this_tree=self)
 
916
        # check that there are no local alterations
 
917
        if not force and self.has_changes():
 
918
            raise errors.UncommittedChanges(self)
 
919
        if to_revision is None:
 
920
            to_revision = _mod_revision.ensure_null(branch.last_revision())
 
921
        merger.other_rev_id = to_revision
 
922
        if _mod_revision.is_null(merger.other_rev_id):
 
923
            raise errors.NoCommits(branch)
 
924
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
925
        merger.other_basis = merger.other_rev_id
 
926
        merger.other_tree = self.branch.repository.revision_tree(
 
927
            merger.other_rev_id)
 
928
        merger.other_branch = branch
 
929
        if from_revision is None:
 
930
            merger.find_base()
 
931
        else:
 
932
            merger.set_base_revision(from_revision, branch)
 
933
        if merger.base_rev_id == merger.other_rev_id:
 
934
            raise errors.PointlessMerge
 
935
        merger.backup_files = False
 
936
        if merge_type is None:
 
937
            merger.merge_type = Merge3Merger
 
938
        else:
 
939
            merger.merge_type = merge_type
 
940
        merger.set_interesting_files(None)
 
941
        merger.show_base = False
 
942
        merger.reprocess = False
 
943
        conflicts = merger.do_merge()
 
944
        merger.set_pending()
931
945
        return conflicts
932
946
 
933
947
    @needs_read_lock
1476
1490
        from_tail = splitpath(from_rel)[-1]
1477
1491
        from_id = inv.path2id(from_rel)
1478
1492
        if from_id is None:
1479
 
            raise errors.BzrRenameFailedError(from_rel,to_rel,
1480
 
                errors.NotVersionedError(path=str(from_rel)))
1481
 
        from_entry = inv[from_id]
 
1493
            # if file is missing in the inventory maybe it's in the basis_tree
 
1494
            basis_tree = self.branch.basis_tree()
 
1495
            from_id = basis_tree.path2id(from_rel)
 
1496
            if from_id is None:
 
1497
                raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1498
                    errors.NotVersionedError(path=str(from_rel)))
 
1499
            # put entry back in the inventory so we can rename it
 
1500
            from_entry = basis_tree.inventory[from_id].copy()
 
1501
            inv.add(from_entry)
 
1502
        else:
 
1503
            from_entry = inv[from_id]
1482
1504
        from_parent_id = from_entry.parent_id
1483
1505
        to_dir, to_tail = os.path.split(to_rel)
1484
1506
        to_dir_id = inv.path2id(to_dir)
1576
1598
    @needs_write_lock
1577
1599
    def pull(self, source, overwrite=False, stop_revision=None,
1578
1600
             change_reporter=None, possible_transports=None, local=False):
1579
 
        top_pb = ui.ui_factory.nested_progress_bar()
1580
1601
        source.lock_read()
1581
1602
        try:
1582
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1583
 
            pp.next_phase()
1584
1603
            old_revision_info = self.branch.last_revision_info()
1585
1604
            basis_tree = self.basis_tree()
1586
1605
            count = self.branch.pull(source, overwrite, stop_revision,
1588
1607
                                     local=local)
1589
1608
            new_revision_info = self.branch.last_revision_info()
1590
1609
            if new_revision_info != old_revision_info:
1591
 
                pp.next_phase()
1592
1610
                repository = self.branch.repository
1593
 
                pb = ui.ui_factory.nested_progress_bar()
1594
1611
                basis_tree.lock_read()
1595
1612
                try:
1596
1613
                    new_basis_tree = self.branch.basis_tree()
1599
1616
                                new_basis_tree,
1600
1617
                                basis_tree,
1601
1618
                                this_tree=self,
1602
 
                                pb=pb,
 
1619
                                pb=None,
1603
1620
                                change_reporter=change_reporter)
1604
 
                    if (basis_tree.inventory.root is None and
1605
 
                        new_basis_tree.inventory.root is not None):
1606
 
                        self.set_root_id(new_basis_tree.get_root_id())
 
1621
                    basis_root_id = basis_tree.get_root_id()
 
1622
                    new_root_id = new_basis_tree.get_root_id()
 
1623
                    if basis_root_id != new_root_id:
 
1624
                        self.set_root_id(new_root_id)
1607
1625
                finally:
1608
 
                    pb.finished()
1609
1626
                    basis_tree.unlock()
1610
1627
                # TODO - dedup parents list with things merged by pull ?
1611
1628
                # reuse the revisiontree we merged against to set the new
1624
1641
            return count
1625
1642
        finally:
1626
1643
            source.unlock()
1627
 
            top_pb.finished()
1628
1644
 
1629
1645
    @needs_write_lock
1630
1646
    def put_file_bytes_non_atomic(self, file_id, bytes):
1715
1731
        r"""Check whether the filename matches an ignore pattern.
1716
1732
 
1717
1733
        Patterns containing '/' or '\' need to match the whole path;
1718
 
        others match against only the last component.
 
1734
        others match against only the last component.  Patterns starting
 
1735
        with '!' are ignore exceptions.  Exceptions take precedence
 
1736
        over regular patterns and cause the filename to not be ignored.
1719
1737
 
1720
1738
        If the file is ignored, returns the pattern which caused it to
1721
1739
        be ignored, otherwise None.  So this can simply be used as a
1722
1740
        boolean if desired."""
1723
1741
        if getattr(self, '_ignoreglobster', None) is None:
1724
 
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
 
1742
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1725
1743
        return self._ignoreglobster.match(filename)
1726
1744
 
1727
1745
    def kind(self, file_id):
1818
1836
    def _reset_data(self):
1819
1837
        """Reset transient data that cannot be revalidated."""
1820
1838
        self._inventory_is_modified = False
1821
 
        result = self._deserialize(self._transport.get('inventory'))
 
1839
        f = self._transport.get('inventory')
 
1840
        try:
 
1841
            result = self._deserialize(f)
 
1842
        finally:
 
1843
            f.close()
1822
1844
        self._set_inventory(result, dirty=False)
1823
1845
 
1824
1846
    @needs_tree_write_lock
1871
1893
            # revision_id is set. We must check for this full string, because a
1872
1894
            # root node id can legitimately look like 'revision_id' but cannot
1873
1895
            # contain a '"'.
1874
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1896
            xml = self.branch.repository._get_inventory_xml(new_revision)
1875
1897
            firstline = xml.split('\n', 1)[0]
1876
1898
            if (not 'revision_id="' in firstline or
1877
1899
                'format="7"' not in firstline):
1878
 
                inv = self.branch.repository.deserialise_inventory(
1879
 
                    new_revision, xml)
 
1900
                inv = self.branch.repository._serializer.read_inventory_from_string(
 
1901
                    xml, new_revision)
1880
1902
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1881
1903
            self._write_basis_inventory(xml)
1882
1904
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1900
1922
        # binary.
1901
1923
        if self._inventory_is_modified:
1902
1924
            raise errors.InventoryModified(self)
1903
 
        result = self._deserialize(self._transport.get('inventory'))
 
1925
        f = self._transport.get('inventory')
 
1926
        try:
 
1927
            result = self._deserialize(f)
 
1928
        finally:
 
1929
            f.close()
1904
1930
        self._set_inventory(result, dirty=False)
1905
1931
        return result
1906
1932
 
1921
1947
 
1922
1948
        new_files=set()
1923
1949
        unknown_nested_files=set()
 
1950
        if to_file is None:
 
1951
            to_file = sys.stdout
1924
1952
 
1925
1953
        def recurse_directory_to_add_files(directory):
1926
1954
            # Recurse directory and add all files
1996
2024
                        new_status = 'I'
1997
2025
                    else:
1998
2026
                        new_status = '?'
1999
 
                    textui.show_status(new_status, self.kind(fid), f,
2000
 
                                       to_file=to_file)
 
2027
                    # XXX: Really should be a more abstract reporter interface
 
2028
                    kind_ch = osutils.kind_marker(self.kind(fid))
 
2029
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
2001
2030
                # Unversion file
2002
2031
                inv_delta.append((f, None, fid, None))
2003
2032
                message = "removed %s" % (f,)
2026
2055
 
2027
2056
    @needs_tree_write_lock
2028
2057
    def revert(self, filenames=None, old_tree=None, backups=True,
2029
 
               pb=DummyProgress(), report_changes=False):
 
2058
               pb=None, report_changes=False):
2030
2059
        from bzrlib.conflicts import resolve
2031
2060
        if filenames == []:
2032
2061
            filenames = None
2154
2183
        """
2155
2184
        raise NotImplementedError(self.unlock)
2156
2185
 
2157
 
    def update(self, change_reporter=None, possible_transports=None):
 
2186
    _marker = object()
 
2187
 
 
2188
    def update(self, change_reporter=None, possible_transports=None,
 
2189
               revision=None, old_tip=_marker):
2158
2190
        """Update a working tree along its branch.
2159
2191
 
2160
2192
        This will update the branch if its bound too, which means we have
2178
2210
        - Merge current state -> basis tree of the master w.r.t. the old tree
2179
2211
          basis.
2180
2212
        - Do a 'normal' merge of the old branch basis if it is relevant.
 
2213
 
 
2214
        :param revision: The target revision to update to. Must be in the
 
2215
            revision history.
 
2216
        :param old_tip: If branch.update() has already been run, the value it
 
2217
            returned (old tip of the branch or None). _marker is used
 
2218
            otherwise.
2181
2219
        """
2182
2220
        if self.branch.get_bound_location() is not None:
2183
2221
            self.lock_write()
2184
 
            update_branch = True
 
2222
            update_branch = (old_tip is self._marker)
2185
2223
        else:
2186
2224
            self.lock_tree_write()
2187
2225
            update_branch = False
2189
2227
            if update_branch:
2190
2228
                old_tip = self.branch.update(possible_transports)
2191
2229
            else:
2192
 
                old_tip = None
2193
 
            return self._update_tree(old_tip, change_reporter)
 
2230
                if old_tip is self._marker:
 
2231
                    old_tip = None
 
2232
            return self._update_tree(old_tip, change_reporter, revision)
2194
2233
        finally:
2195
2234
            self.unlock()
2196
2235
 
2197
2236
    @needs_tree_write_lock
2198
 
    def _update_tree(self, old_tip=None, change_reporter=None):
 
2237
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2199
2238
        """Update a tree to the master branch.
2200
2239
 
2201
2240
        :param old_tip: if supplied, the previous tip revision the branch,
2211
2250
        # We MUST save it even if an error occurs, because otherwise the users
2212
2251
        # local work is unreferenced and will appear to have been lost.
2213
2252
        #
2214
 
        result = 0
 
2253
        nb_conflicts = 0
2215
2254
        try:
2216
2255
            last_rev = self.get_parent_ids()[0]
2217
2256
        except IndexError:
2218
2257
            last_rev = _mod_revision.NULL_REVISION
2219
 
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2220
 
            # merge tree state up to new branch tip.
 
2258
        if revision is None:
 
2259
            revision = self.branch.last_revision()
 
2260
        else:
 
2261
            if revision not in self.branch.revision_history():
 
2262
                raise errors.NoSuchRevision(self.branch, revision)
 
2263
 
 
2264
        old_tip = old_tip or _mod_revision.NULL_REVISION
 
2265
 
 
2266
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
 
2267
            # the branch we are bound to was updated
 
2268
            # merge those changes in first
 
2269
            base_tree  = self.basis_tree()
 
2270
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2271
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
 
2272
                                             base_tree, this_tree=self,
 
2273
                                             change_reporter=change_reporter)
 
2274
            if nb_conflicts:
 
2275
                self.add_parent_tree((old_tip, other_tree))
 
2276
                trace.note('Rerun update after fixing the conflicts.')
 
2277
                return nb_conflicts
 
2278
 
 
2279
        if last_rev != _mod_revision.ensure_null(revision):
 
2280
            # the working tree is up to date with the branch
 
2281
            # we can merge the specified revision from master
 
2282
            to_tree = self.branch.repository.revision_tree(revision)
 
2283
            to_root_id = to_tree.get_root_id()
 
2284
 
2221
2285
            basis = self.basis_tree()
2222
2286
            basis.lock_read()
2223
2287
            try:
2224
 
                to_tree = self.branch.basis_tree()
2225
 
                if basis.inventory.root is None:
2226
 
                    self.set_root_id(to_tree.get_root_id())
 
2288
                if (basis.inventory.root is None
 
2289
                    or basis.inventory.root.file_id != to_root_id):
 
2290
                    self.set_root_id(to_root_id)
2227
2291
                    self.flush()
2228
 
                result += merge.merge_inner(
2229
 
                                      self.branch,
2230
 
                                      to_tree,
2231
 
                                      basis,
2232
 
                                      this_tree=self,
2233
 
                                      change_reporter=change_reporter)
2234
2292
            finally:
2235
2293
                basis.unlock()
 
2294
 
 
2295
            # determine the branch point
 
2296
            graph = self.branch.repository.get_graph()
 
2297
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2298
                                                last_rev)
 
2299
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2300
 
 
2301
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
 
2302
                                             this_tree=self,
 
2303
                                             change_reporter=change_reporter)
 
2304
            self.set_last_revision(revision)
2236
2305
            # TODO - dedup parents list with things merged by pull ?
2237
2306
            # reuse the tree we've updated to to set the basis:
2238
 
            parent_trees = [(self.branch.last_revision(), to_tree)]
 
2307
            parent_trees = [(revision, to_tree)]
2239
2308
            merges = self.get_parent_ids()[1:]
2240
2309
            # Ideally we ask the tree for the trees here, that way the working
2241
2310
            # tree can decide whether to give us the entire tree or give us a
2245
2314
            for parent in merges:
2246
2315
                parent_trees.append(
2247
2316
                    (parent, self.branch.repository.revision_tree(parent)))
2248
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2317
            if not _mod_revision.is_null(old_tip):
2249
2318
                parent_trees.append(
2250
2319
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2251
2320
            self.set_parent_trees(parent_trees)
2252
2321
            last_rev = parent_trees[0][0]
2253
 
        else:
2254
 
            # the working tree had the same last-revision as the master
2255
 
            # branch did. We may still have pivot local work from the local
2256
 
            # branch into old_tip:
2257
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2258
 
                self.add_parent_tree_id(old_tip)
2259
 
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
2260
 
            and old_tip != last_rev):
2261
 
            # our last revision was not the prior branch last revision
2262
 
            # and we have converted that last revision to a pending merge.
2263
 
            # base is somewhere between the branch tip now
2264
 
            # and the now pending merge
2265
 
 
2266
 
            # Since we just modified the working tree and inventory, flush out
2267
 
            # the current state, before we modify it again.
2268
 
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2269
 
            #       requires it only because TreeTransform directly munges the
2270
 
            #       inventory and calls tree._write_inventory(). Ultimately we
2271
 
            #       should be able to remove this extra flush.
2272
 
            self.flush()
2273
 
            graph = self.branch.repository.get_graph()
2274
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2275
 
                                                old_tip)
2276
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2277
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2278
 
            result += merge.merge_inner(
2279
 
                                  self.branch,
2280
 
                                  other_tree,
2281
 
                                  base_tree,
2282
 
                                  this_tree=self,
2283
 
                                  change_reporter=change_reporter)
2284
 
        return result
 
2322
        return nb_conflicts
2285
2323
 
2286
2324
    def _write_hashcache_if_dirty(self):
2287
2325
        """Write out the hashcache if it is dirty."""
2528
2566
        return un_resolved, resolved
2529
2567
 
2530
2568
    @needs_read_lock
2531
 
    def _check(self):
 
2569
    def _check(self, references):
 
2570
        """Check the tree for consistency.
 
2571
 
 
2572
        :param references: A dict with keys matching the items returned by
 
2573
            self._get_check_refs(), and values from looking those keys up in
 
2574
            the repository.
 
2575
        """
2532
2576
        tree_basis = self.basis_tree()
2533
2577
        tree_basis.lock_read()
2534
2578
        try:
2535
 
            repo_basis = self.branch.repository.revision_tree(
2536
 
                self.last_revision())
 
2579
            repo_basis = references[('trees', self.last_revision())]
2537
2580
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2538
2581
                raise errors.BzrCheckError(
2539
2582
                    "Mismatched basis inventory content.")
2552
2595
        """
2553
2596
        return
2554
2597
 
2555
 
    @needs_read_lock
2556
2598
    def _get_rules_searcher(self, default_searcher):
2557
2599
        """See Tree._get_rules_searcher."""
2558
2600
        if self._rules_searcher is None:
2585
2627
        if self._inventory is None:
2586
2628
            self.read_working_inventory()
2587
2629
 
 
2630
    def _get_check_refs(self):
 
2631
        """Return the references needed to perform a check of this tree."""
 
2632
        return [('trees', self.last_revision())]
 
2633
 
2588
2634
    def lock_tree_write(self):
2589
2635
        """See WorkingTree.lock_tree_write().
2590
2636
 
2647
2693
                mode=self.bzrdir._get_file_mode())
2648
2694
            return True
2649
2695
 
 
2696
    def _get_check_refs(self):
 
2697
        """Return the references needed to perform a check of this tree."""
 
2698
        return [('trees', self.last_revision())]
 
2699
 
2650
2700
    @needs_tree_write_lock
2651
2701
    def set_conflicts(self, conflicts):
2652
2702
        self._put_rio('conflicts', conflicts.to_stanzas(),
2729
2779
        """Return the format for the working tree object in a_bzrdir."""
2730
2780
        try:
2731
2781
            transport = a_bzrdir.get_workingtree_transport(None)
2732
 
            format_string = transport.get("format").read()
 
2782
            format_string = transport.get_bytes("format")
2733
2783
            return klass._formats[format_string]
2734
2784
        except errors.NoSuchFile:
2735
2785
            raise errors.NoWorkingTree(base=transport.base)
2999
3049
        return self.get_format_string()
3000
3050
 
3001
3051
 
3002
 
__default_format = WorkingTreeFormat4()
 
3052
__default_format = WorkingTreeFormat6()
3003
3053
WorkingTreeFormat.register_format(__default_format)
3004
 
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3005
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
 
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3006
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3007
3057
WorkingTreeFormat.set_default_format(__default_format)
3008
3058
# formats which have no format string are not discoverable