Comments
Patch
@@ -32,6 +32,7 @@
revignored = -3
# To do with obsolescence
revprecursor = -4
+revpruned = -5
cmdtable = {}
command = cmdutil.command(cmdtable)
@@ -487,6 +488,9 @@
targetctx.description().split('\n', 1)[0])
msg = _('note: not rebasing %s, already in destination as %s\n')
ui.status(msg % (desc, desctarget))
+ elif state[rev] == revpruned:
+ msg = _('note: not rebasing %s, it has no successor\n')
+ ui.status(msg % desc)
else:
ui.status(_('already rebased %s as %s\n') %
(desc, repo[state[rev]]))
@@ -676,7 +680,7 @@
elif p1n in state:
if state[p1n] == nullmerge:
p1 = target
- elif state[p1n] in (revignored, revprecursor):
+ elif state[p1n] in (revignored, revprecursor, revpruned):
Given how often this appears, It seems like we need some kind of generic constant defined once at the top of the file. Can you follow up with such cleanup?