revbranchcache: disable the new part for narrow hg bundle
authorBoris Feld <boris.feld@octobus.net>
Wed, 21 Feb 2018 19:26:41 +0100
changeset 36967 f62873dba3fd
parent 36966 c0e90df1ab1e
child 36968 2090044a288d
revbranchcache: disable the new part for narrow hg bundle The lack of some revisions confuses the new cache part. To simplify things, we disable it for now.
hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py	Thu Jan 18 14:58:02 2018 +0100
+++ b/hgext/narrow/narrowbundle2.py	Wed Feb 21 19:26:41 2018 +0100
@@ -479,6 +479,19 @@
             origcgfn(*args, **kwargs)
     exchange.getbundle2partsmapping['changegroup'] = wrappedcgfn
 
+    # disable rev branch cache exchange when serving a narrow bundle
+    # (currently incompatible with that part)
+    origrbcfn = exchange.getbundle2partsmapping['cache:rev-branch-cache']
+    def wrappedcgfn(*args, **kwargs):
+        repo = args[1]
+        if repo.ui.has_section(_NARROWACL_SECTION):
+            return
+        elif kwargs.get(r'narrow', False):
+            return
+        else:
+            origrbcfn(*args, **kwargs)
+    exchange.getbundle2partsmapping['cache:rev-branch-cache'] = wrappedcgfn
+
     # Extend changegroup receiver so client can fixup after widen requests.
     origcghandler = bundle2.parthandlermapping['changegroup']
     def wrappedcghandler(op, inpart):