Patchwork [2,of,4,V4,evolve-ext] evolve: factor out check for creating unstable commits

login
register
mail settings
Submitter Siddharth Agarwal
Date April 25, 2016, 11:34 p.m.
Message ID <2353fe9423c25f56c3d6.1461627281@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/14790/
State Accepted
Delegated to: Pierre-Yves David
Headers show

Comments

Siddharth Agarwal - April 25, 2016, 11:34 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1461626682 25200
#      Mon Apr 25 16:24:42 2016 -0700
# Node ID 2353fe9423c25f56c3d687cd9feac6b1c55c626d
# Parent  76085e1e4d8ec032ac2751afd01512c309165ef1
evolve: factor out check for creating unstable commits

This check is pretty non-trivial, and we do it in two places already. We're
going to do it in a third place soon.

Patch

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2501,9 +2501,8 @@  def cmdprune(ui, repo, *revs, **opts):
         if not precs:
             raise error.Abort('nothing to prune')
 
-        if not obsolete.isenabled(repo, obsolete.allowunstableopt):
-            if repo.revs("(%ld::) - %ld", revs, revs):
-                raise error.Abort(_("cannot prune in the middle of a stack"))
+        if _disallowednewunstable(repo, revs):
+            raise error.Abort(_("cannot prune in the middle of a stack"))
 
         # defines successors changesets
         sucs = scmutil.revrange(repo, succs)
@@ -3163,13 +3162,17 @@  def _foldcheck(repo, revs):
         raise error.Abort(_("cannot fold non-linear revisions "
                            "(multiple heads given)"))
     head = repo[heads.first()]
-    disallowunstable = not obsolete.isenabled(repo, obsolete.allowunstableopt)
-    if disallowunstable:
-        if repo.revs("(%ld::) - %ld", revs, revs):
-            raise error.Abort(_("cannot fold chain not ending with a head "\
-                               "or with branching"))
+    if _disallowednewunstable(repo, revs):
+        raise error.Abort(_("cannot fold chain not ending with a head "\
+                            "or with branching"))
     return root, head
 
+def _disallowednewunstable(repo, revs):
+    allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
+    if allowunstable:
+        return revset.baseset()
+    return repo.revs("(%ld::) - %ld", revs, revs)
+
 @eh.wrapcommand('graft')
 def graftwrapper(orig, ui, repo, *revs, **kwargs):
     kwargs = dict(kwargs)