# HG changeset patch # User Pierre-Yves David # Date 1489535808 25200 # Node ID e9d5f54765a27e09d35f48dda23db7e6f5b8320a # Parent 39d84b395343e718968e61f824332f4ce816f4fa exchange: fix some wrong reference to serveronly The function have all moved into 'obsexchange' now, so we do not need (and actually cannot) seek them in 'evolve.serveronly'. diff -r 39d84b395343 -r e9d5f54765a2 hgext3rd/evolve/obsexchange.py --- a/hgext3rd/evolve/obsexchange.py Tue Mar 14 15:50:43 2017 -0700 +++ b/hgext3rd/evolve/obsexchange.py Tue Mar 14 16:56:48 2017 -0700 @@ -34,7 +34,6 @@ from . import ( exthelper, - serveronly, utility, obsdiscovery, ) @@ -338,7 +337,7 @@ @eh.addattr(localrepo.localpeer, 'evoext_pushobsmarkers_0') def local_pushobsmarkers(peer, obsfile): data = obsfile.read() - serveronly._pushobsmarkers(peer._repo, data) + _pushobsmarkers(peer._repo, data) # compat-code: _pullobsolete # @@ -417,8 +416,8 @@ @eh.addattr(localrepo.localpeer, 'evoext_pullobsmarkers_0') def local_pullobsmarkers(self, heads=None, common=None): - return serveronly._getobsmarkersstream(self._repo, heads=heads, - common=common) + return _getobsmarkersstream(self._repo, heads=heads, + common=common) def _legacypush_capabilities(orig, repo, proto): """wrapper to advertise new capability"""