This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2083

wireprotoserver: remove redirect() and restore() (API)
ClosedPublic

Authored by indygreg on Feb 7 2018, 7:26 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG56fe8a3b2d52: wireprotoserver: remove redirect() and restore() (API)
Summary

These methods on the protocol handler interface are no longer used in
core.

.. api::

redirect() and restore() have been removed from the wire protocol
handler interface. Use mayberedirectstdio() instead.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 7 2018, 7:26 PM
indygreg edited the summary of this revision. (Show Details)Feb 7 2018, 11:32 PM
indygreg updated this revision to Diff 5335.
indygreg updated this revision to Diff 5346.Feb 8 2018, 12:20 AM
durin42 accepted this revision.Feb 12 2018, 4:22 PM
This revision is now accepted and ready to land.Feb 12 2018, 4:22 PM
Closed by commit rHG56fe8a3b2d52: wireprotoserver: remove redirect() and restore() (API) (authored by indygreg). · Explain WhyFeb 12 2018, 4:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotoserver.py (29 lines)

Diff 5529

mercurial/wireprotoserver.py

yields ``None`` if no I/O redirection occurs. yields ``None`` if no I/O redirection occurs.
The intent of this context manager is to capture stdio output The intent of this context manager is to capture stdio output
so it may be sent in the response. Some transports support streaming so it may be sent in the response. Some transports support streaming
stdio to the client in real time. For these transports, stdio output stdio to the client in real time. For these transports, stdio output
won't be captured. won't be captured.
""" """
@abc.abstractmethod
def redirect(self):
"""may setup interception for stdout and stderr
See also the `restore` method."""
# If the `redirect` function does install interception, the `restore`
# function MUST be defined. If interception is not used, this function
# MUST NOT be defined.
#
# left commented here on purpose
#
#def restore(self):
# """reinstall previous stdout and stderr and return intercepted stdout
# """
# raise NotImplementedError()
def decodevaluefromheaders(req, headerprefix): def decodevaluefromheaders(req, headerprefix):
"""Decode a long value from multiple HTTP request headers. """Decode a long value from multiple HTTP request headers.
Returns the value as a bytes, not a str. Returns the value as a bytes, not a str.
""" """
chunks = [] chunks = []
i = 1 i = 1
prefix = headerprefix.upper().replace(r'-', r'_') prefix = headerprefix.upper().replace(r'-', r'_')
try: try:
self._ui.fout = out self._ui.fout = out
self._ui.ferr = out self._ui.ferr = out
yield out yield out
finally: finally:
self._ui.fout = oldout self._ui.fout = oldout
self._ui.ferr = olderr self._ui.ferr = olderr
def redirect(self):
self._oldio = self._ui.fout, self._ui.ferr
self._ui.ferr = self._ui.fout = stringio()
def restore(self):
val = self._ui.fout.getvalue()
self._ui.ferr, self._ui.fout = self._oldio
return val
def _client(self): def _client(self):
return 'remote:%s:%s:%s' % ( return 'remote:%s:%s:%s' % (
self._req.env.get('wsgi.url_scheme') or 'http', self._req.env.get('wsgi.url_scheme') or 'http',
urlreq.quote(self._req.env.get('REMOTE_HOST', '')), urlreq.quote(self._req.env.get('REMOTE_HOST', '')),
urlreq.quote(self._req.env.get('REMOTE_USER', ''))) urlreq.quote(self._req.env.get('REMOTE_USER', '')))
def responsetype(self, prefer_uncompressed): def responsetype(self, prefer_uncompressed):
"""Determine the appropriate response type and compression settings. """Determine the appropriate response type and compression settings.
while count: while count:
fpout.write(self._fin.read(count)) fpout.write(self._fin.read(count))
count = int(self._fin.readline()) count = int(self._fin.readline())
@contextlib.contextmanager @contextlib.contextmanager
def mayberedirectstdio(self): def mayberedirectstdio(self):
yield None yield None
def redirect(self):
pass
def _client(self): def _client(self):
client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0] client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
return 'remote:ssh:' + client return 'remote:ssh:' + client
class sshserver(object): class sshserver(object):
def __init__(self, ui, repo): def __init__(self, ui, repo):
self._ui = ui self._ui = ui
self._repo = repo self._repo = repo