# HG changeset patch # User Patrick Mezard # Date 1345876202 -7200 # Node ID 8b25e9cf76fdc4ccd52224550054cddf99c4c90e # Parent ddeb71df916d349e85c4f51b38408cf6b32d82ec evolve: avoid 'any' argument name in _picknexttroubled() diff -r ddeb71df916d -r 8b25e9cf76fd hgext/evolve.py --- a/hgext/evolve.py Sat Aug 25 08:26:28 2012 +0200 +++ b/hgext/evolve.py Sat Aug 25 08:30:02 2012 +0200 @@ -1338,14 +1338,14 @@ else: assert False # WHAT? unknown troubles -def _picknexttroubled(ui, repo, any=False): +def _picknexttroubled(ui, repo, pickany=False): """Pick a the next trouble changeset to solve""" tr = _stabilizableunstable(repo, repo['.']) if tr is None: wdp = repo['.'] if 'conflicting' in wdp.troubles(): tr = wdp - if tr is None and any: + if tr is None and pickany: troubled = list(repo.set('unstable()')) if not troubled: troubled = list(repo.set('latecomer()'))