view tests/revnamesext.py @ 45555:feffeb18d412

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict

When in-memory rebase runs into conflicts, it redoes the whole rebase
operation. This patch teaches it to instead discard just the current
`overlayworkingctx` and redo that node on disk.

I've tested this by enabling in-memory rebase by default and checking
that there are no unexpected differences after this patch.

The next step is to make it so that `hg rebase --continue` can use
in-memory merge.

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

# Dummy extension to define a namespace containing revision names

from __future__ import absolute_import

from mercurial import namespaces


def reposetup(ui, repo):
    names = {b'r%d' % rev: repo[rev].node() for rev in repo}
    namemap = lambda r, name: names.get(name)
    nodemap = lambda r, node: [b'r%d' % repo[node].rev()]

    ns = namespaces.namespace(
        b'revnames',
        templatename=b'revname',
        logname=b'revname',
        listnames=lambda r: names.keys(),
        namemap=namemap,
        nodemap=nodemap,
    )
    repo.names.addnamespace(ns)