Mercurial > public > mercurial-scm > hg

diff mercurial/commands.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 63f0e31af0e5
children bb3a5c0df06b
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jan 15 01:20:47 2021 +0100
+++ b/mercurial/commands.py	Mon May 18 17:29:53 2020 -0400
@@ -6082,7 +6082,7 @@
             if hint:
                 ui.warn(hint)
 
-    unresolvedf = list(ms.unresolved())
+    unresolvedf = ms.unresolvedcount()
     if not unresolvedf:
         ui.status(_(b'(no more unresolved files)\n'))
         cmdutil.checkafterresolved(repo)