mercurial-scm/hg: comparison mercurial/changegroup.py

equal deleted inserted replaced

-:4cd214c9948d
+:a41565bef69f
 scmutil,
 util,
 )
 from .interfaces import repository
+from .revlogutils import sidedata as sidedatamod
 _CHANGEGROUPV1_DELTA_HEADER = struct.Struct(b"20s20s20s20s")
 _CHANGEGROUPV2_DELTA_HEADER = struct.Struct(b"20s20s20s20s20s")
 _CHANGEGROUPV3_DELTA_HEADER = struct.Struct(b">20s20s20s20s20sH")
 return {}
 headerdata = readexactly(self._stream, self.deltaheadersize)
 header = self.deltaheader.unpack(headerdata)
 delta = readexactly(self._stream, l - self.deltaheadersize)
 node, p1, p2, deltabase, cs, flags = self._deltaheader(header, prevnode)
-return (node, p1, p2, cs, deltabase, delta, flags)
+# cg4 forward-compat
+sidedata = {}
+return (node, p1, p2, cs, deltabase, delta, flags, sidedata)
 def getchunks(self):
 """returns all the chunks contains in the bundle
 Used when you need to forward the binary stream to a file or another
 d = chunkdata[b"filename"]
 repo.ui.debug(b"adding %s revisions\n" % d)
 deltas = self.deltaiter()
 if not repo.manifestlog.getstorage(d).addgroup(deltas, revmap, trp):
 raise error.Abort(_(b"received dir revlog group is empty"))
+class cg4unpacker(cg3unpacker):
+"""Unpacker for cg4 streams.
+cg4 streams add support for exchanging sidedata.
+"""
+version = b'04'
+def deltachunk(self, prevnode):
+res = super(cg4unpacker, self).deltachunk(prevnode)
+if not res:
+return res
+(node, p1, p2, cs, deltabase, delta, flags, _sidedata) = res
+sidedata_raw = getchunk(self._stream)
+sidedata = {}
+if len(sidedata_raw) > 0:
+sidedata = sidedatamod.deserialize_sidedata(sidedata_raw)
+return node, p1, p2, cs, deltabase, delta, flags, sidedata
 class headerlessfixup(object):
 def __init__(self, fh, h):
 self._h = h
 bundlecaps=None,
 ellipses=False,
 shallow=False,
 ellipsisroots=None,
 fullnodes=None,
+remote_sidedata=None,
 ):
 """Given a source repo, construct a bundler.
 oldmatcher is a matcher that matches on files the client already has.
 These will not be included in the changegroup.
 fullnodes is the set of changelog nodes which should not be ellipsis
 nodes. We store this rather than the set of nodes that should be
 ellipsis because for very large histories we expect this to be
 significantly smaller.
+remote_sidedata is the set of sidedata categories wanted by the remote.
 """
 assert oldmatcher
 assert matcher
 self._oldmatcher = oldmatcher
 self._matcher = matcher
 clstate[b'clrevtomanifestrev'],
 )
 for tree, deltas in it:
 if tree:
-assert self.version == b'03'
+assert self.version in (b'03', b'04')
 chunk = _fileheader(tree)
 size += len(chunk)
 yield chunk
 for delta in deltas:
 bundlecaps,
 ellipses=False,
 shallow=False,
 ellipsisroots=None,
 fullnodes=None,
+remote_sidedata=None,
 ):
 builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack(
 d.node, d.p1node, d.p2node, d.linknode
 )
 bundlecaps,
 ellipses=False,
 shallow=False,
 ellipsisroots=None,
 fullnodes=None,
+remote_sidedata=None,
 ):
 builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack(
 d.node, d.p1node, d.p2node, d.basenode, d.linknode
 )
 bundlecaps,
 ellipses=False,
 shallow=False,
 ellipsisroots=None,
 fullnodes=None,
+remote_sidedata=None,
 ):
 builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack(
 d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags
 )
 ellipsisroots=ellipsisroots,
 fullnodes=fullnodes,
 )
+def _makecg4packer(
+repo,
+oldmatcher,
+matcher,
+bundlecaps,
+ellipses=False,
+shallow=False,
+ellipsisroots=None,
+fullnodes=None,
+remote_sidedata=None,
+):
+# Same header func as cg3. Sidedata is in a separate chunk from the delta to
+# differenciate "raw delta" and sidedata.
+builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack(
+d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags
+)
+return cgpacker(
+repo,
+oldmatcher,
+matcher,
+b'04',
+builddeltaheader=builddeltaheader,
+manifestsend=closechunk(),
+bundlecaps=bundlecaps,
+ellipses=ellipses,
+shallow=shallow,
+ellipsisroots=ellipsisroots,
+fullnodes=fullnodes,
+remote_sidedata=remote_sidedata,
+)
 _packermap = {
 b'01': (_makecg1packer, cg1unpacker),
 # cg2 adds support for exchanging generaldelta
 b'02': (_makecg2packer, cg2unpacker),
 # cg3 adds support for exchanging revlog flags and treemanifests
 b'03': (_makecg3packer, cg3unpacker),
+# ch4 adds support for exchanging sidedata
+b'04': (_makecg4packer, cg4unpacker),
 }
 def allsupportedversions(repo):
 versions = set(_packermap.keys())
 # contains both normal and tree manifest at the same time. so using
 # older version to pull data is viable
 #
 # (or even to push subset of history)
 needv03 = True
-if b'exp-sidedata-flag' in repo.requirements:
+has_revlogv2 = requirements.REVLOGV2_REQUIREMENT in repo.requirements
-needv03 = True
+if not has_revlogv2:
-# don't attempt to use 01/02 until we do sidedata cleaning
+versions.discard(b'04')
-versions.discard(b'01')
-versions.discard(b'02')
 if not needv03:
 versions.discard(b'03')
 return versions
 matcher=None,
 ellipses=False,
 shallow=False,
 ellipsisroots=None,
 fullnodes=None,
+remote_sidedata=None,
 ):
 assert version in supportedoutgoingversions(repo)
 if matcher is None:
 matcher = matchmod.always()
 bundlecaps,
 ellipses=ellipses,
 shallow=shallow,
 ellipsisroots=ellipsisroots,
 fullnodes=fullnodes,
+remote_sidedata=remote_sidedata,
 )
 def getunbundler(version, fh, alg, extras=None):
 return _packermap[version][1](fh, alg, extras=extras)
 version,
 source,
 fastpath=False,
 bundlecaps=None,
 matcher=None,
+remote_sidedata=None,
 ):
-bundler = getbundler(version, repo, bundlecaps=bundlecaps, matcher=matcher)
+bundler = getbundler(
+version,
+repo,
+bundlecaps=bundlecaps,
+matcher=matcher,
+remote_sidedata=remote_sidedata,
+)
 repo = repo.unfiltered()
 commonrevs = outgoing.common
 csets = outgoing.missing
 heads = outgoing.ancestorsof

changeset 46711	a41565bef69f
parent 46627	f4c325bf80fc
child 46712	e8c11a2c96c0