# HG changeset patch # User Anton Shestakov # Date 2021-07-28 10:47:21 # Node ID e69c82bf3a0122ac032834f2bb8b092fcc82e8db # Parent 16c60e90a49622646de22d82eecd2487c82e2983 fix: use obsolete.isenabled() to check for experimental.allowdivergence Now that obsolete.isenabled() can also check if divergence is allowed, let's use it for consistency. Other experimental.evolution options are already checked via this function. Differential Revision: https://phab.mercurial-scm.org/D11222 diff --git a/hgext/fix.py b/hgext/fix.py --- a/hgext/fix.py +++ b/hgext/fix.py @@ -148,6 +148,7 @@ from mercurial import ( mdiff, merge, mergestate as mergestatemod, + obsolete, pycompat, registrar, rewriteutil, @@ -452,10 +453,7 @@ def checkfixablectx(ui, repo, ctx): """Aborts if the revision shouldn't be replaced with a fixed one.""" if ctx.obsolete(): # It would be better to actually check if the revision has a successor. - allowdivergence = ui.configbool( - b'experimental', b'evolution.allowdivergence' - ) - if not allowdivergence: + if not obsolete.isenabled(repo, obsolete.allowdivergenceopt): raise error.Abort( b'fixing obsolete revision could cause divergence' )