##// END OF EJS Templates
exchange: reinsert comment in the right place...
Pierre-Yves David -
r21643:75ff093d default
parent child Browse files
Show More
@@ -208,13 +208,13 b' def _pushbundle2(pushop):'
208
208
209 The only currently supported type of data is changegroup but this will
209 The only currently supported type of data is changegroup but this will
210 evolve in the future."""
210 evolve in the future."""
211 # Send known head to the server for race detection.
212 capsblob = urllib.unquote(pushop.remote.capable('bundle2-exp'))
211 capsblob = urllib.unquote(pushop.remote.capable('bundle2-exp'))
213 caps = bundle2.decodecaps(capsblob)
212 caps = bundle2.decodecaps(capsblob)
214 bundler = bundle2.bundle20(pushop.ui, caps)
213 bundler = bundle2.bundle20(pushop.ui, caps)
215 # create reply capability
214 # create reply capability
216 capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
215 capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
217 bundler.newpart('b2x:replycaps', data=capsblob)
216 bundler.newpart('b2x:replycaps', data=capsblob)
217 # Send known heads to the server for race detection.
218 if not pushop.force:
218 if not pushop.force:
219 bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads))
219 bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads))
220 extrainfo = _pushbundle2extraparts(pushop, bundler)
220 extrainfo = _pushbundle2extraparts(pushop, bundler)
General Comments 0
You need to be logged in to leave comments. Login now