comparison hgext/rebase.py @ 44348:8082a77cc3a2

rebase: remove some redundant setting of dirstate parents

Since we're now setting the dirstate parents to its correct values
from the beginning (right after `merge.update()`), we usually don't
need to set them again before committing. The only case we need to
care about is when committing collapsed commits. So we can remove the
`setparents()` calls just before committing and add one only for the
collapse case.

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

44347:9c9cfecd4600

                        commitmsg += b'\n* %s' % repo[rebased].description()
                editopt = True
            editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
            revtoreuse = max(self.state)

            newnode = self._concludenode(
                revtoreuse, p1, self.external, editor, commitmsg=commitmsg
            )

            if newnode is not None:

    # ``branch`` (used when passing ``--keepbranches``).
    branch = None
    if b'branch' in extra:
        branch = extra[b'branch']

    wctx.setparents(repo[p1].node(), repo[p2].node())
    memctx = wctx.tomemctx(
        commitmsg,
        date=date,
        extra=extra,
        user=user,

    Return node of committed revision.'''
    dsguard = util.nullcontextmanager()
    if not repo.ui.configbool(b'rebase', b'singletransaction'):
        dsguard = dirstateguard.dirstateguard(repo, b'rebase')
    with dsguard:
        repo.setparents(repo[p1].node(), repo[p2].node())

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

44348:8082a77cc3a2

                        commitmsg += b'\n* %s' % repo[rebased].description()
                editopt = True
            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:

    # ``branch`` (used when passing ``--keepbranches``).
    branch = None
    if b'branch' in extra:
        branch = extra[b'branch']

    memctx = wctx.tomemctx(
        commitmsg,
        date=date,
        extra=extra,
        user=user,

    Return node of committed revision.'''
    dsguard = util.nullcontextmanager()
    if not repo.ui.configbool(b'rebase', b'singletransaction'):
        dsguard = dirstateguard.dirstateguard(repo, b'rebase')
    with dsguard:
        # Commit might fail if unresolved files exist
        newnode = repo.commit(
            text=commitmsg, user=user, date=date, extra=extra, editor=editor
        )