Mercurial > public > mercurial-scm > hg

comparison mercurial/mergeutil.py @ 43076:2372284d9457

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
43075:57875cf423c9 43076:2372284d9457
7 7
8 from __future__ import absolute_import 8 from __future__ import absolute_import
9 9
10 from .i18n import _ 10 from .i18n import _
11 11
12 from . import ( 12 from . import error
13 error, 13
14 )
15 14
16 def checkunresolved(ms): 15 def checkunresolved(ms):
17 if list(ms.unresolved()): 16 if list(ms.unresolved()):
18 raise error.Abort(_("unresolved merge conflicts " 17 raise error.Abort(
19 "(see 'hg help resolve')")) 18 _("unresolved merge conflicts " "(see 'hg help resolve')")
19 )
20 if ms.mdstate() != 's' or list(ms.driverresolved()): 20 if ms.mdstate() != 's' or list(ms.driverresolved()):
21 raise error.Abort(_('driver-resolved merge conflicts'), 21 raise error.Abort(
22 hint=_('run "hg resolve --all" to resolve')) 22 _('driver-resolved merge conflicts'),
23 hint=_('run "hg resolve --all" to resolve'),
24 )