| durin42 | |
| martinvonz |
| hg-reviewers |
We use the experimental.narrow config option introduced in one of the previous
patch and move the functionality of adding narrow server capabilities to core.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowwirepeer.py (9 lines) | |||
| M | mercurial/wireprotov1server.py (5 lines) |
| narrowspec, | narrowspec, | ||||
| pycompat, | pycompat, | ||||
| wireprototypes, | wireprototypes, | ||||
| wireprotov1peer, | wireprotov1peer, | ||||
| wireprotov1server, | wireprotov1server, | ||||
| ) | ) | ||||
| def uisetup(): | def uisetup(): | ||||
| extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap) | |||||
| wireprotov1peer.wirepeer.narrow_widen = peernarrowwiden | wireprotov1peer.wirepeer.narrow_widen = peernarrowwiden | ||||
| def addnarrowcap(orig, repo, proto): | |||||
| """add the narrow capability to the server""" | |||||
| caps = orig(repo, proto) | |||||
| caps.append(wireprototypes.NARROWCAP) | |||||
| if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): | |||||
| caps.append(wireprototypes.ELLIPSESCAP) | |||||
| return caps | |||||
| def reposetup(repo): | def reposetup(repo): | ||||
| def wirereposetup(ui, peer): | def wirereposetup(ui, peer): | ||||
| def wrapped(orig, cmd, *args, **kwargs): | def wrapped(orig, cmd, *args, **kwargs): | ||||
| if cmd == 'unbundle': | if cmd == 'unbundle': | ||||
| # TODO: don't blindly add include/exclude wireproto | # TODO: don't blindly add include/exclude wireproto | ||||
| # arguments to unbundle. | # arguments to unbundle. | ||||
| include, exclude = repo.narrowpats | include, exclude = repo.narrowpats | ||||
| kwargs[r"includepats"] = ','.join(include) | kwargs[r"includepats"] = ','.join(include) | ||||
| # otherwise, add 'streamreqs' detailing our local revlog format | # otherwise, add 'streamreqs' detailing our local revlog format | ||||
| else: | else: | ||||
| caps.append('streamreqs=%s' % ','.join(sorted(requiredformats))) | caps.append('streamreqs=%s' % ','.join(sorted(requiredformats))) | ||||
| if repo.ui.configbool('experimental', 'bundle2-advertise'): | if repo.ui.configbool('experimental', 'bundle2-advertise'): | ||||
| capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role='server')) | capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role='server')) | ||||
| caps.append('bundle2=' + urlreq.quote(capsblob)) | caps.append('bundle2=' + urlreq.quote(capsblob)) | ||||
| caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority)) | caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority)) | ||||
| if repo.ui.configbool('experimental', 'narrow'): | |||||
| caps.append(wireprototypes.NARROWCAP) | |||||
| if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): | |||||
| caps.append(wireprototypes.ELLIPSESCAP) | |||||
| return proto.addcapabilities(repo, caps) | return proto.addcapabilities(repo, caps) | ||||
| # If you are writing an extension and consider wrapping this function. Wrap | # If you are writing an extension and consider wrapping this function. Wrap | ||||
| # `_capabilities` instead. | # `_capabilities` instead. | ||||
| @wireprotocommand('capabilities', permission='pull') | @wireprotocommand('capabilities', permission='pull') | ||||
| def capabilities(repo, proto): | def capabilities(repo, proto): | ||||
| caps = _capabilities(repo, proto) | caps = _capabilities(repo, proto) | ||||
| return wireprototypes.bytesresponse(' '.join(sorted(caps))) | return wireprototypes.bytesresponse(' '.join(sorted(caps))) | ||||