comparison hgext/rebase.py @ 37037:bd0086bd3af4

rebase: inline _makextrafn() now that we have only one caller

Also avoid even creating a function since we just end up calling it
right away.

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

37036:0ab0d94ead72

    if s is not None:
        extra['intermediate-source'] = s

def _savebranch(ctx, extra):
    extra['branch'] = ctx.branch()

def _makeextrafn(copiers):
    """make an extrafn out of the given copy-functions.

    A copy function takes a context and an extra dict, and mutates the
    extra dict as needed based on the given context.
    """
    def extrafn(ctx, extra):
        for c in copiers:
            c(ctx, extra)
    return extrafn

def _destrebase(repo, sourceset, destspace=None):
    """small wrapper around destmerge to pass the right extra args

    Please wrap destutil.destmerge instead."""

        Return node of committed revision.'''
        repo = self.repo
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        extrafn = _makeextrafn(self.extrafns)
        extra = {'rebase_source': ctx.hex()}
        if extrafn:
            extrafn(ctx, extra)
        if self.inmemory:
            newnode = concludememorynode(repo, ctx, p1, p2,
                wctx=self.wctx,
                extra=extra,
                commitmsg=commitmsg,

37037:bd0086bd3af4

    if s is not None:
        extra['intermediate-source'] = s

def _savebranch(ctx, extra):
    extra['branch'] = ctx.branch()

def _destrebase(repo, sourceset, destspace=None):
    """small wrapper around destmerge to pass the right extra args

    Please wrap destutil.destmerge instead."""

        Return node of committed revision.'''
        repo = self.repo
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        extra = {'rebase_source': ctx.hex()}
        for c in self.extrafns:
            c(ctx, extra)
        if self.inmemory:
            newnode = concludememorynode(repo, ctx, p1, p2,
                wctx=self.wctx,
                extra=extra,
                commitmsg=commitmsg,