Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mergeutil.py @ 43076:2372284d9457
formatting: blacken the codebase
This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.
Done with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S
# skip-blame mass-reformatting only
# no-check-commit reformats foo_bar functions
Differential Revision: https://phab.mercurial-scm.org/D6971
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 06 Oct 2019 09:45:02 -0400 |
| parents | c1149533676b |
| children | 687b865b95ad |
line wrap: on
line diff
--- a/mercurial/mergeutil.py Sat Oct 05 10:29:34 2019 -0400 +++ b/mercurial/mergeutil.py Sun Oct 06 09:45:02 2019 -0400 @@ -9,14 +9,16 @@ from .i18n import _ -from . import ( - error, -) +from . import error + def checkunresolved(ms): if list(ms.unresolved()): - raise error.Abort(_("unresolved merge conflicts " - "(see 'hg help resolve')")) + 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')) + raise error.Abort( + _('driver-resolved merge conflicts'), + hint=_('run "hg resolve --all" to resolve'), + )