[PATCH 2 of 4 evolve-ext] evolve: simplify the evolve function

[Laurent Charignon]

# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1430429137 25200
#      Thu Apr 30 14:25:37 2015 -0700
# Node ID 1a06c8c24ea35697471e2108581a6be71773c8e0
# Parent  1dd10a7e485b881c472ead204407e85e9b64fa54
evolve: simplify the evolve function

We compute the troubles once and use it in two places instead of recomputing
them just to count them.

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1256,10 +1256,11 @@
     dryrunopt = opts['dry_run']
     confirmopt = opts['confirm']
     ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve')
+    troubled = set(repo.revs('troubled()'))
 
     # Progress handling
     seen = 1
-    count = allopt and _counttroubled(ui, repo) or 1
+    count = allopt and len(troubled) or 1
     showprogress = allopt
 
     def progresscb():
@@ -1316,14 +1317,6 @@
     else:
         assert False  # WHAT? unknown troubles
 
-def _counttroubled(ui, repo):
-    """Count the amount of troubled changesets"""
-    troubled = set()
-    troubled.update(getrevs(repo, 'unstable'))
-    troubled.update(getrevs(repo, 'bumped'))
-    troubled.update(getrevs(repo, 'divergent'))
-    return len(troubled)
-
 def _picknexttroubled(ui, repo, pickany=False, progresscb=None):
     """Pick a the next trouble changeset to solve"""
     if progresscb: progresscb()