| durin42 | |
| indygreg |
| hg-reviewers |
These are not bundle2 capabilities (they just happened to share the
name "narrow"), so they seem to belong with the wirepeer overrides.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowbundle2.py (1 line) | |||
| M | hgext/narrow/narrowcommands.py (6 lines) | |||
| M | hgext/narrow/narrowrepo.py (6 lines) | |||
| M | hgext/narrow/narrowwirepeer.py (7 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| util, | util, | ||||
| wireprototypes, | wireprototypes, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | from mercurial.utils import ( | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| NARROWCAP = 'narrow' | NARROWCAP = 'narrow' | ||||
| ELLIPSESCAP = 'ellipses' | |||||
| _NARROWACL_SECTION = 'narrowhgacl' | _NARROWACL_SECTION = 'narrowhgacl' | ||||
| _CHANGESPECPART = NARROWCAP + ':changespec' | _CHANGESPECPART = NARROWCAP + ':changespec' | ||||
| _SPECPART = NARROWCAP + ':spec' | _SPECPART = NARROWCAP + ':spec' | ||||
| _SPECPART_INCLUDE = 'include' | _SPECPART_INCLUDE = 'include' | ||||
| _SPECPART_EXCLUDE = 'exclude' | _SPECPART_EXCLUDE = 'exclude' | ||||
| _KILLNODESIGNAL = 'KILL' | _KILLNODESIGNAL = 'KILL' | ||||
| _DONESIGNAL = 'DONE' | _DONESIGNAL = 'DONE' | ||||
| _ELIDEDCSHEADER = '>20s20s20sl' # cset id, p1, p2, len(text) | _ELIDEDCSHEADER = '>20s20s20sl' # cset id, p1, p2, len(text) | ||||
| repair, | repair, | ||||
| repository, | repository, | ||||
| repoview, | repoview, | ||||
| sparse, | sparse, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from . import ( | from . import ( | ||||
| narrowbundle2, | narrowwirepeer, | ||||
| ) | ) | ||||
| table = {} | table = {} | ||||
| command = registrar.command(table) | command = registrar.command(table) | ||||
| def setup(): | def setup(): | ||||
| """Wraps user-facing mercurial commands with narrow-aware versions.""" | """Wraps user-facing mercurial commands with narrow-aware versions.""" | ||||
| 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 narrowbundle2.NARROWCAP not in pullop.remote.capabilities(): | if narrowwirepeer.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 | ||||
| # calculate known nodes only in ellipses cases because in non-ellipses cases | # calculate known nodes only in ellipses cases because in non-ellipses cases | ||||
| # we have all the nodes | # we have all the nodes | ||||
| if narrowbundle2.ELLIPSESCAP in pullop.remote.capabilities(): | if narrowwirepeer.ELLIPSESCAP in pullop.remote.capabilities(): | ||||
| kwargs['known'] = [node.hex(ctx.node()) for ctx in | kwargs['known'] = [node.hex(ctx.node()) for ctx in | ||||
| repo.set('::%ln', pullop.common) | repo.set('::%ln', pullop.common) | ||||
| if ctx.node() != node.nullid] | if ctx.node() != node.nullid] | ||||
| if not kwargs['known']: | if not kwargs['known']: | ||||
| # Mercurial serializes an empty list as '' and deserializes it as | # Mercurial serializes an empty list as '' and deserializes it as | ||||
| # [''], so delete it instead to avoid handling the empty string on | # [''], so delete it instead to avoid handling the empty string on | ||||
| # the server. | # the server. | ||||
| del kwargs['known'] | del kwargs['known'] | ||||
| # 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 . import ( | from . import ( | ||||
| narrowbundle2, | |||||
| narrowdirstate, | narrowdirstate, | ||||
| narrowrevlog, | narrowrevlog, | ||||
| 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 file(self, f): | def file(self, f): | ||||
| fl = super(narrowrepository, self).file(f) | fl = super(narrowrepository, self).file(f) | ||||
| narrowrevlog.makenarrowfilelog(fl, self.narrowmatch()) | narrowrevlog.makenarrowfilelog(fl, self.narrowmatch()) | ||||
| return fl | return fl | ||||
| 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(narrowbundle2.NARROWCAP) | peer._caps.add(narrowwirepeer.NARROWCAP) | ||||
| peer._caps.add(narrowbundle2.ELLIPSESCAP) | peer._caps.add(narrowwirepeer.ELLIPSESCAP) | ||||
| return peer | return peer | ||||
| repo.__class__ = narrowrepository | repo.__class__ = narrowrepository | ||||
| error, | error, | ||||
| extensions, | extensions, | ||||
| hg, | hg, | ||||
| narrowspec, | narrowspec, | ||||
| node, | node, | ||||
| wireprotov1server, | wireprotov1server, | ||||
| ) | ) | ||||
| from . import narrowbundle2 | NARROWCAP = 'narrow' | ||||
| ELLIPSESCAP = 'ellipses' | |||||
| def uisetup(): | def uisetup(): | ||||
| def peersetup(ui, peer): | def peersetup(ui, peer): | ||||
| # We must set up the expansion before reposetup below, since it's used | # We must set up the expansion before reposetup below, since it's used | ||||
| # at clone time before we have a repo. | # at clone time before we have a repo. | ||||
| class expandingpeer(peer.__class__): | class expandingpeer(peer.__class__): | ||||
| def expandnarrow(self, narrow_include, narrow_exclude, nodes): | def expandnarrow(self, narrow_include, narrow_exclude, nodes): | ||||
| ui.status(_("expanding narrowspec\n")) | ui.status(_("expanding narrowspec\n")) | ||||
| peer.__class__ = expandingpeer | peer.__class__ = expandingpeer | ||||
| hg.wirepeersetupfuncs.append(peersetup) | hg.wirepeersetupfuncs.append(peersetup) | ||||
| 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(narrowbundle2.NARROWCAP) | caps.append(NARROWCAP) | ||||
| if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): | if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): | ||||
| caps.append(narrowbundle2.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) | ||||