view mercurial/mergeutil.py @ 45893:f4065c3f09b8

histedit: don't crash if commit message is empty

If the commit message is empty, histedit will crash before this patch
because it assumes that `summary.splitlines()` is non-empty. One of
our users at work ran into this crash for a commit that was created by
an internal system.

I don't think we have a good way of testing this because it's hard to
create a commit with an empty commit message. I've added a comment to
help prevent regressions.

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

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