~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Deprecate LockableFiles.get

Show diffs side-by-side

added added

removed removed

Lines of Context:
1467
1467
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
1468
1468
 
1469
1469
    def _gen_revision_history(self):
1470
 
        history = self.control_files.get('revision-history').read().split('\n')
 
1470
        history = self._transport.get_bytes('revision-history').split('\n')
1471
1471
        if history[-1:] == ['']:
1472
1472
            # There shouldn't be a trailing newline, but just in case.
1473
1473
            history.pop()
1598
1598
        _locs = ['parent', 'pull', 'x-pull']
1599
1599
        for l in _locs:
1600
1600
            try:
1601
 
                return self.control_files.get(l).read().strip('\n')
 
1601
                return self._transport.get_bytes(l).strip('\n')
1602
1602
            except errors.NoSuchFile:
1603
1603
                pass
1604
1604
        return None
1897
1897
        return self._last_revision_info_cache
1898
1898
 
1899
1899
    def _last_revision_info(self):
1900
 
        revision_string = self.control_files.get('last-revision').read()
 
1900
        revision_string = self.control_files._transport.get_bytes('last-revision')
1901
1901
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1902
1902
        revision_id = cache_utf8.get_cached_utf8(revision_id)
1903
1903
        revno = int(revno)