# HG changeset patch # User Pierre-Yves David # Date 2014-05-22 19:58:07 # Node ID 75ff093d2763cf195883c4c79b8bcf3d18eaf8db # Parent 76a347bcdb33f4486c9df6301f03dd593f13f013 exchange: reinsert comment in the right place Unrelated new code was inserted between the original comment and the related code block. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -208,13 +208,13 @@ def _pushbundle2(pushop): The only currently supported type of data is changegroup but this will evolve in the future.""" - # Send known head to the server for race detection. capsblob = urllib.unquote(pushop.remote.capable('bundle2-exp')) caps = bundle2.decodecaps(capsblob) bundler = bundle2.bundle20(pushop.ui, caps) # create reply capability capsblob = bundle2.encodecaps(pushop.repo.bundle2caps) bundler.newpart('b2x:replycaps', data=capsblob) + # Send known heads to the server for race detection. if not pushop.force: bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) extrainfo = _pushbundle2extraparts(pushop, bundler)