This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5119

exchange: pass includepats and excludepats as arguments to getbundle()
ClosedPublic

Authored by pulkit on Oct 16 2018, 12:13 PM.

Details

Reviewers
indygreg
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG440f5b65be57: exchange: pass includepats and excludepats as arguments to getbundle()
Summary

This will help in implementing narrow stream clones. Also narrow extension used
to add these arguments, now we add them by default if they are not empty.

Since reading includepats and excludepats on the server only works when narrow
is enabled, we check if narrow if enabled or not before passing them.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 16 2018, 12:13 PM
indygreg requested changes to this revision.Oct 16 2018, 12:47 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/exchange.py
1639

I'd prefer if we didn't send empty arguments across the wire if it can be avoided. I'm pretty sure it can be avoided in this case.

More importantly, the sending of these arguments needs to be conditional on a server capabilitiy because servers barf when receiving an unknown argument (the type of the argument isn't registered and servers barf when trying to decode the argument value).

This revision now requires changes to proceed.Oct 16 2018, 12:47 PM
pulkit edited the summary of this revision. (Show Details)Oct 17 2018, 10:52 AM
pulkit updated this revision to Diff 12207.
indygreg accepted this revision.Oct 17 2018, 11:15 AM
This revision is now accepted and ready to land.Oct 17 2018, 11:15 AM
pulkit updated this revision to Diff 12231.Oct 18 2018, 6:38 AM
pulkit updated this revision to Diff 12258.Oct 19 2018, 9:01 AM
Closed by commit rHG440f5b65be57: exchange: pass includepats and excludepats as arguments to getbundle() (authored by pulkit). · Explain WhyNov 5 2018, 11:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12231

hgext/narrow/narrowbundle2.py

extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow) extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow)
getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS
getbundleargs['narrow'] = 'boolean' getbundleargs['narrow'] = 'boolean'
getbundleargs['depth'] = 'plain' getbundleargs['depth'] = 'plain'
getbundleargs['oldincludepats'] = 'csv' getbundleargs['oldincludepats'] = 'csv'
getbundleargs['oldexcludepats'] = 'csv' getbundleargs['oldexcludepats'] = 'csv'
getbundleargs['includepats'] = 'csv'
getbundleargs['excludepats'] = 'csv'
getbundleargs['known'] = 'csv' getbundleargs['known'] = 'csv'
# Extend changegroup serving to handle requests from narrow clients. # Extend changegroup serving to handle requests from narrow clients.
origcgfn = exchange.getbundle2partsmapping['changegroup'] origcgfn = exchange.getbundle2partsmapping['changegroup']
def wrappedcgfn(*args, **kwargs): def wrappedcgfn(*args, **kwargs):
repo = args[1] repo = args[1]
if repo.ui.has_section(_NARROWACL_SECTION): if repo.ui.has_section(_NARROWACL_SECTION):
kwargs = exchange.applynarrowacl(repo, kwargs) kwargs = exchange.applynarrowacl(repo, kwargs)

mercurial/exchange.py

pushkey, pushkey,
pycompat, pycompat,
repository, repository,
scmutil, scmutil,
sslutil, sslutil,
streamclone, streamclone,
url as urlmod, url as urlmod,
util, util,
wireprototypes,
) )
from .utils import ( from .utils import (
stringutil, stringutil,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
# At the moment we don't do stream clones over bundle2. If that is # At the moment we don't do stream clones over bundle2. If that is
# implemented then here's where the check for that will go. # implemented then here's where the check for that will go.
streaming = streamclone.canperformstreamclone(pullop, bundle2=True)[0] streaming = streamclone.canperformstreamclone(pullop, bundle2=True)[0]
# declare pull perimeters # declare pull perimeters
kwargs['common'] = pullop.common kwargs['common'] = pullop.common
kwargs['heads'] = pullop.heads or pullop.rheads kwargs['heads'] = pullop.heads or pullop.rheads
# check server supports narrow and then adding includepats and excludepats
servernarrow = pullop.remote.capable(wireprototypes.NARROWCAP)
if servernarrow and pullop.includepats:
indygregUnsubmitted
Not Done

I'd prefer if we didn't send empty arguments across the wire if it can be avoided. I'm pretty sure it can be avoided in this case.

More importantly, the sending of these arguments needs to be conditional on a server capabilitiy because servers barf when receiving an unknown argument (the type of the argument isn't registered and servers barf when trying to decode the argument value).

indygreg: I'd prefer if we didn't send empty arguments across the wire if it can be avoided. I'm pretty…
kwargs['includepats'] = pullop.includepats
if servernarrow and pullop.excludepats:
kwargs['excludepats'] = pullop.excludepats
if streaming: if streaming:
kwargs['cg'] = False kwargs['cg'] = False
kwargs['stream'] = True kwargs['stream'] = True
pullop.stepsdone.add('changegroup') pullop.stepsdone.add('changegroup')
pullop.stepsdone.add('phases') pullop.stepsdone.add('phases')
else: else:
# pulling changegroup # pulling changegroup

mercurial/wireprototypes.py

'common': 'nodes', 'common': 'nodes',
'obsmarkers': 'boolean', 'obsmarkers': 'boolean',
'phases': 'boolean', 'phases': 'boolean',
'bundlecaps': 'scsv', 'bundlecaps': 'scsv',
'listkeys': 'csv', 'listkeys': 'csv',
'cg': 'boolean', 'cg': 'boolean',
'cbattempted': 'boolean', 'cbattempted': 'boolean',
'stream': 'boolean', 'stream': 'boolean',
'includepats': 'csv',
'excludepats': 'csv',
} }
class baseprotocolhandler(interfaceutil.Interface): class baseprotocolhandler(interfaceutil.Interface):
"""Abstract base class for wire protocol handlers. """Abstract base class for wire protocol handlers.
A wire protocol handler serves as an interface between protocol command A wire protocol handler serves as an interface between protocol command
handlers and the wire protocol transport layer. Protocol handlers provide handlers and the wire protocol transport layer. Protocol handlers provide
methods to read command arguments, redirect stdio for the duration of methods to read command arguments, redirect stdio for the duration of