This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3238

httppeer: allow opener to be passed to makepeer()
ClosedPublic

Authored by indygreg on Apr 10 2018, 9:28 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG6b08cf6b900f: httppeer: allow opener to be passed to makepeer()
Summary

This allows us to use makepeer() in hg debugwireproto.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 10 2018, 9:28 PM
durin42 accepted this revision.Apr 11 2018, 12:49 PM
This revision is now accepted and ready to land.Apr 11 2018, 12:49 PM
Closed by commit rHG6b08cf6b900f: httppeer: allow opener to be passed to makepeer() (authored by indygreg). · Explain WhyApr 11 2018, 1:01 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (7 lines)
Mmercurial/httppeer.py (7 lines)

Diff 7956

mercurial/debugcommands.py

peer = httppeer.httpv2peer(ui, path, opener) peer = httppeer.httpv2peer(ui, path, opener)
elif opts['peer'] == 'raw': elif opts['peer'] == 'raw':
ui.write(_('using raw connection to peer\n')) ui.write(_('using raw connection to peer\n'))
peer = None peer = None
elif opts['peer']: elif opts['peer']:
raise error.Abort(_('--peer %s not supported with HTTP peers') % raise error.Abort(_('--peer %s not supported with HTTP peers') %
opts['peer']) opts['peer'])
else: else:
url, caps = httppeer.performhandshake(ui, url, opener, peer = httppeer.makepeer(ui, path, opener=opener)
httppeer.urlreq.request)
peer = httppeer.httppeer(ui, path, url, opener,
httppeer.urlreq.request,
caps)
# We /could/ populate stdin/stdout with sock.makefile()... # We /could/ populate stdin/stdout with sock.makefile()...
else: else:
raise error.Abort(_('unsupported connection configuration')) raise error.Abort(_('unsupported connection configuration'))
batchedcommands = None batchedcommands = None
# Now perform actions based on the parsed wire language instructions. # Now perform actions based on the parsed wire language instructions.

mercurial/httppeer.py

try: try:
rawcaps = resp.read() rawcaps = resp.read()
finally: finally:
resp.close() resp.close()
return respurl, set(rawcaps.split()) return respurl, set(rawcaps.split())
def makepeer(ui, path, requestbuilder=urlreq.request): def makepeer(ui, path, opener=None, requestbuilder=urlreq.request):
"""Construct an appropriate HTTP peer instance. """Construct an appropriate HTTP peer instance.
``opener`` is an ``url.opener`` that should be used to establish
connections, perform HTTP requests.
``requestbuilder`` is the type used for constructing HTTP requests. ``requestbuilder`` is the type used for constructing HTTP requests.
It exists as an argument so extensions can override the default. It exists as an argument so extensions can override the default.
""" """
u = util.url(path) u = util.url(path)
if u.query or u.fragment: if u.query or u.fragment:
raise error.Abort(_('unsupported URL component: "%s"') % raise error.Abort(_('unsupported URL component: "%s"') %
(u.query or u.fragment)) (u.query or u.fragment))
# urllib cannot handle URLs with embedded user or passwd. # urllib cannot handle URLs with embedded user or passwd.
url, authinfo = u.authinfo() url, authinfo = u.authinfo()
ui.debug('using %s\n' % url) ui.debug('using %s\n' % url)
opener = urlmod.opener(ui, authinfo) opener = opener or urlmod.opener(ui, authinfo)
respurl, caps = performhandshake(ui, url, opener, requestbuilder) respurl, caps = performhandshake(ui, url, opener, requestbuilder)
return httppeer(ui, path, respurl, opener, requestbuilder, caps) return httppeer(ui, path, respurl, opener, requestbuilder, caps)
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'))