view mercurial/mergeutil.py @ 40473:d7d3164e6a31 stable

phabricator: properly encode boolean types in the request body

I tripped over this playing with `hg debugcallconduit` to query for valid
reviewers.  If the JSON on stdin is written as 'True' or 'False', python
complains it isn't valid JSON.  If it's written as 'true' or 'false', it made it
to the server, but got kicked back with this:

    abort: Conduit Error (ERR-CONDUIT-CORE): Error while reading "isBot":
           Expected boolean (true or false), got something else.

The test isn't really relevant here (the code can be reverted, and it will
pass), but this gives us coverage for the debug command.

# 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(_("unresolved merge conflicts "
                            "(see 'hg help resolve')"))
    if ms.mdstate() != 's' or list(ms.driverresolved()):
        raise error.Abort(_('driver-resolved merge conflicts'),
                          hint=_('run "hg resolve --all" to resolve'))