Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
narrow: move adding of narrow server capabilities to core
authorPulkit Goyal <pulkit@yandex-team.ru>
Fri, 05 Oct 2018 22:52:24 +0300
changeset 40075 ad8d8dc9be3f
parent 40074 f7011b44d205
child 40076 2e9378f62232
narrow: move adding of narrow server capabilities to core 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. Differential Revision: https://phab.mercurial-scm.org/D4891
hgext/narrow/narrowwirepeer.py file | annotate | diff | comparison | revisions
mercurial/wireprotov1server.py file | annotate | diff | comparison | revisions 
--- a/hgext/narrow/narrowwirepeer.py	Fri Oct 05 22:31:12 2018 +0300
+++ b/hgext/narrow/narrowwirepeer.py	Fri Oct 05 22:52:24 2018 +0300
@@ -21,17 +21,8 @@
 )
 
 def uisetup():
-    extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap)
     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 wirereposetup(ui, peer):
         def wrapped(orig, cmd, *args, **kwargs):
--- a/mercurial/wireprotov1server.py	Fri Oct 05 22:31:12 2018 +0300
+++ b/mercurial/wireprotov1server.py	Fri Oct 05 22:52:24 2018 +0300
@@ -286,6 +286,11 @@
         caps.append('bundle2=' + urlreq.quote(capsblob))
     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)
 
 # If you are writing an extension and consider wrapping this function. Wrap
mercurial