comparison hgext/rebase.py @ 37035:b7f5d03e1e54

rebase: look up commit message to reuse outside of conclude[memory]node()

This was done the same way in both functions, so let's let the single
caller do it.

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

37034:fbc82a08bdcb

        Reuse commit info from rev but also store useful information in extra.
        Return node of committed revision.'''
        repo = self.repo
        ctx = repo[rev]
        if self.inmemory:
            newnode = concludememorynode(repo, ctx, p1, p2,
                wctx=self.wctx,
                extrafn=_makeextrafn(self.extrafns),
                commitmsg=commitmsg,

                       'than one external parent: %s') %
                     (max(destancestors),
                      ', '.join("%d" % p for p in sorted(parents))))

def concludememorynode(repo, ctx, p1, p2, wctx, editor, extrafn, keepbranches,
                       date, commitmsg=None):
    '''Commit the memory changes with parents p1 and p2. Reuse commit info from
    ctx but also store useful information in extra.
    Return node of committed revision.'''
    if commitmsg is None:
        commitmsg = ctx.description()
    keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
    extra = {'rebase_source': ctx.hex()}
    if extrafn:
        extrafn(ctx, extra)

        commitres = repo.commitctx(memctx)
        wctx.clean() # Might be reused
        return commitres

def concludenode(repo, ctx, p1, p2, editor, extrafn, keepbranches, date,
                 commitmsg=None):
    '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx
    but also store useful information in extra.
    Return node of committed revision.'''
    dsguard = util.nullcontextmanager()
    if not repo.ui.configbool('rebase', 'singletransaction'):
        dsguard = dirstateguard.dirstateguard(repo, 'rebase')
    with dsguard:
        repo.setparents(repo[p1].node(), repo[p2].node())
        if commitmsg is None:
            commitmsg = ctx.description()
        keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
        extra = {'rebase_source': ctx.hex()}
        if extrafn:
            extrafn(ctx, extra)

37035:b7f5d03e1e54

        Reuse commit info from rev but also store useful information in extra.
        Return node of committed revision.'''
        repo = self.repo
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        if self.inmemory:
            newnode = concludememorynode(repo, ctx, p1, p2,
                wctx=self.wctx,
                extrafn=_makeextrafn(self.extrafns),
                commitmsg=commitmsg,

                       'than one external parent: %s') %
                     (max(destancestors),
                      ', '.join("%d" % p for p in sorted(parents))))

def concludememorynode(repo, ctx, p1, p2, wctx, editor, extrafn, keepbranches,
                       date, commitmsg):
    '''Commit the memory changes with parents p1 and p2. Reuse commit info from
    ctx but also store useful information in extra.
    Return node of committed revision.'''
    keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
    extra = {'rebase_source': ctx.hex()}
    if extrafn:
        extrafn(ctx, extra)

        commitres = repo.commitctx(memctx)
        wctx.clean() # Might be reused
        return commitres

def concludenode(repo, ctx, p1, p2, editor, extrafn, keepbranches, date,
                 commitmsg):
    '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx
    but also store useful information in extra.
    Return node of committed revision.'''
    dsguard = util.nullcontextmanager()
    if not repo.ui.configbool('rebase', 'singletransaction'):
        dsguard = dirstateguard.dirstateguard(repo, 'rebase')
    with dsguard:
        repo.setparents(repo[p1].node(), repo[p2].node())
        keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
        extra = {'rebase_source': ctx.hex()}
        if extrafn:
            extrafn(ctx, extra)