# HG changeset patch
# User Boris Feld <boris.f...@octobus.net>
# Date 1519237601 -3600
# Wed Feb 21 19:26:41 2018 +0100
# Node ID 2811d9ca31137ca7a9cc7c8a37862cdbff87bbec
# Parent 56f869a852230bdbcff6ae3c366cb0d83f6cf757
# EXP-Topic wire-rbc
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
2811d9ca3113
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.
diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py
+++ b/hgext/narrow/narrowbundle2.py
@@ -479,6 +479,19 @@ def setup():
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('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):
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
