Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 25149:3f0744eeaeaf
cleanup: use __builtins__.any instead of util.any
any() is available in all Python versions we support now.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sat, 16 May 2015 14:30:07 -0400 |
| parents | a7701001c829 |
| children | 235f6490550c |
line wrap: on
line diff
--- a/mercurial/commands.py Sat May 16 14:31:03 2015 -0400 +++ b/mercurial/commands.py Sat May 16 14:30:07 2015 -0400 @@ -4047,8 +4047,8 @@ parents = ctx.parents() changed = "" if default or id or num: - if (util.any(repo.status()) - or util.any(ctx.sub(s).dirty() for s in ctx.substate)): + if (any(repo.status()) + or any(ctx.sub(s).dirty() for s in ctx.substate)): changed = '+' if default or id: output = ["%s%s" % @@ -5522,7 +5522,7 @@ hint = _("uncommitted merge, use --all to discard all changes," " or 'hg update -C .' to abort the merge") raise util.Abort(msg, hint=hint) - dirty = util.any(repo.status()) + dirty = any(repo.status()) node = ctx.node() if node != parent: if dirty: