Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 46435: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
comparison
equal deleted inserted replaced
46434:1726a53a8494 46435:dfca84970da8
6080 break 6080 break
6081 ui.warn(_(b"arguments do not match paths that need resolving\n")) 6081 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6082 if hint: 6082 if hint:
6083 ui.warn(hint) 6083 ui.warn(hint)
6084 6084
6085 unresolvedf = list(ms.unresolved()) 6085 unresolvedf = ms.unresolvedcount()
6086 if not unresolvedf: 6086 if not unresolvedf:
6087 ui.status(_(b'(no more unresolved files)\n')) 6087 ui.status(_(b'(no more unresolved files)\n'))
6088 cmdutil.checkafterresolved(repo) 6088 cmdutil.checkafterresolved(repo)
6089 6089
6090 return ret 6090 return ret