214 # add the changegroup bundle |
214 # add the changegroup bundle |
215 cg = changegroup.getlocalbundle(pushop.repo, 'push', pushop.outgoing) |
215 cg = changegroup.getlocalbundle(pushop.repo, 'push', pushop.outgoing) |
216 cgpart = bundle2.bundlepart('CHANGEGROUP', data=cg.getchunks()) |
216 cgpart = bundle2.bundlepart('CHANGEGROUP', data=cg.getchunks()) |
217 bundler.addpart(cgpart) |
217 bundler.addpart(cgpart) |
218 stream = util.chunkbuffer(bundler.getchunks()) |
218 stream = util.chunkbuffer(bundler.getchunks()) |
219 sent = bundle2.unbundle20(pushop.repo.ui, stream) |
219 reply = pushop.remote.unbundle(stream, ['force'], 'push') |
220 reply = pushop.remote.unbundle(sent, ['force'], 'push') |
|
221 try: |
220 try: |
222 op = bundle2.processbundle(pushop.repo, reply) |
221 op = bundle2.processbundle(pushop.repo, reply) |
223 except KeyError, exc: |
222 except KeyError, exc: |
224 raise util.Abort('missing support for %s' % exc) |
223 raise util.Abort('missing support for %s' % exc) |
225 cgreplies = op.records.getreplies(cgpart.id) |
224 cgreplies = op.records.getreplies(cgpart.id) |