/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

https://launchpad.net/bugs/524184
NEWS section template into a separate file

Show diffs side-by-side

added added

removed removed

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