[PATCH 2 of 5 evolve-ext] evolve: move return statement at the right level
Laurent Charignon
lcharignon at fb.com
Wed May 13 12:04:20 CDT 2015
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1431535416 25200
# Wed May 13 09:43:36 2015 -0700
# Node ID b2e0ca2d6ab8e8399feb6138b6afc1beb9eadc52
# Parent 08577d19560731490ddf3446ebe785ce3219b52a
evolve: move return statement at the right level
When no trouble was found with the --rev option, the code of the evolve
function would continue running and would solve unwanted troubles. This patch
makes sure it does not happen.
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1314,7 +1314,7 @@
progresscb)
seen += 1
_cleanup(ui, repo, startnode, showprogress)
- return
+ return
nexttrouble = _picknexttroubled(ui, repo, anyopt or allopt)
# No trouble to resolve
if not nexttrouble:
More information about the Mercurial-devel
mailing list