[PATCH 3 of 5 evolve-ext-V2] evolve: simplify the evolve function
Laurent Charignon
lcharignon at fb.com
Tue May 5 19:42:34 CDT 2015
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1430429137 25200
# Thu Apr 30 14:25:37 2015 -0700
# Node ID d443bbbe9a7d0a55e1e4027204b56c639f5074a9
# Parent ced767d4eeff2d68680cdd60ed36139f3087eaf2
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
@@ -1258,10 +1258,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():
@@ -1318,14 +1319,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()
More information about the Mercurial-devel
mailing list