Mercurial > public > mercurial-scm > hg-stable
view mercurial/mergeutil.py @ 44349:a0ec05d93c8e
cleanup: re-run black on the codebase
Looks like a few patches have landed without having been blackened. I
strongly suspect I should write a patch for baymax that blackens
things on the way in...
# skip-blame automatic formatting
Differential Revision: https://phab.mercurial-scm.org/D8104
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 10 Feb 2020 17:31:05 -0500 |
parents | 8ff1ecfadcd1 |
children | 32ce4cbaec4b |
line wrap: on
line source
# mergeutil.py - help for merge processing in mercurial # # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # # 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'), )