# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1456253965 28800
# Node ID 377f0d8ff87437de3e5782786555d8136dd7efc5
# Parent  5c11702fe2a3bb22f9238525cee70afff29a3b4e
merge: use any() instead of for loop when checking for dirty subrepos

I think it's both simpler and clearer to use any() than the current
for loop.

While at it, also drop the call to sorted(), since it doesn't matter
which order we iterate over subrepos.

diff -r 5c11702fe2a3 -r 377f0d8ff874 mercurial/merge.py
--- a/mercurial/merge.py	Wed Feb 24 19:31:55 2016 +0000
+++ b/mercurial/merge.py	Tue Feb 23 10:59:25 2016 -0800
@@ -801,10 +801,8 @@
 
     if '.hgsubstate' in m1:
         # check whether sub state is modified
-        for s in sorted(wctx.substate):
-            if wctx.sub(s).dirty():
-                m1['.hgsubstate'] += '+'
-                break
+        if any(wctx.sub(s).dirty() for s in wctx.substate):
+            m1['.hgsubstate'] += '+'
 
     # Compare manifests
     if matcher is not None: