comparison mercurial/merge.py @ 46361:dfca84970da8

cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))

This avoids some pointless copying.

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

46360:1726a53a8494

        ### check phase
        if not overwrite:
            if len(pl) > 1:
                raise error.Abort(_(b"outstanding uncommitted merge"))
            ms = wc.mergestate()
            if list(ms.unresolved()):
                raise error.Abort(
                    _(b"outstanding merge conflicts"),
                    hint=_(b"use 'hg resolve' to resolve"),
                )
        if branchmerge:

46361:dfca84970da8

        ### check phase
        if not overwrite:
            if len(pl) > 1:
                raise error.Abort(_(b"outstanding uncommitted merge"))
            ms = wc.mergestate()
            if ms.unresolvedcount():
                raise error.Abort(
                    _(b"outstanding merge conflicts"),
                    hint=_(b"use 'hg resolve' to resolve"),
                )
        if branchmerge: