This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4934

narrow: don't compress the bundle2 when sending 'error:abort'
ClosedPublic

Authored by pulkit on Oct 10 2018, 12:51 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG74558635dad5: narrow: don't compress the bundle2 when sending 'error:abort'
rHGb9a07a58b44d: narrow: don't compress the bundle2 when sending 'error:abort'
Summary

This is similar to waht getbundle() does and also explicitly specifies that we
should get a compressed bundle2 in normal cases when not sending 'error:abort'.

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

pulkit created this revision.Oct 10 2018, 12:51 PM
Closed by commit rHGb9a07a58b44d: narrow: don't compress the bundle2 when sending 'error:abort' (authored by pulkit). · Explain WhyOct 11 2018, 7:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowwirepeer.py (5 lines)

Diff 11801

hgext/narrow/narrowwirepeer.py

newincludes: the new includes of the narrow copy newincludes: the new includes of the narrow copy
newexcludes: the new excludes of the narrow copy newexcludes: the new excludes of the narrow copy
commonheads: list of heads which are common between the server and client commonheads: list of heads which are common between the server and client
cgversion(maybe): the changegroup version to produce cgversion(maybe): the changegroup version to produce
known: list of nodes which are known on the client (used in ellipses cases) known: list of nodes which are known on the client (used in ellipses cases)
ellipses: whether to send ellipses data or not ellipses: whether to send ellipses data or not
""" """
preferuncompressed = False
try: try:
oldincludes = wireprototypes.decodelist(oldincludes) oldincludes = wireprototypes.decodelist(oldincludes)
newincludes = wireprototypes.decodelist(newincludes) newincludes = wireprototypes.decodelist(newincludes)
oldexcludes = wireprototypes.decodelist(oldexcludes) oldexcludes = wireprototypes.decodelist(oldexcludes)
newexcludes = wireprototypes.decodelist(newexcludes) newexcludes = wireprototypes.decodelist(newexcludes)
# validate the patterns # validate the patterns
narrowspec.validatepatterns(set(oldincludes)) narrowspec.validatepatterns(set(oldincludes))
narrowspec.validatepatterns(set(newincludes)) narrowspec.validatepatterns(set(newincludes))
cgversion, ellipses) cgversion, ellipses)
except error.Abort as exc: except error.Abort as exc:
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
manargs = [('message', pycompat.bytestr(exc))] manargs = [('message', pycompat.bytestr(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', manargs, advargs)) bundler.addpart(bundle2.bundlepart('error:abort', manargs, advargs))
preferuncompressed = True
chunks = bundler.getchunks() chunks = bundler.getchunks()
return wireprototypes.streamres(gen=chunks) return wireprototypes.streamres(gen=chunks,
prefer_uncompressed=preferuncompressed)
def peernarrowwiden(remote, **kwargs): def peernarrowwiden(remote, **kwargs):
for ch in ('oldincludes', 'newincludes', 'oldexcludes', 'newexcludes', for ch in ('oldincludes', 'newincludes', 'oldexcludes', 'newexcludes',
'commonheads', 'known'): 'commonheads', 'known'):
kwargs[ch] = wireprototypes.encodelist(kwargs[ch]) kwargs[ch] = wireprototypes.encodelist(kwargs[ch])
kwargs['ellipses'] = '%i' % bool(kwargs['ellipses']) kwargs['ellipses'] = '%i' % bool(kwargs['ellipses'])
f = remote._callcompressable('narrow_widen', **kwargs) f = remote._callcompressable('narrow_widen', **kwargs)
return bundle2.getunbundler(remote.ui, f) return bundle2.getunbundler(remote.ui, f)