210 evolve in the future.""" |
210 evolve in the future.""" |
211 bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) |
211 bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) |
212 # create reply capability |
212 # create reply capability |
213 capsblob = bundle2.encodecaps(pushop.repo.bundle2caps) |
213 capsblob = bundle2.encodecaps(pushop.repo.bundle2caps) |
214 bundler.newpart('b2x:replycaps', data=capsblob) |
214 bundler.newpart('b2x:replycaps', data=capsblob) |
|
215 extrainfo = _pushbundle2extraparts(pushop, bundler) |
215 # Send known heads to the server for race detection. |
216 # Send known heads to the server for race detection. |
216 if not pushop.force: |
217 if not pushop.force: |
217 bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) |
218 bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) |
218 extrainfo = _pushbundle2extraparts(pushop, bundler) |
|
219 # add the changegroup bundle |
219 # add the changegroup bundle |
220 cg = changegroup.getlocalbundle(pushop.repo, 'push', pushop.outgoing) |
220 cg = changegroup.getlocalbundle(pushop.repo, 'push', pushop.outgoing) |
221 cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks()) |
221 cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks()) |
222 stream = util.chunkbuffer(bundler.getchunks()) |
222 stream = util.chunkbuffer(bundler.getchunks()) |
223 try: |
223 try: |