Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 25151:6eb4bdad198f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: use __builtins__.all instead of util.all
author Augie Fackler <augie@google.com>
date Sat, 16 May 2015 14:34:19 -0400
parents 51844b8b5017
children 328739ea70c3
line wrap: on
line diff
--- a/mercurial/merge.py	Sat May 16 14:34:04 2015 -0400
+++ b/mercurial/merge.py	Sat May 16 14:34:19 2015 -0400
@@ -605,7 +605,7 @@
             # Consensus?
             if len(bids) == 1: # all bids are the same kind of method
                 m, l = bids.items()[0]
-                if util.all(a == l[0] for a in l[1:]): # len(bids) is > 1
+                if all(a == l[0] for a in l[1:]): # len(bids) is > 1
                     repo.ui.note(" %s: consensus for %s\n" % (f, m))
                     actions[f] = l[0]
                     continue
@@ -617,7 +617,7 @@
             # If there are gets and they all agree [how could they not?], do it.
             if 'g' in bids:
                 ga0 = bids['g'][0]
-                if util.all(a == ga0 for a in bids['g'][1:]):
+                if all(a == ga0 for a in bids['g'][1:]):
                     repo.ui.note(" %s: picking 'get' action\n" % f)
                     actions[f] = ga0
                     continue