view mercurial/mergeutil.py @ 40396:973ff03d9bc0

exewrapper: convert to _tcsxxx functions for Unicode compatability

This fixes more than 50 tests on py3 on Windows when enabled, mostly hooks and
such that invoked `hg` directly.  187 left to go.

I skipped doing the abort printing with Unicode because of apparent issues with
MinGW [1].  It may be moot though, as MinGW isn't listed as a supported compiler
after 3.4 [2].

[1] https://stackoverflow.com/questions/17700797/printf-wprintf-s-s-ls-char-and-wchar-errors-not-announced-by-a-compil
[2] https://wiki.python.org/moin/WindowsCompilers

# 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'))