indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY There is now only a single class. We don't need to encode the version in its name since the version is a lie. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4084 AFFECTED FILES mercurial/changegroup.py CHANGE DETAILS diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -522,7 +522,7 @@ # Iterable of chunks holding raw delta data. deltachunks = attr.ib() -class cg1packer(object): +class cgpacker(object): def __init__(self, repo, filematcher, version, allowreorder, useprevdelta, builddeltaheader, manifestsend, sendtreemanifests, bundlecaps=None): @@ -1178,37 +1178,40 @@ builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack( d.node, d.p1node, d.p2node, d.linknode) - return cg1packer(repo, filematcher, b'01', - useprevdelta=True, - allowreorder=None, - builddeltaheader=builddeltaheader, - manifestsend=b'', sendtreemanifests=False, - bundlecaps=bundlecaps) + return cgpacker(repo, filematcher, b'01', + useprevdelta=True, + allowreorder=None, + builddeltaheader=builddeltaheader, + manifestsend=b'', + sendtreemanifests=False, + bundlecaps=bundlecaps) def _makecg2packer(repo, filematcher, bundlecaps): builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack( d.node, d.p1node, d.p2node, d.basenode, d.linknode) # Since generaldelta is directly supported by cg2, reordering # generally doesn't help, so we disable it by default (treating # bundle.reorder=auto just like bundle.reorder=False). - return cg1packer(repo, filematcher, b'02', - useprevdelta=False, - allowreorder=False, - builddeltaheader=builddeltaheader, - manifestsend=b'', sendtreemanifests=False, - bundlecaps=bundlecaps) + return cgpacker(repo, filematcher, b'02', + useprevdelta=False, + allowreorder=False, + builddeltaheader=builddeltaheader, + manifestsend=b'', + sendtreemanifests=False, + bundlecaps=bundlecaps) def _makecg3packer(repo, filematcher, bundlecaps): builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack( d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags) - return cg1packer(repo, filematcher, b'03', - useprevdelta=False, - allowreorder=False, - builddeltaheader=builddeltaheader, - manifestsend=closechunk(), sendtreemanifests=True, - bundlecaps=bundlecaps) + return cgpacker(repo, filematcher, b'03', + useprevdelta=False, + allowreorder=False, + builddeltaheader=builddeltaheader, + manifestsend=closechunk(), + sendtreemanifests=True, + bundlecaps=bundlecaps) _packermap = {'01': (_makecg1packer, cg1unpacker), # cg2 adds support for exchanging generaldelta To: indygreg, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
