view mercurial/mergeutil.py @ 45293:4e6a2889dd1d

merge: use the new action based mapping introduced in mergeresult obj

Before this patch, we have good number of instances of following types:

```
for f, (m, args, msg) in mresult.actions:
    if m == ACTION_X:
        do_something
```

We iterate over the whole list and then filter for a certain action. Previous
patch introduced a action based mapping in mergeresult object. The above code
now looks like:

```
for f, args, msg in mresult.getactions([ACTION_X, ...]):
    do_something
```

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

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt 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 __future__ import absolute_import

from .i18n import _

from . import error


def checkunresolved(ms):
    if list(ms.unresolved()):
        raise error.Abort(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )
    if ms.mdstate() != b's' or list(ms.driverresolved()):
        raise error.Abort(
            _(b'driver-resolved merge conflicts'),
            hint=_(b'run "hg resolve --all" to resolve'),
        )