/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-18 06:18:14 UTC
  • mfrom: (4634.97.5 doc-2.0)
  • Revision ID: pqm@pqm.ubuntu.com-20091118061814-695imx80olc79o7l
(mbp, trivial) additional doc building fix

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
914
910
            branch.last_revision().
915
911
        """
916
912
        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()
 
913
        pb = ui.ui_factory.nested_progress_bar()
 
914
        try:
 
915
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
916
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
917
            merger.pp.next_phase()
 
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
            merger.pp.next_phase()
 
932
            if from_revision is None:
 
933
                merger.find_base()
 
934
            else:
 
935
                merger.set_base_revision(from_revision, branch)
 
936
            if merger.base_rev_id == merger.other_rev_id:
 
937
                raise errors.PointlessMerge
 
938
            merger.backup_files = False
 
939
            if merge_type is None:
 
940
                merger.merge_type = Merge3Merger
 
941
            else:
 
942
                merger.merge_type = merge_type
 
943
            merger.set_interesting_files(None)
 
944
            merger.show_base = False
 
945
            merger.reprocess = False
 
946
            conflicts = merger.do_merge()
 
947
            merger.set_pending()
 
948
        finally:
 
949
            pb.finished()
947
950
        return conflicts
948
951
 
949
952
    @needs_read_lock
1096
1099
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1100
        if tree_transport.base != branch_transport.base:
1098
1101
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1102
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1103
        else:
1102
1104
            tree_bzrdir = branch_bzrdir
1103
1105
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1143
        This does not include files that have been deleted in this
1142
1144
        tree. Skips the control directory.
1143
1145
 
1144
 
        :param include_root: if True, return an entry for the root
 
1146
        :param include_root: if True, do not return an entry for the root
1145
1147
        :param from_dir: start from this directory or None for the root
1146
1148
        :param recursive: whether to recurse into subdirectories or not
1147
1149
        """
1601
1603
    @needs_write_lock
1602
1604
    def pull(self, source, overwrite=False, stop_revision=None,
1603
1605
             change_reporter=None, possible_transports=None, local=False):
 
1606
        top_pb = ui.ui_factory.nested_progress_bar()
1604
1607
        source.lock_read()
1605
1608
        try:
 
1609
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1610
            pp.next_phase()
1606
1611
            old_revision_info = self.branch.last_revision_info()
1607
1612
            basis_tree = self.basis_tree()
1608
1613
            count = self.branch.pull(source, overwrite, stop_revision,
1610
1615
                                     local=local)
1611
1616
            new_revision_info = self.branch.last_revision_info()
1612
1617
            if new_revision_info != old_revision_info:
 
1618
                pp.next_phase()
1613
1619
                repository = self.branch.repository
 
1620
                pb = ui.ui_factory.nested_progress_bar()
1614
1621
                basis_tree.lock_read()
1615
1622
                try:
1616
1623
                    new_basis_tree = self.branch.basis_tree()
1619
1626
                                new_basis_tree,
1620
1627
                                basis_tree,
1621
1628
                                this_tree=self,
1622
 
                                pb=None,
 
1629
                                pb=pb,
1623
1630
                                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)
 
1631
                    if (basis_tree.inventory.root is None and
 
1632
                        new_basis_tree.inventory.root is not None):
 
1633
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1634
                finally:
 
1635
                    pb.finished()
1629
1636
                    basis_tree.unlock()
1630
1637
                # TODO - dedup parents list with things merged by pull ?
1631
1638
                # reuse the revisiontree we merged against to set the new
1644
1651
            return count
1645
1652
        finally:
1646
1653
            source.unlock()
 
1654
            top_pb.finished()
1647
1655
 
1648
1656
    @needs_write_lock
1649
1657
    def put_file_bytes_non_atomic(self, file_id, bytes):
1734
1742
        r"""Check whether the filename matches an ignore pattern.
1735
1743
 
1736
1744
        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.
 
1745
        others match against only the last component.
1740
1746
 
1741
1747
        If the file is ignored, returns the pattern which caused it to
1742
1748
        be ignored, otherwise None.  So this can simply be used as a
1743
1749
        boolean if desired."""
1744
1750
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1751
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1752
        return self._ignoreglobster.match(filename)
1747
1753
 
1748
1754
    def kind(self, file_id):
1798
1804
            raise errors.ObjectNotLocked(self)
1799
1805
 
1800
1806
    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
 
        """
 
1807
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1808
        if not self.is_locked():
1809
1809
            self._reset_data()
1810
1810
        self.branch.lock_read()
1811
1811
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return self
 
1812
            return self._control_files.lock_read()
1814
1813
        except:
1815
1814
            self.branch.unlock()
1816
1815
            raise
1817
1816
 
1818
1817
    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
 
        """
 
1818
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1819
        if not self.is_locked():
1825
1820
            self._reset_data()
1826
1821
        self.branch.lock_read()
1827
1822
        try:
1828
 
            self._control_files.lock_write()
1829
 
            return self
 
1823
            return self._control_files.lock_write()
1830
1824
        except:
1831
1825
            self.branch.unlock()
1832
1826
            raise
1833
1827
 
1834
1828
    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
 
        """
 
1829
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1830
        if not self.is_locked():
1841
1831
            self._reset_data()
1842
1832
        self.branch.lock_write()
1843
1833
        try:
1844
 
            self._control_files.lock_write()
1845
 
            return self
 
1834
            return self._control_files.lock_write()
1846
1835
        except:
1847
1836
            self.branch.unlock()
1848
1837
            raise
1856
1845
    def _reset_data(self):
1857
1846
        """Reset transient data that cannot be revalidated."""
1858
1847
        self._inventory_is_modified = False
1859
 
        f = self._transport.get('inventory')
1860
 
        try:
1861
 
            result = self._deserialize(f)
1862
 
        finally:
1863
 
            f.close()
 
1848
        result = self._deserialize(self._transport.get('inventory'))
1864
1849
        self._set_inventory(result, dirty=False)
1865
1850
 
1866
1851
    @needs_tree_write_lock
1913
1898
            # revision_id is set. We must check for this full string, because a
1914
1899
            # root node id can legitimately look like 'revision_id' but cannot
1915
1900
            # contain a '"'.
1916
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1901
            xml = self.branch.repository.get_inventory_xml(new_revision)
1917
1902
            firstline = xml.split('\n', 1)[0]
1918
1903
            if (not 'revision_id="' in firstline or
1919
1904
                'format="7"' not in firstline):
1942
1927
        # binary.
1943
1928
        if self._inventory_is_modified:
1944
1929
            raise errors.InventoryModified(self)
1945
 
        f = self._transport.get('inventory')
1946
 
        try:
1947
 
            result = self._deserialize(f)
1948
 
        finally:
1949
 
            f.close()
 
1930
        result = self._deserialize(self._transport.get('inventory'))
1950
1931
        self._set_inventory(result, dirty=False)
1951
1932
        return result
1952
1933
 
1967
1948
 
1968
1949
        new_files=set()
1969
1950
        unknown_nested_files=set()
1970
 
        if to_file is None:
1971
 
            to_file = sys.stdout
1972
1951
 
1973
1952
        def recurse_directory_to_add_files(directory):
1974
1953
            # Recurse directory and add all files
2044
2023
                        new_status = 'I'
2045
2024
                    else:
2046
2025
                        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')
 
2026
                    textui.show_status(new_status, self.kind(fid), f,
 
2027
                                       to_file=to_file)
2050
2028
                # Unversion file
2051
2029
                inv_delta.append((f, None, fid, None))
2052
2030
                message = "removed %s" % (f,)
2075
2053
 
2076
2054
    @needs_tree_write_lock
2077
2055
    def revert(self, filenames=None, old_tree=None, backups=True,
2078
 
               pb=None, report_changes=False):
 
2056
               pb=DummyProgress(), report_changes=False):
2079
2057
        from bzrlib.conflicts import resolve
2080
2058
        if filenames == []:
2081
2059
            filenames = None
2203
2181
        """
2204
2182
        raise NotImplementedError(self.unlock)
2205
2183
 
2206
 
    _marker = object()
2207
 
 
2208
 
    def update(self, change_reporter=None, possible_transports=None,
2209
 
               revision=None, old_tip=_marker):
 
2184
    def update(self, change_reporter=None, possible_transports=None):
2210
2185
        """Update a working tree along its branch.
2211
2186
 
2212
2187
        This will update the branch if its bound too, which means we have
2230
2205
        - Merge current state -> basis tree of the master w.r.t. the old tree
2231
2206
          basis.
2232
2207
        - 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
2208
        """
2240
2209
        if self.branch.get_bound_location() is not None:
2241
2210
            self.lock_write()
2242
 
            update_branch = (old_tip is self._marker)
 
2211
            update_branch = True
2243
2212
        else:
2244
2213
            self.lock_tree_write()
2245
2214
            update_branch = False
2247
2216
            if update_branch:
2248
2217
                old_tip = self.branch.update(possible_transports)
2249
2218
            else:
2250
 
                if old_tip is self._marker:
2251
 
                    old_tip = None
2252
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2219
                old_tip = None
 
2220
            return self._update_tree(old_tip, change_reporter)
2253
2221
        finally:
2254
2222
            self.unlock()
2255
2223
 
2256
2224
    @needs_tree_write_lock
2257
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2225
    def _update_tree(self, old_tip=None, change_reporter=None):
2258
2226
        """Update a tree to the master branch.
2259
2227
 
2260
2228
        :param old_tip: if supplied, the previous tip revision the branch,
2270
2238
        # We MUST save it even if an error occurs, because otherwise the users
2271
2239
        # local work is unreferenced and will appear to have been lost.
2272
2240
        #
2273
 
        nb_conflicts = 0
 
2241
        result = 0
2274
2242
        try:
2275
2243
            last_rev = self.get_parent_ids()[0]
2276
2244
        except IndexError:
2277
2245
            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
 
 
 
2246
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2247
            # merge tree state up to new branch tip.
2302
2248
            basis = self.basis_tree()
2303
2249
            basis.lock_read()
2304
2250
            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)
 
2251
                to_tree = self.branch.basis_tree()
 
2252
                if basis.inventory.root is None:
 
2253
                    self.set_root_id(to_tree.get_root_id())
2308
2254
                    self.flush()
 
2255
                result += merge.merge_inner(
 
2256
                                      self.branch,
 
2257
                                      to_tree,
 
2258
                                      basis,
 
2259
                                      this_tree=self,
 
2260
                                      change_reporter=change_reporter)
2309
2261
            finally:
2310
2262
                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
2263
            # TODO - dedup parents list with things merged by pull ?
2323
2264
            # reuse the tree we've updated to to set the basis:
2324
 
            parent_trees = [(revision, to_tree)]
 
2265
            parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2266
            merges = self.get_parent_ids()[1:]
2326
2267
            # Ideally we ask the tree for the trees here, that way the working
2327
2268
            # tree can decide whether to give us the entire tree or give us a
2331
2272
            for parent in merges:
2332
2273
                parent_trees.append(
2333
2274
                    (parent, self.branch.repository.revision_tree(parent)))
2334
 
            if not _mod_revision.is_null(old_tip):
 
2275
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2335
2276
                parent_trees.append(
2336
2277
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2278
            self.set_parent_trees(parent_trees)
2338
2279
            last_rev = parent_trees[0][0]
2339
 
        return nb_conflicts
 
2280
        else:
 
2281
            # the working tree had the same last-revision as the master
 
2282
            # branch did. We may still have pivot local work from the local
 
2283
            # branch into old_tip:
 
2284
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2285
                self.add_parent_tree_id(old_tip)
 
2286
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2287
            and old_tip != last_rev):
 
2288
            # our last revision was not the prior branch last revision
 
2289
            # and we have converted that last revision to a pending merge.
 
2290
            # base is somewhere between the branch tip now
 
2291
            # and the now pending merge
 
2292
 
 
2293
            # Since we just modified the working tree and inventory, flush out
 
2294
            # the current state, before we modify it again.
 
2295
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2296
            #       requires it only because TreeTransform directly munges the
 
2297
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2298
            #       should be able to remove this extra flush.
 
2299
            self.flush()
 
2300
            graph = self.branch.repository.get_graph()
 
2301
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2302
                                                old_tip)
 
2303
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2304
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2305
            result += merge.merge_inner(
 
2306
                                  self.branch,
 
2307
                                  other_tree,
 
2308
                                  base_tree,
 
2309
                                  this_tree=self,
 
2310
                                  change_reporter=change_reporter)
 
2311
        return result
2340
2312
 
2341
2313
    def _write_hashcache_if_dirty(self):
2342
2314
        """Write out the hashcache if it is dirty."""
2612
2584
        """
2613
2585
        return
2614
2586
 
 
2587
    @needs_read_lock
2615
2588
    def _get_rules_searcher(self, default_searcher):
2616
2589
        """See Tree._get_rules_searcher."""
2617
2590
        if self._rules_searcher is None:
2653
2626
 
2654
2627
        In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2628
        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
2629
        """
2660
2630
        self.branch.lock_write()
2661
2631
        try:
2662
 
            self._control_files.lock_write()
2663
 
            return self
 
2632
            return self._control_files.lock_write()
2664
2633
        except:
2665
2634
            self.branch.unlock()
2666
2635
            raise
2800
2769
        """Return the format for the working tree object in a_bzrdir."""
2801
2770
        try:
2802
2771
            transport = a_bzrdir.get_workingtree_transport(None)
2803
 
            format_string = transport.get_bytes("format")
 
2772
            format_string = transport.get("format").read()
2804
2773
            return klass._formats[format_string]
2805
2774
        except errors.NoSuchFile:
2806
2775
            raise errors.NoWorkingTree(base=transport.base)