--- a/mercurial/exchange.py Wed Apr 08 09:38:09 2015 -0700
+++ b/mercurial/exchange.py Thu Apr 09 16:25:48 2015 -0400
@@ -49,7 +49,7 @@
if version is None:
raise ValueError('bundler do not support common obsmarker format')
stream = obsolete.encodemarkers(markers, True, version=version)
- return bundler.newpart('b2x:obsmarkers', data=stream)
+ return bundler.newpart('obsmarkers', data=stream)
return None
def _canusebundle2(op):
@@ -57,7 +57,7 @@
Feel free to nuke this function when we drop the experimental option"""
return (op.repo.ui.configbool('experimental', 'bundle2-exp', False)
- and op.remote.capable('bundle2-exp'))
+ and op.remote.capable('bundle2'))
class pushoperation(object):
@@ -459,10 +459,10 @@
pushop.remote,
pushop.outgoing)
if not pushop.force:
- bundler.newpart('b2x:check:heads', data=iter(pushop.remoteheads))
+ bundler.newpart('check:heads', data=iter(pushop.remoteheads))
b2caps = bundle2.bundle2caps(pushop.remote)
version = None
- cgversions = b2caps.get('b2x:changegroup')
+ cgversions = b2caps.get('changegroup')
if not cgversions: # 3.1 and 3.2 ship with an empty value
cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push',
pushop.outgoing)
@@ -474,7 +474,7 @@
cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push',
pushop.outgoing,
version=version)
- cgpart = bundler.newpart('b2x:changegroup', data=cg)
+ cgpart = bundler.newpart('changegroup', data=cg)
if version is not None:
cgpart.addparam('version', version)
def handlereply(op):
@@ -490,13 +490,13 @@
if 'phases' in pushop.stepsdone:
return
b2caps = bundle2.bundle2caps(pushop.remote)
- if not 'b2x:pushkey' in b2caps:
+ if not 'pushkey' in b2caps:
return
pushop.stepsdone.add('phases')
part2node = []
enc = pushkey.encode
for newremotehead in pushop.outdatedphases:
- part = bundler.newpart('b2x:pushkey')
+ part = bundler.newpart('pushkey')
part.addparam('namespace', enc('phases'))
part.addparam('key', enc(newremotehead.hex()))
part.addparam('old', enc(str(phases.draft)))
@@ -533,13 +533,13 @@
if 'bookmarks' in pushop.stepsdone:
return
b2caps = bundle2.bundle2caps(pushop.remote)
- if 'b2x:pushkey' not in b2caps:
+ if 'pushkey' not in b2caps:
return
pushop.stepsdone.add('bookmarks')
part2book = []
enc = pushkey.encode
for book, old, new in pushop.outbookmarks:
- part = bundler.newpart('b2x:pushkey')
+ part = bundler.newpart('pushkey')
part.addparam('namespace', enc('bookmarks'))
part.addparam('key', enc(book))
part.addparam('old', enc(old))
@@ -583,7 +583,7 @@
# create reply capability
capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo,
allowpushback=pushback))
- bundler.newpart('b2x:replycaps', data=capsblob)
+ bundler.newpart('replycaps', data=capsblob)
replyhandlers = []
for partgenname in b2partsgenorder:
partgen = b2partsgenmapping[partgenname]
@@ -975,7 +975,7 @@
kwargs['common'] = pullop.common
kwargs['heads'] = pullop.heads or pullop.rheads
kwargs['cg'] = pullop.fetch
- if 'b2x:listkeys' in remotecaps:
+ if 'listkeys' in remotecaps:
kwargs['listkeys'] = ['phase', 'bookmarks']
if not pullop.fetch:
pullop.repo.ui.status(_("no changes found\n"))
@@ -1128,7 +1128,7 @@
def caps20to10(repo):
"""return a set with appropriate options to use bundle20 during getbundle"""
- caps = set(['HG2Y'])
+ caps = set(['HG20'])
capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo))
caps.add('bundle2=' + urllib.quote(capsblob))
return caps
@@ -1161,7 +1161,7 @@
**kwargs):
"""return a full bundle (with potentially multiple kind of parts)
- Could be a bundle HG10 or a bundle HG2Y depending on bundlecaps
+ Could be a bundle HG10 or a bundle HG20 depending on bundlecaps
passed. For now, the bundle can contain only changegroup, but this will
changes when more part type will be available for bundle2.
@@ -1212,7 +1212,7 @@
if kwargs.get('cg', True):
# build changegroup bundle here.
version = None
- cgversions = b2caps.get('b2x:changegroup')
+ cgversions = b2caps.get('changegroup')
if not cgversions: # 3.1 and 3.2 ship with an empty value
cg = changegroup.getchangegroupraw(repo, source, heads=heads,
common=common,
@@ -1228,7 +1228,7 @@
version=version)
if cg:
- part = bundler.newpart('b2x:changegroup', data=cg)
+ part = bundler.newpart('changegroup', data=cg)
if version is not None:
part.addparam('version', version)
@@ -1238,7 +1238,7 @@
"""add parts containing listkeys namespaces to the requested bundle"""
listkeys = kwargs.get('listkeys', ())
for namespace in listkeys:
- part = bundler.newpart('b2x:listkeys')
+ part = bundler.newpart('listkeys')
part.addparam('namespace', namespace)
keys = repo.listkeys(namespace).items()
part.data = pushkey.encodekeys(keys)
@@ -1288,7 +1288,7 @@
tr = repo.transaction('unbundle')
tr.hookargs['source'] = source
tr.hookargs['url'] = url
- tr.hookargs['bundle2-exp'] = '1'
+ tr.hookargs['bundle2'] = '1'
r = bundle2.processbundle(repo, cg, lambda: tr).reply
p = lambda: tr.writepending() and repo.root or ""
repo.hook('b2x-pretransactionclose', throw=True, pending=p,