equal
deleted
inserted
replaced
47 remoteversions = bundle2.obsmarkersversion(bundler.capabilities) |
47 remoteversions = bundle2.obsmarkersversion(bundler.capabilities) |
48 version = obsolete.commonversion(remoteversions) |
48 version = obsolete.commonversion(remoteversions) |
49 if version is None: |
49 if version is None: |
50 raise ValueError('bundler do not support common obsmarker format') |
50 raise ValueError('bundler do not support common obsmarker format') |
51 stream = obsolete.encodemarkers(markers, True, version=version) |
51 stream = obsolete.encodemarkers(markers, True, version=version) |
52 return bundler.newpart('B2X:OBSMARKERS', data=stream) |
52 return bundler.newpart('b2x:obsmarkers', data=stream) |
53 return None |
53 return None |
54 |
54 |
55 class pushoperation(object): |
55 class pushoperation(object): |
56 """A object that represent a single push operation |
56 """A object that represent a single push operation |
57 |
57 |
452 return |
452 return |
453 pushop.repo.prepushoutgoinghooks(pushop.repo, |
453 pushop.repo.prepushoutgoinghooks(pushop.repo, |
454 pushop.remote, |
454 pushop.remote, |
455 pushop.outgoing) |
455 pushop.outgoing) |
456 if not pushop.force: |
456 if not pushop.force: |
457 bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) |
457 bundler.newpart('b2x:check:heads', data=iter(pushop.remoteheads)) |
458 b2caps = bundle2.bundle2caps(pushop.remote) |
458 b2caps = bundle2.bundle2caps(pushop.remote) |
459 version = None |
459 version = None |
460 cgversions = b2caps.get('b2x:changegroup') |
460 cgversions = b2caps.get('b2x:changegroup') |
461 if not cgversions: # 3.1 and 3.2 ship with an empty value |
461 if not cgversions: # 3.1 and 3.2 ship with an empty value |
462 cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', |
462 cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', |
467 raise ValueError(_('no common changegroup version')) |
467 raise ValueError(_('no common changegroup version')) |
468 version = max(cgversions) |
468 version = max(cgversions) |
469 cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', |
469 cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', |
470 pushop.outgoing, |
470 pushop.outgoing, |
471 version=version) |
471 version=version) |
472 cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg) |
472 cgpart = bundler.newpart('b2x:changegroup', data=cg) |
473 if version is not None: |
473 if version is not None: |
474 cgpart.addparam('version', version) |
474 cgpart.addparam('version', version) |
475 def handlereply(op): |
475 def handlereply(op): |
476 """extract addchangegroup returns from server reply""" |
476 """extract addchangegroup returns from server reply""" |
477 cgreplies = op.records.getreplies(cgpart.id) |
477 cgreplies = op.records.getreplies(cgpart.id) |