comparison hgext/rebase.py @ 37040:b8d305bd12ca

rebase: move config override out of conclude[memory]node()

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

37039:7616073a4cf1

        keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
        destphase = max(ctx.phase(), phases.draft)
        overrides = {('phases', 'new-commit'): destphase}
        if keepbranch:
            overrides[('ui', 'allowemptycommit')] = True
        if self.inmemory:
            newnode = concludememorynode(repo, ctx, p1, p2,
                wctx=self.wctx,
                extra=extra,
                commitmsg=commitmsg,
                editor=editor,
                overrides=overrides,
                date=self.date)
            mergemod.mergestate.clean(repo)
        else:
            newnode = concludenode(repo, ctx, p1, p2,
                extra=extra,
                commitmsg=commitmsg,
                editor=editor,
                overrides=overrides,
                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
            # here. Fix issue5494
            mergemod.mergestate.clean(repo)
        return newnode

    def _rebasenode(self, tr, rev, allowdivergence, progressfn):
        repo, ui, opts = self.repo, self.ui, self.opts
        dest = self.destmap[rev]
        ctx = repo[rev]

    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, overrides, date,
                       commitmsg):
    '''Commit the memory changes with parents p1 and p2. Reuse commit info from
    ctx.
    Return node of committed revision.'''
    with repo.ui.configoverride(overrides, 'rebase'):
        # Replicates the empty check in ``repo.commit``.
        if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
            return None

        if date is None:
            date = ctx.date()

        # By convention, ``extra['branch']`` (set by extrafn) clobbers
        # ``branch`` (used when passing ``--keepbranches``).
        branch = repo[p1].branch()
        if 'branch' in extra:
            branch = extra['branch']

        memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date,
            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, overrides, 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())

        with repo.ui.configoverride(overrides, 'rebase'):
            # Commit might fail if unresolved files exist
            if date is None:
                date = ctx.date()
            newnode = repo.commit(text=commitmsg, user=ctx.user(),
                                  date=date, extra=extra, editor=editor)

        repo.dirstate.setbranch(repo[newnode].branch())
        return newnode

def rebasenode(repo, rev, p1, base, collapse, dest, wctx):

37040:b8d305bd12ca

        keepbranch = self.keepbranchesf 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'):
            if self.inmemory:
                newnode = concludememorynode(repo, ctx, p1, p2,
                    wctx=self.wctx,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    date=self.date)
                mergemod.mergestate.clean(repo)
            else:
                newnode = concludenode(repo, ctx, p1, p2,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    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
                # here. Fix issue5494
                mergemod.mergestate.clean(repo)
            return newnode

    def _rebasenode(self, tr, rev, allowdivergence, progressfn):
        repo, ui, opts = self.repo, self.ui, self.opts
        dest = self.destmap[rev]
        ctx = repo[rev]

    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, date, commitmsg):
    '''Commit the memory changes with parents p1 and p2. Reuse commit info from
    ctx.
    Return node of committed revision.'''
    # Replicates the empty check in ``repo.commit``.
    if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
        return None

    if date is None:
        date = ctx.date()

    # By convention, ``extra['branch']`` (set by extrafn) clobbers
    # ``branch`` (used when passing ``--keepbranches``).
    branch = repo[p1].branch()
    if 'branch' in extra:
        branch = extra['branch']

    memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date,
        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, 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())

        # Commit might fail if unresolved files exist
        if date is None:
            date = ctx.date()
        newnode = repo.commit(text=commitmsg, user=ctx.user(),
                              date=date, extra=extra, editor=editor)

        repo.dirstate.setbranch(repo[newnode].branch())
        return newnode

def rebasenode(repo, rev, p1, base, collapse, dest, wctx):