comparison hgext/rebase.py @ 37038:7db86856f27f

rebase: pass in "keepbranch" to conclude[memory]node()

Both functions calculated the same "keepbranch" value from the
"keepbranches" we passed in, so let's make the caller do it instead.

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

37037:bd0086bd3af4

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

        if newnode is None:
            # If it ended up being a no-op commit, then the normal
            # merge state clean-up path doesn't happen, so do it

    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, extra, keepbranches,
                       date, commitmsg):
    '''Commit the memory changes with parents p1 and p2. Reuse commit info from
    ctx.
    Return node of committed revision.'''
    keepbranch = keepbranches and repo[p1].branch() != ctx.branch()

    destphase = max(ctx.phase(), phases.draft)
    overrides = {('phases', 'new-commit'): destphase}
    if keepbranch:
        overrides[('ui', 'allowemptycommit')] = True
    with repo.ui.configoverride(overrides, 'rebase'):

            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, extra, keepbranches, date,
                 commitmsg):
    '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx.
    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()

        destphase = max(ctx.phase(), phases.draft)
        overrides = {('phases', 'new-commit'): destphase}
        if keepbranch:
            overrides[('ui', 'allowemptycommit')] = True

37038:7db86856f27f

        if commitmsg is None:
            commitmsg = ctx.description()
        extra = {'rebase_source': ctx.hex()}
        for c in self.extrafns:
            c(ctx, extra)
        keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
        if self.inmemory:
            newnode = concludememorynode(repo, ctx, p1, p2,
                wctx=self.wctx,
                extra=extra,
                commitmsg=commitmsg,
                editor=editor,
                keepbranch=keepbranch,
                date=self.date)
            mergemod.mergestate.clean(repo)
        else:
            newnode = concludenode(repo, ctx, p1, p2,
                extra=extra,
                commitmsg=commitmsg,
                editor=editor,
                keepbranch=keepbranch,
                date=self.date)

        if newnode is None:
            # If it ended up being a no-op commit, then the normal
            # merge state clean-up path doesn't happen, so do it

    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, extra, keepbranch,
                       date, commitmsg):
    '''Commit the memory changes with parents p1 and p2. Reuse commit info from
    ctx.
    Return node of committed revision.'''
    destphase = max(ctx.phase(), phases.draft)
    overrides = {('phases', 'new-commit'): destphase}
    if keepbranch:
        overrides[('ui', 'allowemptycommit')] = True
    with repo.ui.configoverride(overrides, 'rebase'):

            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, extra, keepbranch, date,
                 commitmsg):
    '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx.
    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())

        destphase = max(ctx.phase(), phases.draft)
        overrides = {('phases', 'new-commit'): destphase}
        if keepbranch:
            overrides[('ui', 'allowemptycommit')] = True