Mercurial > public > mercurial-scm > hg

comparison mercurial/mergeutil.py @ 46361:dfca84970da8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) This avoids some pointless copying. Differential Revision: https://phab.mercurial-scm.org/D8566
author Augie Fackler <augie@google.com>
date Mon, 18 May 2020 17:29:53 -0400
parents fa87536d3d70
children d4ba4d51f85f
comparison
equal deleted inserted replaced
46360:1726a53a8494 46361:dfca84970da8
11 11
12 from . import error 12 from . import error
13 13
14 14
15 def checkunresolved(ms): 15 def checkunresolved(ms):
16 if list(ms.unresolved()): 16 if ms.unresolvedcount():
17 raise error.StateError( 17 raise error.StateError(
18 _(b"unresolved merge conflicts (see 'hg help resolve')") 18 _(b"unresolved merge conflicts (see 'hg help resolve')")
19 ) 19 )