comparison mercurial/changegroup.py @ 38985:d85b0d81112b

changegroup: extract _revisiondeltanormal() to standalone function

It wasn't accessing anything important on the cgpacker that warranted
it being a method instead of a function.

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

38984:a3105433ecc4

    # changelog, so what we do is we sort the non-changelog histories
    # by the order in which they are used by the changelog.
    key = lambda n: clnodetorev[lookup(n)]
    return [store.rev(n) for n in sorted(nodes, key=key)]

class cgpacker(object):
    def __init__(self, repo, filematcher, version, allowreorder,
                 deltaparentfn, builddeltaheader, manifestsend,
                 bundlecaps=None, ellipses=False,
                 shallow=False, ellipsisroots=None, fullnodes=None):

            if self._ellipses:
                delta = self._revisiondeltanarrow(store, ischangelog,
                                                  curr, prev, linknode)
            else:
                delta = self._revisiondeltanormal(store, ischangelog,
                                                  curr, prev, linknode)

            if not delta:
                continue

            meta = self._builddeltaheader(delta)

                    size += len(chunk)
                    yield chunk
                self._verbosenote(_('%8.i  %s\n') % (size, fname))
        progress.complete()

    def _revisiondeltanormal(self, store, ischangelog, rev, prev, linknode):
        node = store.node(rev)
        p1, p2 = store.parentrevs(rev)
        base = self._deltaparentfn(store, rev, p1, p2, prev)

        prefix = ''
        if store.iscensored(base) or store.iscensored(rev):
            try:
                delta = store.revision(node, raw=True)
            except error.CensoredNodeError as e:
                delta = e.tombstone
            if base == nullrev:
                prefix = mdiff.trivialdiffheader(len(delta))
            else:
                baselen = store.rawsize(base)
                prefix = mdiff.replacediffheader(baselen, len(delta))
        elif base == nullrev:
            delta = store.revision(node, raw=True)
            prefix = mdiff.trivialdiffheader(len(delta))
        else:
            delta = store.revdiff(base, rev)
        p1n, p2n = store.parents(node)

        return revisiondelta(
            node=node,
            p1node=p1n,
            p2node=p2n,
            basenode=store.node(base),
            linknode=linknode,
            flags=store.flags(rev),
            deltachunks=(prefix, delta),
        )

    def _revisiondeltanarrow(self, store, ischangelog, rev, prev, linknode):
        # build up some mapping information that's useful later. See
        # the local() nested function below.
        if ischangelog:
            self._clnodetorev[linknode] = rev

            self._clrevtolocalrev[linkrev] = rev

        # This is a node to send in full, because the changeset it
        # corresponds to was a full changeset.
        if linknode in self._fullnodes:
            return self._revisiondeltanormal(store, ischangelog, rev, prev,
                                             linknode)

        # At this point, a node can either be one we should skip or an
        # ellipsis. If it's not an ellipsis, bail immediately.
        if linkrev not in self._precomputedellipsis:
            return

38985:d85b0d81112b

    # changelog, so what we do is we sort the non-changelog histories
    # by the order in which they are used by the changelog.
    key = lambda n: clnodetorev[lookup(n)]
    return [store.rev(n) for n in sorted(nodes, key=key)]

def _revisiondeltanormal(store, rev, prev, linknode, deltaparentfn):
    """Construct a revision delta for non-ellipses changegroup generation."""
    node = store.node(rev)
    p1, p2 = store.parentrevs(rev)
    base = deltaparentfn(store, rev, p1, p2, prev)

    prefix = ''
    if store.iscensored(base) or store.iscensored(rev):
        try:
            delta = store.revision(node, raw=True)
        except error.CensoredNodeError as e:
            delta = e.tombstone
        if base == nullrev:
            prefix = mdiff.trivialdiffheader(len(delta))
        else:
            baselen = store.rawsize(base)
            prefix = mdiff.replacediffheader(baselen, len(delta))
    elif base == nullrev:
        delta = store.revision(node, raw=True)
        prefix = mdiff.trivialdiffheader(len(delta))
    else:
        delta = store.revdiff(base, rev)
    p1n, p2n = store.parents(node)

    return revisiondelta(
        node=node,
        p1node=p1n,
        p2node=p2n,
        basenode=store.node(base),
        linknode=linknode,
        flags=store.flags(rev),
        deltachunks=(prefix, delta),
    )

class cgpacker(object):
    def __init__(self, repo, filematcher, version, allowreorder,
                 deltaparentfn, builddeltaheader, manifestsend,
                 bundlecaps=None, ellipses=False,
                 shallow=False, ellipsisroots=None, fullnodes=None):

            if self._ellipses:
                delta = self._revisiondeltanarrow(store, ischangelog,
                                                  curr, prev, linknode)
            else:
                delta = _revisiondeltanormal(store, curr, prev, linknode,
                                             self._deltaparentfn)

            if not delta:
                continue

            meta = self._builddeltaheader(delta)

                    size += len(chunk)
                    yield chunk
                self._verbosenote(_('%8.i  %s\n') % (size, fname))
        progress.complete()

    def _revisiondeltanarrow(self, store, ischangelog, rev, prev, linknode):
        # build up some mapping information that's useful later. See
        # the local() nested function below.
        if ischangelog:
            self._clnodetorev[linknode] = rev

            self._clrevtolocalrev[linkrev] = rev

        # This is a node to send in full, because the changeset it
        # corresponds to was a full changeset.
        if linknode in self._fullnodes:
            return _revisiondeltanormal(store, rev, prev, linknode,
                                        self._deltaparentfn)

        # At this point, a node can either be one we should skip or an
        # ellipsis. If it's not an ellipsis, bail immediately.
        if linkrev not in self._precomputedellipsis:
            return