facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

bundle2: detect bundle2 stream/request on /HG2./ instead of /HG2Y/

Browse Source 
To support more bundle2 formats, we need a wider detection of bundle2-family
streams. The various places what were explicitly detecting the full magic string
are now matching on the first three characters of it.
This commit is contained in:
Pierre-Yves David 2015-04-07 16:01:32 -07:00
parent f96ca2174a
commit 151c000fca
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/exchange.py
View File

@ -32,7 +32,7 @@ def readbundle(ui, fh, fname, vfs=None):
if alg is None:
alg = changegroup.readexactly(fh, 2)
return changegroup.cg1unpacker(fh, alg)
elif version == '2Y':
elif version.startswith('2'):
return bundle2.getunbundler(ui, fh, header=magic + version)
else:
raise util.Abort(_('%s: unknown bundle version %s') % (fname, version))
@ -1168,7 +1168,10 @@ def getbundle(repo, source, heads=None, common=None, bundlecaps=None,
when the API of bundle is refined.
"""
# bundle10 case
if bundlecaps is None or 'HG2Y' not in bundlecaps:
usebundle2 = False
if bundlecaps is not None:
usebundle2 = util.any((cap.startswith('HG2') for cap in bundlecaps))
if not usebundle2:
if bundlecaps and not kwargs.get('cg', True):
raise ValueError(_('request for bundle10 must include changegroup'))

4
mercurial/wireproto.py
View File

@ -363,7 +363,9 @@ class wirepeer(peer.peerrepository):
opts[key] = value
f = self._callcompressable("getbundle", **opts)
bundlecaps = kwargs.get('bundlecaps')
if bundlecaps is not None and 'HG2Y' in bundlecaps:
if bundlecaps is None:
bundlecaps = () # kwargs could have it to None
if util.any((cap.startswith('HG2') for cap in bundlecaps)):
return bundle2.getunbundler(self.ui, f)
else:
return changegroupmod.cg1unpacker(f, 'UN')