comparison mercurial/hg.py @ 44270:f546d2170b0f

merge: introduce a clean_update() for that use-case

I find it hard to understand what value to pass for all the arguments
to `merge.update()`. I would like to introduce functions that are more
specific to each use-case. We already have `graft()`. This patch
introduces a `clean_update()` and uses it in some places to show that
it works.

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

44269:48a1a974a92c

    else:
        # there were no conficts, mergestate was not stored
        node = repo[b'.'].hex()

    repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
    stats = mergemod.update(repo, node, branchmerge=False, force=True)
    assert stats.unresolvedcount == 0
    _showstats(repo, stats)


def _incoming(

44270:f546d2170b0f

    else:
        # there were no conficts, mergestate was not stored
        node = repo[b'.'].hex()

    repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
    stats = mergemod.clean_update(repo[node])
    assert stats.unresolvedcount == 0
    _showstats(repo, stats)


def _incoming(