--- a/hgext/evolve.py Sat Feb 02 13:07:01 2013 +0100
+++ b/hgext/evolve.py Sat Feb 09 15:42:14 2013 +0100
@@ -884,6 +884,7 @@
contopt = opts['continue']
anyopt = opts['any']
+ dryrunopt = opts['dry_run']
if contopt:
if anyopt:
@@ -891,6 +892,9 @@
graftcmd = commands.table['graft'][0]
return graftcmd(ui, repo, old_obsolete=True, **{'continue': True})
+ return _evolveany(ui, repo, anyopt, dryrunopt)
+
+def _evolveany(ui, repo, anyopt, dryrunopt):
tr = _picknexttroubled(ui, repo, anyopt)
if tr is None:
troubled = repo.revs('troubled()')
@@ -907,13 +911,13 @@
cmdutil.bailifchanged(repo)
troubles = tr.troubles()
if 'unstable' in troubles:
- return _solveunstable(ui, repo, tr, opts['dry_run'])
+ return _solveunstable(ui, repo, tr, dryrunopt)
elif 'bumped' in troubles:
- return _solvebumped(ui, repo, tr, opts['dry_run'])
+ return _solvebumped(ui, repo, tr, dryrunopt)
elif 'divergent' in troubles:
repo = repo.unfiltered()
tr = repo[tr.rev()]
- return _solvedivergent(ui, repo, tr, opts['dry_run'])
+ return _solvedivergent(ui, repo, tr, dryrunopt)
else:
assert False # WHAT? unknown troubles