This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1922

wireproto: don't compress errors from getbundle()
ClosedPublic

Authored by indygreg on Jan 20 2018, 7:44 PM.

Details

Reviewers
lothiraldan
durin42
Group Reviewers
hg-reviewers
Commits
rHG9d249f3de730: wireproto: don't compress errors from getbundle()
Summary

Errors should be small. There's no real need to compress them.
Truth be told, there's no good reason to not compress them either.
But leaving them uncompressed makes it easier to test failures
by looking at the raw HTTP response. This makes it easier for us
to write tests. It may make it easier for people writing their
own clients.

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.Jan 20 2018, 7:44 PM
lothiraldan accepted this revision.Jan 22 2018, 10:44 AM
durin42 accepted this revision.Jan 22 2018, 3:00 PM
This revision is now accepted and ready to land.Jan 22 2018, 3:00 PM
Closed by commit rHG9d249f3de730: wireproto: don't compress errors from getbundle() (authored by indygreg). · Explain WhyJan 22 2018, 3:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireproto.py (8 lines)

Diff 4980

mercurial/wireproto.py

if not bundle1allowed(repo, 'pull'): if not bundle1allowed(repo, 'pull'):
if not exchange.bundle2requested(opts.get('bundlecaps')): if not exchange.bundle2requested(opts.get('bundlecaps')):
if proto.name == 'http': if proto.name == 'http':
return ooberror(bundle2required) return ooberror(bundle2required)
raise error.Abort(bundle2requiredmain, raise error.Abort(bundle2requiredmain,
hint=bundle2requiredhint) hint=bundle2requiredhint)
preferuncompressed = False
try: try:
if repo.ui.configbool('server', 'disablefullbundle'): if repo.ui.configbool('server', 'disablefullbundle'):
# Check to see if this is a full clone. # Check to see if this is a full clone.
clheads = set(repo.changelog.heads()) clheads = set(repo.changelog.heads())
changegroup = opts.get('cg', True) changegroup = opts.get('cg', True)
heads = set(opts.get('heads', set())) heads = set(opts.get('heads', set()))
common = set(opts.get('common', set())) common = set(opts.get('common', set()))
common.discard(nullid) common.discard(nullid)
# bundle2 request expect a bundle2 reply # bundle2 request expect a bundle2 reply
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
manargs = [('message', str(exc))] manargs = [('message', str(exc))]
advargs = [] advargs = []
if exc.hint is not None: if exc.hint is not None:
advargs.append(('hint', exc.hint)) advargs.append(('hint', exc.hint))
bundler.addpart(bundle2.bundlepart('error:abort', bundler.addpart(bundle2.bundlepart('error:abort',
manargs, advargs)) manargs, advargs))
return streamres(gen=bundler.getchunks()) chunks = bundler.getchunks()
return streamres(gen=chunks) preferuncompressed = True
return streamres(gen=chunks, prefer_uncompressed=preferuncompressed)
@wireprotocommand('heads') @wireprotocommand('heads')
def heads(repo, proto): def heads(repo, proto):
h = repo.heads() h = repo.heads()
return encodelist(h) + "\n" return encodelist(h) + "\n"
@wireprotocommand('hello') @wireprotocommand('hello')
def hello(repo, proto): def hello(repo, proto):