← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-18 10:55:12 UTC
  • mfrom: (5887.1.1 trivial_close_earlier)
  • Revision ID: pqm@pqm.ubuntu.com-20110518105512-8rhaqw4g6a8pnjuo
(jameinel) Close file objects a bit earlier in _seek_and_read. Helps PyPy's
 lazy collector. (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
32
32
    static_tuple,
33
33
    symbol_versioning,
34
34
    urlutils,
 
35
    versionedfile,
35
36
    vf_repository,
36
37
    )
37
38
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
1080
1081
    def find_text_key_references(self):
1081
1082
        """Find the text key references within the repository.
1082
1083
 
 
1084
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
 
1085
        revision_ids. Each altered file-ids has the exact revision_ids that
 
1086
        altered it listed explicitly.
1083
1087
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1084
1088
            to whether they were referred to by the inventory of the
1085
1089
            revision_id that they contain. The inventory texts from all present
1605
1609
    @needs_read_lock
1606
1610
    def search_missing_revision_ids(self, other,
1607
1611
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
1608
 
            find_ghosts=True, revision_ids=None, if_present_ids=None,
1609
 
            limit=None):
 
1612
            find_ghosts=True, revision_ids=None, if_present_ids=None):
1610
1613
        """Return the revision ids that other has that this does not.
1611
1614
 
1612
1615
        These are returned in topological order.
1626
1629
        inter_repo = _mod_repository.InterRepository.get(other, self)
1627
1630
        return inter_repo.search_missing_revision_ids(
1628
1631
            find_ghosts=find_ghosts, revision_ids=revision_ids,
1629
 
            if_present_ids=if_present_ids, limit=limit)
 
1632
            if_present_ids=if_present_ids)
1630
1633
 
1631
1634
    def fetch(self, source, revision_id=None, find_ghosts=False,
1632
1635
            fetch_spec=None):
1660
1663
        self._real_repository.create_bundle(target, base, fileobj, format)
1661
1664
 
1662
1665
    @needs_read_lock
1663
 
    @symbol_versioning.deprecated_method(
1664
 
        symbol_versioning.deprecated_in((2, 4, 0)))
1665
1666
    def get_ancestry(self, revision_id, topo_sorted=True):
1666
1667
        self._ensure_real()
1667
1668
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
1975
1976
    def supports_rich_root(self):
1976
1977
        return self._format.rich_root_data
1977
1978
 
1978
 
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1979
1979
    def iter_reverse_revision_history(self, revision_id):
1980
1980
        self._ensure_real()
1981
1981
        return self._real_repository.iter_reverse_revision_history(revision_id)
3103
3103
        """
3104
3104
        try:
3105
3105
            configobj = self._get_configobj()
3106
 
            section_obj = None
3107
3106
            if section is None:
3108
3107
                section_obj = configobj
3109
3108
            else:
3110
3109
                try:
3111
3110
                    section_obj = configobj[section]
3112
3111
                except KeyError:
3113
 
                    pass
3114
 
            if section_obj is None:
3115
 
                value = default
3116
 
            else:
3117
 
                value = section_obj.get(name, default)
 
3112
                    return default
 
3113
            return section_obj.get(name, default)
3118
3114
        except errors.UnknownSmartMethod:
3119
 
            value = self._vfs_get_option(name, section, default)
3120
 
        for hook in config.OldConfigHooks['get']:
3121
 
            hook(self, name, value)
3122
 
        return value
 
3115
            return self._vfs_get_option(name, section, default)
3123
3116
 
3124
3117
    def _response_to_configobj(self, response):
3125
3118
        if len(response[0]) and response[0][0] != 'ok':
3126
3119
            raise errors.UnexpectedSmartServerResponse(response)
3127
3120
        lines = response[1].read_body_bytes().splitlines()
3128
 
        conf = config.ConfigObj(lines, encoding='utf-8')
3129
 
        for hook in config.OldConfigHooks['load']:
3130
 
            hook(self)
3131
 
        return conf
 
3121
        return config.ConfigObj(lines, encoding='utf-8')
3132
3122
 
3133
3123
 
3134
3124
class RemoteBranchConfig(RemoteConfig):