This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2216

httppeer: remove httpspeer
ClosedPublic

Authored by indygreg on Feb 12 2018, 10:48 PM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG874209855f5c: httppeer: remove httpspeer
rHGf6c7733655fc: httppeer: remove httpspeer
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 12 2018, 10:48 PM
lothiraldan accepted this revision.Feb 13 2018, 3:59 AM
lothiraldan added a subscriber: lothiraldan.

Could an extension import the httpspeer class or is it too low-level?

indygreg added a comment.Feb 13 2018, 12:08 PM
In D2216#36814, @lothiraldan wrote:

Could an extension import the httpspeer class or is it too low-level?

In theory, sure. But these classes are instantiated via httppeer.instance(). If anything, this change makes things friendlier for extensions because there is one less class to wrap and the remaining class doesn't inherit from a class that may be wrapped.

Closed by commit rHGf6c7733655fc: httppeer: remove httpspeer (authored by indygreg). · Explain WhyFeb 14 2018, 9:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/httppeer.py (15 lines)

Diff 5615

mercurial/httppeer.py

os.unlink(filename) os.unlink(filename)
def _callcompressable(self, cmd, **args): def _callcompressable(self, cmd, **args):
return self._callstream(cmd, _compressible=True, **args) return self._callstream(cmd, _compressible=True, **args)
def _abort(self, exception): def _abort(self, exception):
raise 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): def instance(ui, path, create):
if create: if create:
raise error.Abort(_('cannot create new http repository')) raise error.Abort(_('cannot create new http repository'))
try: try:
if path.startswith('https:'): if path.startswith('https:') and not url.has_https:
inst = httpspeer(ui, path) raise error.Abort(_('Python support for SSL and HTTPS '
else: 'is not installed'))
inst = httppeer(ui, path)
inst = httppeer(ui, path)
inst._fetchcaps() inst._fetchcaps()
return inst return inst
except error.RepoError as httpexception: except error.RepoError as httpexception:
try: try:
r = statichttprepo.instance(ui, "static-" + path, create) r = statichttprepo.instance(ui, "static-" + path, create)
ui.note(_('(falling back to static-http)\n')) ui.note(_('(falling back to static-http)\n'))
return r return r
except error.RepoError: except error.RepoError:
raise httpexception # use the original http RepoError instead raise httpexception # use the original http RepoError instead