hgext3rd/evolve/rewriteutil.py
changeset 5135 731b5a89a784
parent 5083 e50f4fc6cc6d
child 5136 bbf33d5f32ef
--- a/hgext3rd/evolve/rewriteutil.py	Tue Feb 04 13:43:16 2020 -0800
+++ b/hgext3rd/evolve/rewriteutil.py	Tue Feb 04 16:22:40 2020 -0800
@@ -51,7 +51,7 @@
         summary %= (node.short(tonode(first)), numrevs - 1)
     return summary
 
-def precheck(repo, revs, action=b'rewrite'):
+def precheck(repo, revs, action=b'rewrite', allowdivergence=None):
     """check if <revs> can be rewritten
 
     <action> can be used to control the commit message.
@@ -77,8 +77,9 @@
         hint = _(b"see 'hg help evolution.instability'")
         raise error.Abort(msg, hint=hint)
     divrisk = revs_hascontentdivrisk(repo, revs)
-    allowdivergence = repo.ui.configbool(b'experimental',
-                                         b'evolution.allowdivergence')
+    if allowdivergence is None:
+        allowdivergence = repo.ui.configbool(b'experimental',
+                                             b'evolution.allowdivergence')
     if divrisk and not allowdivergence:
         localdiv = repo[divrisk[0]]
         otherdiv, base = repo[divrisk[1][0]], repo[divrisk[1][1]]