Show More
@@ -2915,12 +2915,7 b' def debugwireproto(ui, repo, path=None, ' | |||
|
2915 | 2915 | raise error.Abort(_('--peer %s not supported with HTTP peers') % |
|
2916 | 2916 | opts['peer']) |
|
2917 | 2917 | else: |
|
2918 |
|
|
|
2919 | httppeer.urlreq.request) | |
|
2920 | ||
|
2921 | peer = httppeer.httppeer(ui, path, url, opener, | |
|
2922 | httppeer.urlreq.request, | |
|
2923 | caps) | |
|
2918 | peer = httppeer.makepeer(ui, path, opener=opener) | |
|
2924 | 2919 | |
|
2925 | 2920 | # We /could/ populate stdin/stdout with sock.makefile()... |
|
2926 | 2921 | else: |
@@ -620,9 +620,12 b' def performhandshake(ui, url, opener, re' | |||
|
620 | 620 | |
|
621 | 621 | return respurl, set(rawcaps.split()) |
|
622 | 622 | |
|
623 | def makepeer(ui, path, requestbuilder=urlreq.request): | |
|
623 | def makepeer(ui, path, opener=None, requestbuilder=urlreq.request): | |
|
624 | 624 | """Construct an appropriate HTTP peer instance. |
|
625 | 625 | |
|
626 | ``opener`` is an ``url.opener`` that should be used to establish | |
|
627 | connections, perform HTTP requests. | |
|
628 | ||
|
626 | 629 | ``requestbuilder`` is the type used for constructing HTTP requests. |
|
627 | 630 | It exists as an argument so extensions can override the default. |
|
628 | 631 | """ |
@@ -635,7 +638,7 b' def makepeer(ui, path, requestbuilder=ur' | |||
|
635 | 638 | url, authinfo = u.authinfo() |
|
636 | 639 | ui.debug('using %s\n' % url) |
|
637 | 640 | |
|
638 | opener = urlmod.opener(ui, authinfo) | |
|
641 | opener = opener or urlmod.opener(ui, authinfo) | |
|
639 | 642 | |
|
640 | 643 | respurl, caps = performhandshake(ui, url, opener, requestbuilder) |
|
641 | 644 |
General Comments 0
You need to be logged in to leave comments.
Login now