This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3170

wireproto: don't special case bundlecaps, but sort all scsv arguments
ClosedPublic

Authored by joerg.sonnenberger on Apr 6 2018, 5:39 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG1d459f61b42a: wireproto: don't special case bundlecaps, but sort all scsv arguments
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg accepted this revision.Apr 6 2018, 6:03 PM
indygreg added a subscriber: indygreg.

scsv types are parsed into a set. So this should pose no BC problems.

This revision is now accepted and ready to land.Apr 6 2018, 6:03 PM
Closed by commit rHG1d459f61b42a: wireproto: don't special case bundlecaps, but sort all scsv arguments (authored by joerg.sonnenberger). · Explain WhyApr 6 2018, 6:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireproto.py (10 lines)

Diff 7807

mercurial/wireproto.py

def stream_out(self): def stream_out(self):
return self._callstream('stream_out') return self._callstream('stream_out')
def getbundle(self, source, **kwargs): def getbundle(self, source, **kwargs):
kwargs = pycompat.byteskwargs(kwargs) kwargs = pycompat.byteskwargs(kwargs)
self.requirecap('getbundle', _('look up remote changes')) self.requirecap('getbundle', _('look up remote changes'))
opts = {} opts = {}
bundlecaps = kwargs.get('bundlecaps') bundlecaps = kwargs.get('bundlecaps') or set()
if bundlecaps is not None:
kwargs['bundlecaps'] = sorted(bundlecaps)
else:
bundlecaps = () # kwargs could have it to None
for key, value in kwargs.iteritems(): for key, value in kwargs.iteritems():
if value is None: if value is None:
continue continue
keytype = gboptsmap.get(key) keytype = gboptsmap.get(key)
if keytype is None: if keytype is None:
raise error.ProgrammingError( raise error.ProgrammingError(
'Unexpectedly None keytype for key %s' % key) 'Unexpectedly None keytype for key %s' % key)
elif keytype == 'nodes': elif keytype == 'nodes':
value = encodelist(value) value = encodelist(value)
elif keytype in ('csv', 'scsv'): elif keytype == 'csv':
value = ','.join(value) value = ','.join(value)
elif keytype == 'scsv':
value = ','.join(sorted(value))
elif keytype == 'boolean': elif keytype == 'boolean':
value = '%i' % bool(value) value = '%i' % bool(value)
elif keytype != 'plain': elif keytype != 'plain':
raise KeyError('unknown getbundle option type %s' raise KeyError('unknown getbundle option type %s'
% keytype) % keytype)
opts[key] = value opts[key] = value
f = self._callcompressable("getbundle", **pycompat.strkwargs(opts)) f = self._callcompressable("getbundle", **pycompat.strkwargs(opts))
if any((cap.startswith('HG2') for cap in bundlecaps)): if any((cap.startswith('HG2') for cap in bundlecaps)):