This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4784

streamclone: pass includes and excludes to stream_out wireprotocol cmd
AbandonedPublic

Authored by pulkit on Sep 27 2018, 4:27 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Summary

This adds client side logic to pass includes and excludes to the stream_out()
wireprotocol command. Tests are not added because there is not server side logic
yet to filter out data to stream.

  1. no-check-commit because it touches a function with foo_bar naming

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 27 2018, 4:27 PM
indygreg requested changes to this revision.Oct 1 2018, 1:22 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/streamclone.py
141

I think we also want to make this conditional on a narrow stream clone actually being requested. i.e. don't send the arguments unless they have values.

mercurial/wireprotov1peer.py
412

Nit: don't use mutable values as default argument values.

This revision now requires changes to proceed.Oct 1 2018, 1:22 PM
pulkit abandoned this revision.Jan 29 2019, 6:58 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/streamclone.py (13 lines)
Mmercurial/wireprotov1peer.py (6 lines)

Diff 11456

mercurial/streamclone.py

# creation. # creation.
rbranchmap = None rbranchmap = None
if remote.capable('branchmap'): if remote.capable('branchmap'):
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
rbranchmap = e.callcommand('branchmap', {}).result() rbranchmap = e.callcommand('branchmap', {}).result()
repo.ui.status(_('streaming all changes\n')) repo.ui.status(_('streaming all changes\n'))
narrowsupport = (remote.capable('narrowstream') and
remote.capable('exp-narrow-1'))
if (pullop.includepats or pullop.excludepats) and not narrowsupport:
repo.ui.status(_('server does not support narrow stream clones, cloning'
' full repository\n'))
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
if narrowsupport:
indygregUnsubmitted
Not Done

I think we also want to make this conditional on a narrow stream clone actually being requested. i.e. don't send the arguments unless they have values.

indygreg: I think we also want to make this conditional on a narrow stream clone actually being requested.
args = {}
args['includes'] = pullop.includepats
args['excludes'] = pullop.excludepats
fp = e.callcommand('stream_out', args).result()
else:
fp = e.callcommand('stream_out', {}).result() fp = e.callcommand('stream_out', {}).result()
# TODO strictly speaking, this code should all be inside the context # TODO strictly speaking, this code should all be inside the context
# manager because the context manager is supposed to ensure all wire state # manager because the context manager is supposed to ensure all wire state
# is flushed when exiting. But the legacy peers don't do this, so it # is flushed when exiting. But the legacy peers don't do this, so it
# doesn't matter. # doesn't matter.
l = fp.readline() l = fp.readline()
try: try:
resp = int(l) resp = int(l)

mercurial/wireprotov1peer.py

d = bool(int(d)) d = bool(int(d))
except ValueError: except ValueError:
raise error.ResponseError( raise error.ResponseError(
_('push failed (unexpected response):'), d) _('push failed (unexpected response):'), d)
for l in output.splitlines(True): for l in output.splitlines(True):
self.ui.status(_('remote: '), l) self.ui.status(_('remote: '), l)
yield d yield d
def stream_out(self): def stream_out(self, includes=[], excludes=[]):
indygregUnsubmitted
Not Done

Nit: don't use mutable values as default argument values.

indygreg: Nit: don't use mutable values as default argument values.
return self._callstream('stream_out') i = wireprototypes.encodelist(includes)
e = wireprototypes.encodelist(excludes)
return self._callstream('stream_out', includes=i, excludes=e)
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') or set() bundlecaps = kwargs.get('bundlecaps') or set()
for key, value in kwargs.iteritems(): for key, value in kwargs.iteritems():
if value is None: if value is None: