narrow: drop the bundle2 capability since we have server capabilities (BC)
authorPulkit Goyal <pulkit@yandex-team.ru>
Fri, 05 Oct 2018 23:10:56 +0300
changeset 40789 e3792741e3fb
parent 40788 34f15db81cf0
child 40790 c85964d715fd
narrow: drop the bundle2 capability since we have server capabilities (BC) This patch drops the narrow bundle2 capabilities since we introduced narrow server capabilities which are more nice and now used everywhere. I am not sure what it can affect, so on safe side I marked this as BC. Also I removed the NARROWCAP constant as that kind of conflicts with the same name constant in wireprototypes.py. Differential Revision: https://phab.mercurial-scm.org/D4892
hgext/narrow/narrowbundle2.py
tests/test-narrow-clone-non-narrow-server.t
--- a/hgext/narrow/narrowbundle2.py	Sun Jul 02 04:06:24 2017 +0200
+++ b/hgext/narrow/narrowbundle2.py	Fri Oct 05 23:10:56 2018 +0300
@@ -20,7 +20,6 @@
     changegroup,
     error,
     exchange,
-    extensions,
     narrowspec,
     repair,
     repository,
@@ -31,10 +30,9 @@
     stringutil,
 )
 
-NARROWCAP = 'narrow'
 _NARROWACL_SECTION = 'narrowhgacl'
-_CHANGESPECPART = NARROWCAP + ':changespec'
-_SPECPART = NARROWCAP + ':spec'
+_CHANGESPECPART = 'narrow:changespec'
+_SPECPART = 'narrow:spec'
 _SPECPART_INCLUDE = 'include'
 _SPECPART_EXCLUDE = 'exclude'
 _KILLNODESIGNAL = 'KILL'
@@ -44,12 +42,6 @@
 _CSHEADERSIZE = struct.calcsize(_ELIDEDCSHEADER)
 _MFHEADERSIZE = struct.calcsize(_ELIDEDMFHEADER)
 
-# When advertising capabilities, always include narrow clone support.
-def getrepocaps_narrow(orig, repo, **kwargs):
-    caps = orig(repo, **kwargs)
-    caps[NARROWCAP] = ['v0']
-    return caps
-
 # Serve a changegroup for a client with a narrow clone.
 def getbundlechangegrouppart_narrow(bundler, repo, source,
                                     bundlecaps=None, b2caps=None, heads=None,
@@ -252,8 +244,6 @@
 
 def setup():
     """Enable narrow repo support in bundle2-related extension points."""
-    extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow)
-
     getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS
 
     getbundleargs['narrow'] = 'boolean'
--- a/tests/test-narrow-clone-non-narrow-server.t	Sun Jul 02 04:06:24 2017 +0200
+++ b/tests/test-narrow-clone-non-narrow-server.t	Fri Oct 05 23:10:56 2018 +0300
@@ -32,7 +32,6 @@
   > EOF
   $ echo hello | hg -R . serve --stdio | \
   >   "$PYTHON" unquote.py | tr ' ' '\n' | grep narrow
-  narrow=v0
   exp-narrow-1
 
   $ cd ..