Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: reinsert comment in the right place
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 22 May 2014 12:58:07 -0700
changeset 21643 75ff093d2763
parent 21642 76a347bcdb33
child 21644 17755dd8c509
exchange: reinsert comment in the right place Unrelated new code was inserted between the original comment and the related code block.
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- a/mercurial/exchange.py	Thu May 29 16:01:39 2014 -0700
+++ b/mercurial/exchange.py	Thu May 22 12:58:07 2014 -0700
@@ -208,13 +208,13 @@
 
     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)
Mercurial