hgext/rebase.py
changeset 27014 4223fc58f952
parent 27013 e97132eb841c
child 27058 616ea95c8f11
--- a/hgext/rebase.py	Wed Nov 18 16:06:00 2015 -0800
+++ b/hgext/rebase.py	Wed Nov 18 15:58:06 2015 -0800
@@ -34,6 +34,7 @@
 revprecursor = -4
 # plain prune (no successor)
 revpruned = -5
+revskipped = (revignored, revprecursor, revpruned)
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
@@ -681,7 +682,7 @@
     elif p1n in state:
         if state[p1n] == nullmerge:
             p1 = target
-        elif state[p1n] in (revignored, revprecursor, revpruned):
+        elif state[p1n] in revskipped:
             p1 = nearestrebased(repo, p1n, state)
             if p1 is None:
                 p1 = target
@@ -697,7 +698,7 @@
         if p2n in state:
             if p1 == target: # p1n in targetancestors or external
                 p1 = state[p2n]
-            elif state[p2n] in (revignored, revprecursor, revpruned):
+            elif state[p2n] in revskipped:
                 p2 = nearestrebased(repo, p2n, state)
                 if p2 is None:
                     # no ancestors rebased yet, detach