comparison hgext/rebase.py @ 44349:cd43cae79f25

rebase: remove some now-unused parent arguments

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

44348:8082a77cc3a2

            for rev in sortedrevs:
                self._rebasenode(tr, rev, allowdivergence, progress)
        p.complete()
        ui.note(_(b'rebase merging completed\n'))

    def _concludenode(self, rev, p1, p2, editor, 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.'''
        repo = self.repo

            overrides[(b'ui', b'allowemptycommit')] = True
        with repo.ui.configoverride(overrides, b'rebase'):
            if self.inmemory:
                newnode = commitmemorynode(
                    repo,
                    p1,
                    p2,
                    wctx=self.wctx,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    user=ctx.user(),

                )
                mergemod.mergestate.clean(repo)
            else:
                newnode = commitnode(
                    repo,
                    p1,
                    p2,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    user=ctx.user(),
                    date=date,

                merging = p2 != nullrev
                editform = cmdutil.mergeeditform(merging, b'rebase')
                editor = cmdutil.getcommiteditor(
                    editform=editform, **pycompat.strkwargs(opts)
                )
                newnode = self._concludenode(rev, p1, p2, editor)
            else:
                # Skip commit if we are collapsing
                newnode = None
            # Update the state
            if newnode is not None:

            editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
            revtoreuse = max(self.state)

            self.wctx.setparents(repo[p1].node(), repo[self.external].node())
            newnode = self._concludenode(
                revtoreuse, p1, self.external, editor, commitmsg=commitmsg
            )

            if newnode is not None:
                newrev = repo[newnode].rev()
                for oldrev in self.state:

        )
        % (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents)))
    )


def commitmemorynode(repo, p1, p2, wctx, editor, extra, user, date, commitmsg):
    '''Commit the memory changes with parents p1 and p2.
    Return node of committed revision.'''
    # Replicates the empty check in ``repo.commit``.
    if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'):
        return None

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


def commitnode(repo, p1, p2, editor, extra, user, date, commitmsg):
    '''Commit the wd changes with parents p1 and p2.
    Return node of committed revision.'''
    dsguard = util.nullcontextmanager()
    if not repo.ui.configbool(b'rebase', b'singletransaction'):
        dsguard = dirstateguard.dirstateguard(repo, b'rebase')

44349:cd43cae79f25

            for rev in sortedrevs:
                self._rebasenode(tr, rev, allowdivergence, progress)
        p.complete()
        ui.note(_(b'rebase merging completed\n'))

    def _concludenode(self, rev, p1, editor, 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.'''
        repo = self.repo

            overrides[(b'ui', b'allowemptycommit')] = True
        with repo.ui.configoverride(overrides, b'rebase'):
            if self.inmemory:
                newnode = commitmemorynode(
                    repo,
                    wctx=self.wctx,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    user=ctx.user(),

                )
                mergemod.mergestate.clean(repo)
            else:
                newnode = commitnode(
                    repo,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    user=ctx.user(),
                    date=date,

                merging = p2 != nullrev
                editform = cmdutil.mergeeditform(merging, b'rebase')
                editor = cmdutil.getcommiteditor(
                    editform=editform, **pycompat.strkwargs(opts)
                )
                newnode = self._concludenode(rev, p1, editor)
            else:
                # Skip commit if we are collapsing
                newnode = None
            # Update the state
            if newnode is not None:

            editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
            revtoreuse = max(self.state)

            self.wctx.setparents(repo[p1].node(), repo[self.external].node())
            newnode = self._concludenode(
                revtoreuse, p1, editor, commitmsg=commitmsg
            )

            if newnode is not None:
                newrev = repo[newnode].rev()
                for oldrev in self.state:

        )
        % (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents)))
    )


def commitmemorynode(repo, wctx, editor, extra, user, date, commitmsg):
    '''Commit the memory changes with parents p1 and p2.
    Return node of committed revision.'''
    # Replicates the empty check in ``repo.commit``.
    if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'):
        return None

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


def commitnode(repo, editor, extra, user, date, commitmsg):
    '''Commit the wd changes with parents p1 and p2.
    Return node of committed revision.'''
    dsguard = util.nullcontextmanager()
    if not repo.ui.configbool(b'rebase', b'singletransaction'):
        dsguard = dirstateguard.dirstateguard(repo, b'rebase')