# HG changeset patch # User Pierre-Yves David # Date 2014-04-17 18:37:24 # Node ID 15039ce3e4a39c85d30113b12dc44f5907d62450 # Parent d8dd19e09ed4a7003dddd4a5871aac9cd33ea9d0 bundle2: include client capabilities in the pushed bundle The necessary data is now included in the `replycaps` part. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -210,7 +210,9 @@ def _pushbundle2(pushop): capsblob = urllib.unquote(pushop.remote.capable('bundle2')) caps = bundle2.decodecaps(capsblob) bundler = bundle2.bundle20(pushop.ui, caps) - bundler.addpart(bundle2.bundlepart('replycaps')) + # create reply capability + capsblob = bundle2.encodecaps(pushop.repo.bundle2caps) + bundler.addpart(bundle2.bundlepart('replycaps', data=capsblob)) if not pushop.force: part = bundle2.bundlepart('CHECK:HEADS', data=iter(pushop.remoteheads)) bundler.addpart(part)