D546: morestatus: simplify check for unresolved merge conflicts
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Aug 29 14:05:55 UTC 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3340efe80803: morestatus: simplify check for unresolved merge conflicts (authored by martinvonz).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D546?vs=1369&id=1394
REVISION DETAIL
https://phab.mercurial-scm.org/D546
AFFECTED FILES
mercurial/cmdutil.py
CHANGE DETAILS
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -587,7 +587,7 @@
return
m = scmutil.match(repo[None])
- unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u']
+ unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
if unresolvedlist:
mergeliststr = '\n'.join(
[' %s' % os.path.relpath(
To: martinvonz, #hg-reviewers, quark
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list