changegroup: extract cgpacker.group() to standalone function

It doesn't need to be part of the packer class.

Differential Revision: https://phab.mercurial-scm.org/D4206

mercurial/changegroup.py

@@ -681,77 +681,7 b' def _revisiondeltanarrow(cl, store, isch'
         deltachunks=(diffheader, data),
     )
 
-class cgpacker(object):
-    def __init__(self, repo, filematcher, version, allowreorder,
-                 deltaparentfn, builddeltaheader, manifestsend,
-                 bundlecaps=None, ellipses=False,
-                 shallow=False, ellipsisroots=None, fullnodes=None):
-        """Given a source repo, construct a bundler.
-
-        filematcher is a matcher that matches on files to include in the
-        changegroup. Used to facilitate sparse changegroups.
-
-        allowreorder controls whether reordering of revisions is allowed.
-        This value is used when ``bundle.reorder`` is ``auto`` or isn't
-        set.
-
-        deltaparentfn is a callable that resolves the delta parent for
-        a specific revision.
-
-        builddeltaheader is a callable that constructs the header for a group
-        delta.
-
-        manifestsend is a chunk to send after manifests have been fully emitted.
-
-        ellipses indicates whether ellipsis serving mode is enabled.
-
-        bundlecaps is optional and can be used to specify the set of
-        capabilities which can be used to build the bundle. While bundlecaps is
-        unused in core Mercurial, extensions rely on this feature to communicate
-        capabilities to customize the changegroup packer.
-
-        shallow indicates whether shallow data might be sent. The packer may
-        need to pack file contents not introduced by the changes being packed.
-
-        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.
-        """
-        assert filematcher
-        self._filematcher = filematcher
-
-        self.version = version
-        self._deltaparentfn = deltaparentfn
-        self._builddeltaheader = builddeltaheader
-        self._manifestsend = manifestsend
-        self._ellipses = ellipses
-
-        # Set of capabilities we can use to build the bundle.
-        if bundlecaps is None:
-            bundlecaps = set()
-        self._bundlecaps = bundlecaps
-        self._isshallow = shallow
-        self._fullclnodes = fullnodes
-
-        # Maps ellipsis revs to their roots at the changelog level.
-        self._precomputedellipsis = ellipsisroots
-
-        # experimental config: bundle.reorder
-        reorder = repo.ui.config('bundle', 'reorder')
-        if reorder == 'auto':
-            self._reorder = allowreorder
-        else:
-            self._reorder = stringutil.parsebool(reorder)
-
-        self._repo = repo
-
-        if self._repo.ui.verbose and not self._repo.ui.debugflag:
-            self._verbosenote = self._repo.ui.note
-        else:
-            self._verbosenote = lambda s: None
-
-    def group(self, repo, revs, store, ischangelog, lookup, deltaparentfn,
+def deltagroup(repo, revs, store, ischangelog, lookup, deltaparentfn,
               deltaheaderfn, units=None,
               ellipses=False, clrevtolocalrev=None, fullclnodes=None,
               precomputedellipsis=None):
@@ -825,6 +755,76 b' class cgpacker(object):'
 
         yield closechunk()
 
+class cgpacker(object):
+    def __init__(self, repo, filematcher, version, allowreorder,
+                 deltaparentfn, builddeltaheader, manifestsend,
+                 bundlecaps=None, ellipses=False,
+                 shallow=False, ellipsisroots=None, fullnodes=None):
+        """Given a source repo, construct a bundler.
+
+        filematcher is a matcher that matches on files to include in the
+        changegroup. Used to facilitate sparse changegroups.
+
+        allowreorder controls whether reordering of revisions is allowed.
+        This value is used when ``bundle.reorder`` is ``auto`` or isn't
+        set.
+
+        deltaparentfn is a callable that resolves the delta parent for
+        a specific revision.
+
+        builddeltaheader is a callable that constructs the header for a group
+        delta.
+
+        manifestsend is a chunk to send after manifests have been fully emitted.
+
+        ellipses indicates whether ellipsis serving mode is enabled.
+
+        bundlecaps is optional and can be used to specify the set of
+        capabilities which can be used to build the bundle. While bundlecaps is
+        unused in core Mercurial, extensions rely on this feature to communicate
+        capabilities to customize the changegroup packer.
+
+        shallow indicates whether shallow data might be sent. The packer may
+        need to pack file contents not introduced by the changes being packed.
+
+        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.
+        """
+        assert filematcher
+        self._filematcher = filematcher
+
+        self.version = version
+        self._deltaparentfn = deltaparentfn
+        self._builddeltaheader = builddeltaheader
+        self._manifestsend = manifestsend
+        self._ellipses = ellipses
+
+        # Set of capabilities we can use to build the bundle.
+        if bundlecaps is None:
+            bundlecaps = set()
+        self._bundlecaps = bundlecaps
+        self._isshallow = shallow
+        self._fullclnodes = fullnodes
+
+        # Maps ellipsis revs to their roots at the changelog level.
+        self._precomputedellipsis = ellipsisroots
+
+        # experimental config: bundle.reorder
+        reorder = repo.ui.config('bundle', 'reorder')
+        if reorder == 'auto':
+            self._reorder = allowreorder
+        else:
+            self._reorder = stringutil.parsebool(reorder)
+
+        self._repo = repo
+
+        if self._repo.ui.verbose and not self._repo.ui.debugflag:
+            self._verbosenote = self._repo.ui.note
+        else:
+            self._verbosenote = lambda s: None
+
     def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
         """Yield a sequence of changegroup byte chunks."""
 
@@ -958,7 +958,8 b' class cgpacker(object):'
             'clrevtomanifestrev': clrevtomanifestrev,
         }
 
-        gen = self.group(self._repo, revs, cl, True, lookupcl,
+        gen = deltagroup(
+            self._repo, revs, cl, True, lookupcl,
                          self._deltaparentfn, self._builddeltaheader,
                          ellipses=self._ellipses,
                          units=_('changesets'),
@@ -1053,7 +1054,7 b' class cgpacker(object):'
                 size += len(chunk)
                 yield chunk
 
-            it = self.group(
+            it = deltagroup(
                 self._repo, revs, store, False, lookupfn,
                 self._deltaparentfn, self._builddeltaheader,
                 ellipses=self._ellipses,
@@ -1153,7 +1154,7 b' class cgpacker(object):'
                 size = len(h)
                 yield h
 
-                it = self.group(
+                it = deltagroup(
                     self._repo, revs, filerevlog, False, lookupfilelog,
                     self._deltaparentfn, self._builddeltaheader,
                     ellipses=self._ellipses,