Mercurial > hg
changeset 36220:874209855f5c
httppeer: remove httpspeer
All it did was verify at construction time that Mercurial supports
TLS. instance() is what's used to construct peer instances. So
we can just inline this check into that function and do away with
the type variant.
Differential Revision: https://phab.mercurial-scm.org/D2216
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 12 Feb 2018 17:14:29 -0800 |
| parents | a463f375f021 |
| children | 62bca1c50e96 |
| files | mercurial/httppeer.py |
| diffstat | 1 files changed, 4 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/httppeer.py Mon Feb 12 17:10:58 2018 -0800 +++ b/mercurial/httppeer.py Mon Feb 12 17:14:29 2018 -0800 @@ -480,22 +480,15 @@ def _abort(self, exception): raise exception -class httpspeer(httppeer): - def __init__(self, ui, path): - if not url.has_https: - raise error.Abort(_('Python support for SSL and HTTPS ' - 'is not installed')) - httppeer.__init__(self, ui, path) - def instance(ui, path, create): if create: raise error.Abort(_('cannot create new http repository')) try: - if path.startswith('https:'): - inst = httpspeer(ui, path) - else: - inst = httppeer(ui, path) + if path.startswith('https:') and not url.has_https: + raise error.Abort(_('Python support for SSL and HTTPS ' + 'is not installed')) + inst = httppeer(ui, path) inst._fetchcaps() return inst