mercurial/mergeutil.py

revset: handle wdir() in `sort(..., -topo)`

The last apparent usage of `repo.changelog.parentrevs` in revsets is in
`children()`, but since the sets being operated on never include wdir(), it's
never called with `wdirrev` and the wdir() arg on the command line is
effectively ignored instead of aborting there.  I'm not sure how to fix that.

Before (on a clone of hg):

    $ python3.8 hg perf::revset --config extensions.perf=contrib/perf.py 'sort(all(), -topo)'
    ! wall 0.123663 comb 0.130000 user 0.130000 sys 0.000000 (best of 76)

After:

    $ python3.8 hg perf::revset --config extensions.perf=contrib/perf.py 'sort(all(), -topo)'
    ! wall 0.123838 comb 0.130000 user 0.130000 sys 0.000000 (best of 75)

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Olivia Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.


from .i18n import _

from . import error


def checkunresolved(ms):
    if ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )