| durin42 | |
| indygreg |
| hg-reviewers |
We are trying to integrate the whole of narrow logic into core and it will be
helpful for upcoming patches to have these capability names in core. The next
patch will move the ellipses capability to core also.
The exact motivation is to know whether we are cloning a ellipses repo or not
and adding an ellipses repo requirement.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowcommands.py (3 lines) | |||
| M | hgext/narrow/narrowrepo.py (6 lines) | |||
| M | hgext/narrow/narrowwirepeer.py (4 lines) | |||
| M | mercurial/wireprotoserver.py (2 lines) |
| node, | node, | ||||
| pycompat, | pycompat, | ||||
| registrar, | registrar, | ||||
| repair, | repair, | ||||
| repository, | repository, | ||||
| repoview, | repoview, | ||||
| sparse, | sparse, | ||||
| util, | util, | ||||
| wireprotoserver, | |||||
| ) | ) | ||||
| from . import ( | from . import ( | ||||
| narrowwirepeer, | narrowwirepeer, | ||||
| ) | ) | ||||
| table = {} | table = {} | ||||
| command = registrar.command(table) | command = registrar.command(table) | ||||
| opts[r'exclude'] = excludes | opts[r'exclude'] = excludes | ||||
| return orig(ui, repo, *args, **opts) | return orig(ui, repo, *args, **opts) | ||||
| def pullbundle2extraprepare(orig, pullop, kwargs): | def pullbundle2extraprepare(orig, pullop, kwargs): | ||||
| repo = pullop.repo | repo = pullop.repo | ||||
| if repository.NARROW_REQUIREMENT not in repo.requirements: | if repository.NARROW_REQUIREMENT not in repo.requirements: | ||||
| return orig(pullop, kwargs) | return orig(pullop, kwargs) | ||||
| if narrowwirepeer.NARROWCAP not in pullop.remote.capabilities(): | if wireprotoserver.NARROWCAP not in pullop.remote.capabilities(): | ||||
| raise error.Abort(_("server doesn't support narrow clones")) | raise error.Abort(_("server doesn't support narrow clones")) | ||||
| orig(pullop, kwargs) | orig(pullop, kwargs) | ||||
| kwargs['narrow'] = True | kwargs['narrow'] = True | ||||
| include, exclude = repo.narrowpats | include, exclude = repo.narrowpats | ||||
| kwargs['oldincludepats'] = include | kwargs['oldincludepats'] = include | ||||
| kwargs['oldexcludepats'] = exclude | kwargs['oldexcludepats'] = exclude | ||||
| kwargs['includepats'] = include | kwargs['includepats'] = include | ||||
| kwargs['excludepats'] = exclude | kwargs['excludepats'] = exclude | ||||
| # narrowrepo.py - repository which supports narrow revlogs, lazy loading | # narrowrepo.py - repository which supports narrow revlogs, lazy loading | ||||
| # | # | ||||
| # Copyright 2017 Google, Inc. | # Copyright 2017 Google, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial import ( | |||||
| wireprotoserver, | |||||
| ) | |||||
| from . import ( | from . import ( | ||||
| narrowdirstate, | narrowdirstate, | ||||
| narrowwirepeer, | narrowwirepeer, | ||||
| ) | ) | ||||
| def wraprepo(repo): | def wraprepo(repo): | ||||
| """Enables narrow clone functionality on a single local repository.""" | """Enables narrow clone functionality on a single local repository.""" | ||||
| class narrowrepository(repo.__class__): | class narrowrepository(repo.__class__): | ||||
| def _makedirstate(self): | def _makedirstate(self): | ||||
| dirstate = super(narrowrepository, self)._makedirstate() | dirstate = super(narrowrepository, self)._makedirstate() | ||||
| return narrowdirstate.wrapdirstate(self, dirstate) | return narrowdirstate.wrapdirstate(self, dirstate) | ||||
| def peer(self): | def peer(self): | ||||
| peer = super(narrowrepository, self).peer() | peer = super(narrowrepository, self).peer() | ||||
| peer._caps.add(narrowwirepeer.NARROWCAP) | peer._caps.add(wireprotoserver.NARROWCAP) | ||||
| peer._caps.add(narrowwirepeer.ELLIPSESCAP) | peer._caps.add(narrowwirepeer.ELLIPSESCAP) | ||||
| return peer | return peer | ||||
| repo.__class__ = narrowrepository | repo.__class__ = narrowrepository | ||||
| # narrowwirepeer.py - passes narrow spec with unbundle command | # narrowwirepeer.py - passes narrow spec with unbundle command | ||||
| # | # | ||||
| # Copyright 2017 Google, Inc. | # Copyright 2017 Google, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial import ( | from mercurial import ( | ||||
| extensions, | extensions, | ||||
| hg, | hg, | ||||
| wireprotoserver, | |||||
| wireprotov1server, | wireprotov1server, | ||||
| ) | ) | ||||
| NARROWCAP = 'exp-narrow-1' | |||||
| ELLIPSESCAP = 'exp-ellipses-1' | ELLIPSESCAP = 'exp-ellipses-1' | ||||
| def uisetup(): | def uisetup(): | ||||
| extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap) | extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap) | ||||
| def addnarrowcap(orig, repo, proto): | def addnarrowcap(orig, repo, proto): | ||||
| """add the narrow capability to the server""" | """add the narrow capability to the server""" | ||||
| caps = orig(repo, proto) | caps = orig(repo, proto) | ||||
| caps.append(NARROWCAP) | caps.append(wireprotoserver.NARROWCAP) | ||||
| if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): | if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): | ||||
| caps.append(ELLIPSESCAP) | caps.append(ELLIPSESCAP) | ||||
| return caps | 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) | ||||
| kwargs[r"excludepats"] = ','.join(exclude) | kwargs[r"excludepats"] = ','.join(exclude) | ||||
| return orig(cmd, *args, **kwargs) | return orig(cmd, *args, **kwargs) | ||||
| extensions.wrapfunction(peer, '_calltwowaystream', wrapped) | extensions.wrapfunction(peer, '_calltwowaystream', wrapped) | ||||
| hg.wirepeersetupfuncs.append(wirereposetup) | hg.wirepeersetupfuncs.append(wirereposetup) | ||||
| urlreq = util.urlreq | urlreq = util.urlreq | ||||
| HTTP_OK = 200 | HTTP_OK = 200 | ||||
| HGTYPE = 'application/mercurial-0.1' | HGTYPE = 'application/mercurial-0.1' | ||||
| HGTYPE2 = 'application/mercurial-0.2' | HGTYPE2 = 'application/mercurial-0.2' | ||||
| HGERRTYPE = 'application/hg-error' | HGERRTYPE = 'application/hg-error' | ||||
| NARROWCAP = 'exp-narrow-1' | |||||
| SSHV1 = wireprototypes.SSHV1 | SSHV1 = wireprototypes.SSHV1 | ||||
| SSHV2 = wireprototypes.SSHV2 | SSHV2 = wireprototypes.SSHV2 | ||||
| def decodevaluefromheaders(req, headerprefix): | def decodevaluefromheaders(req, headerprefix): | ||||
| """Decode a long value from multiple HTTP request headers. | """Decode a long value from multiple HTTP request headers. | ||||
| Returns the value as a bytes, not a str. | Returns the value as a bytes, not a str. | ||||
| """ | """ | ||||