comparison hgext/rebase.py @ 37034:fbc82a08bdcb

rebase: pass in ctx, not rev, to conclude[memory]node()

They both need it and there's no locking that might make the results
different, so let's do it in one place. This also lets us move out
more common code in the following patches.

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

37033:5f99142f59cc

        '''Commit the wd changes with parents p1 and p2.

        Reuse commit info from rev but also store useful information in extra.
        Return node of committed revision.'''
        repo = self.repo
        if self.inmemory:
            newnode = concludememorynode(repo, rev, p1, p2,
                wctx=self.wctx,
                extrafn=_makeextrafn(self.extrafns),
                commitmsg=commitmsg,
                editor=editor,
                keepbranches=self.keepbranchesf,
                date=self.date)
            mergemod.mergestate.clean(repo)
        else:
            newnode = concludenode(repo, rev, p1, p2,
                extrafn=_makeextrafn(self.extrafns),
                commitmsg=commitmsg,
                editor=editor,
                keepbranches=self.keepbranchesf,
                date=self.date)

    raise error.Abort(_('unable to collapse on top of %d, there is more '
                       'than one external parent: %s') %
                     (max(destancestors),
                      ', '.join("%d" % p for p in sorted(parents))))

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

            extra=extra, user=ctx.user(), branch=branch, editor=editor)
        commitres = repo.commitctx(memctx)
        wctx.clean() # Might be reused
        return commitres

def concludenode(repo, rev, p1, p2, editor, extrafn, keepbranches, date,
                 commitmsg=None):
    '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
    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())
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
        extra = {'rebase_source': ctx.hex()}
        if extrafn:

37034:fbc82a08bdcb

        '''Commit the wd changes with parents p1 and p2.

        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,
                editor=editor,
                keepbranches=self.keepbranchesf,
                date=self.date)
            mergemod.mergestate.clean(repo)
        else:
            newnode = concludenode(repo, ctx, p1, p2,
                extrafn=_makeextrafn(self.extrafns),
                commitmsg=commitmsg,
                editor=editor,
                keepbranches=self.keepbranchesf,
                date=self.date)

    raise error.Abort(_('unable to collapse on top of %d, there is more '
                       '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:

            extra=extra, user=ctx.user(), branch=branch, editor=editor)
        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: