← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Ferlito
  • Date: 2009-09-02 04:31:45 UTC
  • mto: (4665.7.1 serve-init)
  • mto: This revision was merged to the branch mainline in revision 4913.
  • Revision ID: johnf@inodes.org-20090902043145-gxdsfw03ilcwbyn5
Add a debian init script for bzr --serve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 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
29
29
WorkingTree.open(dir).
30
30
"""
31
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.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
59
65
    merge,
60
66
    revision as _mod_revision,
61
67
    revisiontree,
 
68
    textui,
62
69
    trace,
63
70
    transform,
64
71
    ui,
95
102
from bzrlib.filters import filtered_input_file
96
103
from bzrlib.trace import mutter, note
97
104
from bzrlib.transport.local import LocalTransport
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
98
106
from bzrlib.revision import CURRENT_REVISION
99
107
from bzrlib.rio import RioReader, rio_file, Stanza
100
108
from bzrlib.symbol_versioning import (
104
112
 
105
113
 
106
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
 
# TODO: Modifying the conflict objects or their type is currently nearly
108
 
# impossible as there is no clear relationship between the working tree format
109
 
# and the conflict list file format.
110
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
116
 
112
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
172
        return ''
168
173
 
169
174
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
175
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
176
    """Working copy tree.
173
177
 
174
178
    The inventory is held in the `Branch` working-inventory, and the
247
251
        self._rules_searcher = None
248
252
        self.views = self._make_views()
249
253
 
250
 
    @property
251
 
    def user_transport(self):
252
 
        return self.bzrdir.user_transport
253
 
 
254
 
    @property
255
 
    def control_transport(self):
256
 
        return self._transport
257
 
 
258
254
    def _detect_case_handling(self):
259
255
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
256
        try:
548
544
        else:
549
545
            parents = [last_rev]
550
546
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
547
            merges_file = self._transport.get('pending-merges')
552
548
        except errors.NoSuchFile:
553
549
            pass
554
550
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
551
            for l in merges_file.readlines():
556
552
                revision_id = l.rstrip('\n')
557
553
                parents.append(revision_id)
558
554
        return parents
640
636
 
641
637
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
638
        file_id = self.path2id(path)
643
 
        if file_id is None:
644
 
            # For unversioned files on win32, we just assume they are not
645
 
            # executable
646
 
            return False
647
639
        return self._inventory[file_id].executable
648
640
 
649
641
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
904
896
 
905
897
    @needs_write_lock # because merge pulls data into the branch.
906
898
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
899
        merge_type=None):
908
900
        """Merge from a branch into this working tree.
909
901
 
910
902
        :param branch: The branch to merge from.
914
906
            branch.last_revision().
915
907
        """
916
908
        from bzrlib.merge import Merger, Merge3Merger
917
 
        merger = Merger(self.branch, this_tree=self)
918
 
        # check that there are no local alterations
919
 
        if not force and self.has_changes():
920
 
            raise errors.UncommittedChanges(self)
921
 
        if to_revision is None:
922
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
923
 
        merger.other_rev_id = to_revision
924
 
        if _mod_revision.is_null(merger.other_rev_id):
925
 
            raise errors.NoCommits(branch)
926
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
 
        merger.other_basis = merger.other_rev_id
928
 
        merger.other_tree = self.branch.repository.revision_tree(
929
 
            merger.other_rev_id)
930
 
        merger.other_branch = branch
931
 
        if from_revision is None:
932
 
            merger.find_base()
933
 
        else:
934
 
            merger.set_base_revision(from_revision, branch)
935
 
        if merger.base_rev_id == merger.other_rev_id:
936
 
            raise errors.PointlessMerge
937
 
        merger.backup_files = False
938
 
        if merge_type is None:
939
 
            merger.merge_type = Merge3Merger
940
 
        else:
941
 
            merger.merge_type = merge_type
942
 
        merger.set_interesting_files(None)
943
 
        merger.show_base = False
944
 
        merger.reprocess = False
945
 
        conflicts = merger.do_merge()
946
 
        merger.set_pending()
 
909
        pb = ui.ui_factory.nested_progress_bar()
 
910
        try:
 
911
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
912
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
913
            merger.pp.next_phase()
 
914
            # check that there are no
 
915
            # local alterations
 
916
            merger.check_basis(check_clean=True, require_commits=False)
 
917
            if to_revision is None:
 
918
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
919
            merger.other_rev_id = to_revision
 
920
            if _mod_revision.is_null(merger.other_rev_id):
 
921
                raise errors.NoCommits(branch)
 
922
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
923
            merger.other_basis = merger.other_rev_id
 
924
            merger.other_tree = self.branch.repository.revision_tree(
 
925
                merger.other_rev_id)
 
926
            merger.other_branch = branch
 
927
            merger.pp.next_phase()
 
928
            if from_revision is None:
 
929
                merger.find_base()
 
930
            else:
 
931
                merger.set_base_revision(from_revision, branch)
 
932
            if merger.base_rev_id == merger.other_rev_id:
 
933
                raise errors.PointlessMerge
 
934
            merger.backup_files = False
 
935
            if merge_type is None:
 
936
                merger.merge_type = Merge3Merger
 
937
            else:
 
938
                merger.merge_type = merge_type
 
939
            merger.set_interesting_files(None)
 
940
            merger.show_base = False
 
941
            merger.reprocess = False
 
942
            conflicts = merger.do_merge()
 
943
            merger.set_pending()
 
944
        finally:
 
945
            pb.finished()
947
946
        return conflicts
948
947
 
949
948
    @needs_read_lock
1096
1095
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1096
        if tree_transport.base != branch_transport.base:
1098
1097
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1098
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1099
        else:
1102
1100
            tree_bzrdir = branch_bzrdir
1103
1101
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1139
        This does not include files that have been deleted in this
1142
1140
        tree. Skips the control directory.
1143
1141
 
1144
 
        :param include_root: if True, return an entry for the root
 
1142
        :param include_root: if True, do not return an entry for the root
1145
1143
        :param from_dir: start from this directory or None for the root
1146
1144
        :param recursive: whether to recurse into subdirectories or not
1147
1145
        """
1601
1599
    @needs_write_lock
1602
1600
    def pull(self, source, overwrite=False, stop_revision=None,
1603
1601
             change_reporter=None, possible_transports=None, local=False):
 
1602
        top_pb = ui.ui_factory.nested_progress_bar()
1604
1603
        source.lock_read()
1605
1604
        try:
 
1605
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1606
            pp.next_phase()
1606
1607
            old_revision_info = self.branch.last_revision_info()
1607
1608
            basis_tree = self.basis_tree()
1608
1609
            count = self.branch.pull(source, overwrite, stop_revision,
1610
1611
                                     local=local)
1611
1612
            new_revision_info = self.branch.last_revision_info()
1612
1613
            if new_revision_info != old_revision_info:
 
1614
                pp.next_phase()
1613
1615
                repository = self.branch.repository
 
1616
                pb = ui.ui_factory.nested_progress_bar()
1614
1617
                basis_tree.lock_read()
1615
1618
                try:
1616
1619
                    new_basis_tree = self.branch.basis_tree()
1619
1622
                                new_basis_tree,
1620
1623
                                basis_tree,
1621
1624
                                this_tree=self,
1622
 
                                pb=None,
 
1625
                                pb=pb,
1623
1626
                                change_reporter=change_reporter)
1624
 
                    basis_root_id = basis_tree.get_root_id()
1625
 
                    new_root_id = new_basis_tree.get_root_id()
1626
 
                    if basis_root_id != new_root_id:
1627
 
                        self.set_root_id(new_root_id)
 
1627
                    if (basis_tree.inventory.root is None and
 
1628
                        new_basis_tree.inventory.root is not None):
 
1629
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1630
                finally:
 
1631
                    pb.finished()
1629
1632
                    basis_tree.unlock()
1630
1633
                # TODO - dedup parents list with things merged by pull ?
1631
1634
                # reuse the revisiontree we merged against to set the new
1644
1647
            return count
1645
1648
        finally:
1646
1649
            source.unlock()
 
1650
            top_pb.finished()
1647
1651
 
1648
1652
    @needs_write_lock
1649
1653
    def put_file_bytes_non_atomic(self, file_id, bytes):
1734
1738
        r"""Check whether the filename matches an ignore pattern.
1735
1739
 
1736
1740
        Patterns containing '/' or '\' need to match the whole path;
1737
 
        others match against only the last component.  Patterns starting
1738
 
        with '!' are ignore exceptions.  Exceptions take precedence
1739
 
        over regular patterns and cause the filename to not be ignored.
 
1741
        others match against only the last component.
1740
1742
 
1741
1743
        If the file is ignored, returns the pattern which caused it to
1742
1744
        be ignored, otherwise None.  So this can simply be used as a
1743
1745
        boolean if desired."""
1744
1746
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1747
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1748
        return self._ignoreglobster.match(filename)
1747
1749
 
1748
1750
    def kind(self, file_id):
1798
1800
            raise errors.ObjectNotLocked(self)
1799
1801
 
1800
1802
    def lock_read(self):
1801
 
        """Lock the tree for reading.
1802
 
 
1803
 
        This also locks the branch, and can be unlocked via self.unlock().
1804
 
 
1805
 
        :return: An object with an unlock method which will release the lock
1806
 
            obtained.
1807
 
        """
 
1803
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1804
        if not self.is_locked():
1809
1805
            self._reset_data()
1810
1806
        self.branch.lock_read()
1811
1807
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return self
 
1808
            return self._control_files.lock_read()
1814
1809
        except:
1815
1810
            self.branch.unlock()
1816
1811
            raise
1817
1812
 
1818
1813
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: An object with an unlock method which will release the lock
1822
 
            obtained.
1823
 
        """
 
1814
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1815
        if not self.is_locked():
1825
1816
            self._reset_data()
1826
1817
        self.branch.lock_read()
1827
1818
        try:
1828
 
            self._control_files.lock_write()
1829
 
            return self
 
1819
            return self._control_files.lock_write()
1830
1820
        except:
1831
1821
            self.branch.unlock()
1832
1822
            raise
1833
1823
 
1834
1824
    def lock_write(self):
1835
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1836
 
 
1837
 
        :return: An object with an unlock method which will release the lock
1838
 
            obtained.
1839
 
        """
 
1825
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1826
        if not self.is_locked():
1841
1827
            self._reset_data()
1842
1828
        self.branch.lock_write()
1843
1829
        try:
1844
 
            self._control_files.lock_write()
1845
 
            return self
 
1830
            return self._control_files.lock_write()
1846
1831
        except:
1847
1832
            self.branch.unlock()
1848
1833
            raise
1856
1841
    def _reset_data(self):
1857
1842
        """Reset transient data that cannot be revalidated."""
1858
1843
        self._inventory_is_modified = False
1859
 
        f = self._transport.get('inventory')
1860
 
        try:
1861
 
            result = self._deserialize(f)
1862
 
        finally:
1863
 
            f.close()
 
1844
        result = self._deserialize(self._transport.get('inventory'))
1864
1845
        self._set_inventory(result, dirty=False)
1865
1846
 
1866
1847
    @needs_tree_write_lock
1913
1894
            # revision_id is set. We must check for this full string, because a
1914
1895
            # root node id can legitimately look like 'revision_id' but cannot
1915
1896
            # contain a '"'.
1916
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1897
            xml = self.branch.repository.get_inventory_xml(new_revision)
1917
1898
            firstline = xml.split('\n', 1)[0]
1918
1899
            if (not 'revision_id="' in firstline or
1919
1900
                'format="7"' not in firstline):
1942
1923
        # binary.
1943
1924
        if self._inventory_is_modified:
1944
1925
            raise errors.InventoryModified(self)
1945
 
        f = self._transport.get('inventory')
1946
 
        try:
1947
 
            result = self._deserialize(f)
1948
 
        finally:
1949
 
            f.close()
 
1926
        result = self._deserialize(self._transport.get('inventory'))
1950
1927
        self._set_inventory(result, dirty=False)
1951
1928
        return result
1952
1929
 
1967
1944
 
1968
1945
        new_files=set()
1969
1946
        unknown_nested_files=set()
1970
 
        if to_file is None:
1971
 
            to_file = sys.stdout
1972
1947
 
1973
1948
        def recurse_directory_to_add_files(directory):
1974
1949
            # Recurse directory and add all files
2044
2019
                        new_status = 'I'
2045
2020
                    else:
2046
2021
                        new_status = '?'
2047
 
                    # XXX: Really should be a more abstract reporter interface
2048
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2049
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2022
                    textui.show_status(new_status, self.kind(fid), f,
 
2023
                                       to_file=to_file)
2050
2024
                # Unversion file
2051
2025
                inv_delta.append((f, None, fid, None))
2052
2026
                message = "removed %s" % (f,)
2075
2049
 
2076
2050
    @needs_tree_write_lock
2077
2051
    def revert(self, filenames=None, old_tree=None, backups=True,
2078
 
               pb=None, report_changes=False):
 
2052
               pb=DummyProgress(), report_changes=False):
2079
2053
        from bzrlib.conflicts import resolve
2080
2054
        if filenames == []:
2081
2055
            filenames = None
2203
2177
        """
2204
2178
        raise NotImplementedError(self.unlock)
2205
2179
 
2206
 
    _marker = object()
2207
 
 
2208
 
    def update(self, change_reporter=None, possible_transports=None,
2209
 
               revision=None, old_tip=_marker):
 
2180
    def update(self, change_reporter=None, possible_transports=None):
2210
2181
        """Update a working tree along its branch.
2211
2182
 
2212
2183
        This will update the branch if its bound too, which means we have
2230
2201
        - Merge current state -> basis tree of the master w.r.t. the old tree
2231
2202
          basis.
2232
2203
        - Do a 'normal' merge of the old branch basis if it is relevant.
2233
 
 
2234
 
        :param revision: The target revision to update to. Must be in the
2235
 
            revision history.
2236
 
        :param old_tip: If branch.update() has already been run, the value it
2237
 
            returned (old tip of the branch or None). _marker is used
2238
 
            otherwise.
2239
2204
        """
2240
2205
        if self.branch.get_bound_location() is not None:
2241
2206
            self.lock_write()
2242
 
            update_branch = (old_tip is self._marker)
 
2207
            update_branch = True
2243
2208
        else:
2244
2209
            self.lock_tree_write()
2245
2210
            update_branch = False
2247
2212
            if update_branch:
2248
2213
                old_tip = self.branch.update(possible_transports)
2249
2214
            else:
2250
 
                if old_tip is self._marker:
2251
 
                    old_tip = None
2252
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2215
                old_tip = None
 
2216
            return self._update_tree(old_tip, change_reporter)
2253
2217
        finally:
2254
2218
            self.unlock()
2255
2219
 
2256
2220
    @needs_tree_write_lock
2257
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2221
    def _update_tree(self, old_tip=None, change_reporter=None):
2258
2222
        """Update a tree to the master branch.
2259
2223
 
2260
2224
        :param old_tip: if supplied, the previous tip revision the branch,
2270
2234
        # We MUST save it even if an error occurs, because otherwise the users
2271
2235
        # local work is unreferenced and will appear to have been lost.
2272
2236
        #
2273
 
        nb_conflicts = 0
 
2237
        result = 0
2274
2238
        try:
2275
2239
            last_rev = self.get_parent_ids()[0]
2276
2240
        except IndexError:
2277
2241
            last_rev = _mod_revision.NULL_REVISION
2278
 
        if revision is None:
2279
 
            revision = self.branch.last_revision()
2280
 
 
2281
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2282
 
 
2283
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2284
 
            # the branch we are bound to was updated
2285
 
            # merge those changes in first
2286
 
            base_tree  = self.basis_tree()
2287
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2288
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2289
 
                                             base_tree, this_tree=self,
2290
 
                                             change_reporter=change_reporter)
2291
 
            if nb_conflicts:
2292
 
                self.add_parent_tree((old_tip, other_tree))
2293
 
                trace.note('Rerun update after fixing the conflicts.')
2294
 
                return nb_conflicts
2295
 
 
2296
 
        if last_rev != _mod_revision.ensure_null(revision):
2297
 
            # the working tree is up to date with the branch
2298
 
            # we can merge the specified revision from master
2299
 
            to_tree = self.branch.repository.revision_tree(revision)
2300
 
            to_root_id = to_tree.get_root_id()
2301
 
 
 
2242
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2243
            # merge tree state up to new branch tip.
2302
2244
            basis = self.basis_tree()
2303
2245
            basis.lock_read()
2304
2246
            try:
2305
 
                if (basis.inventory.root is None
2306
 
                    or basis.inventory.root.file_id != to_root_id):
2307
 
                    self.set_root_id(to_root_id)
 
2247
                to_tree = self.branch.basis_tree()
 
2248
                if basis.inventory.root is None:
 
2249
                    self.set_root_id(to_tree.get_root_id())
2308
2250
                    self.flush()
 
2251
                result += merge.merge_inner(
 
2252
                                      self.branch,
 
2253
                                      to_tree,
 
2254
                                      basis,
 
2255
                                      this_tree=self,
 
2256
                                      change_reporter=change_reporter)
2309
2257
            finally:
2310
2258
                basis.unlock()
2311
 
 
2312
 
            # determine the branch point
2313
 
            graph = self.branch.repository.get_graph()
2314
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
 
                                                last_rev)
2316
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
 
 
2318
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
 
                                             this_tree=self,
2320
 
                                             change_reporter=change_reporter)
2321
 
            self.set_last_revision(revision)
2322
2259
            # TODO - dedup parents list with things merged by pull ?
2323
2260
            # reuse the tree we've updated to to set the basis:
2324
 
            parent_trees = [(revision, to_tree)]
 
2261
            parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2262
            merges = self.get_parent_ids()[1:]
2326
2263
            # Ideally we ask the tree for the trees here, that way the working
2327
2264
            # tree can decide whether to give us the entire tree or give us a
2331
2268
            for parent in merges:
2332
2269
                parent_trees.append(
2333
2270
                    (parent, self.branch.repository.revision_tree(parent)))
2334
 
            if not _mod_revision.is_null(old_tip):
 
2271
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2335
2272
                parent_trees.append(
2336
2273
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2274
            self.set_parent_trees(parent_trees)
2338
2275
            last_rev = parent_trees[0][0]
2339
 
        return nb_conflicts
 
2276
        else:
 
2277
            # the working tree had the same last-revision as the master
 
2278
            # branch did. We may still have pivot local work from the local
 
2279
            # branch into old_tip:
 
2280
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2281
                self.add_parent_tree_id(old_tip)
 
2282
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2283
            and old_tip != last_rev):
 
2284
            # our last revision was not the prior branch last revision
 
2285
            # and we have converted that last revision to a pending merge.
 
2286
            # base is somewhere between the branch tip now
 
2287
            # and the now pending merge
 
2288
 
 
2289
            # Since we just modified the working tree and inventory, flush out
 
2290
            # the current state, before we modify it again.
 
2291
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2292
            #       requires it only because TreeTransform directly munges the
 
2293
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2294
            #       should be able to remove this extra flush.
 
2295
            self.flush()
 
2296
            graph = self.branch.repository.get_graph()
 
2297
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2298
                                                old_tip)
 
2299
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2300
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2301
            result += merge.merge_inner(
 
2302
                                  self.branch,
 
2303
                                  other_tree,
 
2304
                                  base_tree,
 
2305
                                  this_tree=self,
 
2306
                                  change_reporter=change_reporter)
 
2307
        return result
2340
2308
 
2341
2309
    def _write_hashcache_if_dirty(self):
2342
2310
        """Write out the hashcache if it is dirty."""
2612
2580
        """
2613
2581
        return
2614
2582
 
 
2583
    @needs_read_lock
2615
2584
    def _get_rules_searcher(self, default_searcher):
2616
2585
        """See Tree._get_rules_searcher."""
2617
2586
        if self._rules_searcher is None:
2653
2622
 
2654
2623
        In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2624
        so lock_tree_write() degrades to lock_write().
2656
 
 
2657
 
        :return: An object with an unlock method which will release the lock
2658
 
            obtained.
2659
2625
        """
2660
2626
        self.branch.lock_write()
2661
2627
        try:
2662
 
            self._control_files.lock_write()
2663
 
            return self
 
2628
            return self._control_files.lock_write()
2664
2629
        except:
2665
2630
            self.branch.unlock()
2666
2631
            raise
2800
2765
        """Return the format for the working tree object in a_bzrdir."""
2801
2766
        try:
2802
2767
            transport = a_bzrdir.get_workingtree_transport(None)
2803
 
            format_string = transport.get_bytes("format")
 
2768
            format_string = transport.get("format").read()
2804
2769
            return klass._formats[format_string]
2805
2770
        except errors.NoSuchFile:
2806
2771
            raise errors.NoWorkingTree(base=transport.base)