This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2086

wireproto: remove unused proto argument from supportedcompengines (API)
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG038bcb759b75: wireproto: remove unused proto argument from supportedcompengines (API)
Summary

In theory, the protocol should be passed to this function. But the
argument isn't being used and it is getting in the way of refactoring.
So let's remove it. We can always add it back later if we need it
again.

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:27 PM
indygreg retitled this revision from wireproto: remove unused proto argument from supportedcompengines to wireproto: remove unused proto argument from supportedcompengines (API).Feb 7 2018, 11:32 PM
indygreg updated this revision to Diff 5338.
indygreg updated this revision to Diff 5349.Feb 8 2018, 12:20 AM
durin42 accepted this revision.Feb 12 2018, 4:23 PM
This revision is now accepted and ready to land.Feb 12 2018, 4:23 PM
Closed by commit rHG038bcb759b75: wireproto: remove unused proto argument from supportedcompengines (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/wireproto.py (4 lines)
Mmercurial/wireprotoserver.py (2 lines)

Diff 5532

mercurial/wireproto.py

if gd: if gd:
v = ui.configbool('server', 'bundle1gd') v = ui.configbool('server', 'bundle1gd')
if v is not None: if v is not None:
return v return v
return ui.configbool('server', 'bundle1') return ui.configbool('server', 'bundle1')
def supportedcompengines(ui, proto, role): def supportedcompengines(ui, role):
"""Obtain the list of supported compression engines for a request.""" """Obtain the list of supported compression engines for a request."""
assert role in (util.CLIENTROLE, util.SERVERROLE) assert role in (util.CLIENTROLE, util.SERVERROLE)
compengines = util.compengines.supportedwireengines(role) compengines = util.compengines.supportedwireengines(role)
# Allow config to override default list and ordering. # Allow config to override default list and ordering.
if role == util.SERVERROLE: if role == util.SERVERROLE:
configengines = ui.configlist('server', 'compressionengines') configengines = ui.configlist('server', 'compressionengines')
repo.ui.configint('server', 'maxhttpheaderlen')) repo.ui.configint('server', 'maxhttpheaderlen'))
if repo.ui.configbool('experimental', 'httppostargs'): if repo.ui.configbool('experimental', 'httppostargs'):
caps.append('httppostargs') caps.append('httppostargs')
# FUTURE advertise 0.2rx once support is implemented # FUTURE advertise 0.2rx once support is implemented
# FUTURE advertise minrx and mintx after consulting config option # FUTURE advertise minrx and mintx after consulting config option
caps.append('httpmediatype=0.1rx,0.1tx,0.2tx') caps.append('httpmediatype=0.1rx,0.1tx,0.2tx')
compengines = supportedcompengines(repo.ui, proto, util.SERVERROLE) compengines = supportedcompengines(repo.ui, util.SERVERROLE)
if compengines: if compengines:
comptypes = ','.join(urlreq.quote(e.wireprotosupport().name) comptypes = ','.join(urlreq.quote(e.wireprotosupport().name)
for e in compengines) for e in compengines)
caps.append('compression=%s' % comptypes) caps.append('compression=%s' % comptypes)
return caps return caps
# If you are writing an extension and consider wrapping this function. Wrap # If you are writing an extension and consider wrapping this function. Wrap

mercurial/wireprotoserver.py

# Default as defined by wire protocol spec. # Default as defined by wire protocol spec.
compformats = ['zlib', 'none'] compformats = ['zlib', 'none']
for cap in protocaps: for cap in protocaps:
if cap.startswith('comp='): if cap.startswith('comp='):
compformats = cap[5:].split(',') compformats = cap[5:].split(',')
break break
# Now find an agreed upon compression format. # Now find an agreed upon compression format.
for engine in wireproto.supportedcompengines(self._ui, self, for engine in wireproto.supportedcompengines(self._ui,
util.SERVERROLE): util.SERVERROLE):
if engine.wireprotosupport().name in compformats: if engine.wireprotosupport().name in compformats:
opts = {} opts = {}
level = self._ui.configint('server', level = self._ui.configint('server',
'%slevel' % engine.name()) '%slevel' % engine.name())
if level is not None: if level is not None:
opts['level'] = level opts['level'] = level