Mercurial > hg

diff 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
line wrap: on
line diff
--- a/mercurial/mergeutil.py	Fri Jan 15 01:20:47 2021 +0100
+++ b/mercurial/mergeutil.py	Mon May 18 17:29:53 2020 -0400
@@ -13,7 +13,7 @@
 
 
 def checkunresolved(ms):
-    if list(ms.unresolved()):
+    if ms.unresolvedcount():
         raise error.StateError(
             _(b"unresolved merge conflicts (see 'hg help resolve')")
         )