diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -568,11 +568,10 @@ def finishfold(ui, repo, ctx, oldctx, ne
         replacements.append((ich, (n,)))
     return repo[n], replacements
 
-def drop(ui, state, ha, opts):
-    repo, ctxnode = state.repo, state.parentctxnode
-    ctx = repo[ctxnode]
-    return ctx, [(repo[ha].node(), ())]
-
+class drop(histeditaction):
+    def run(self):
+        parentctx = self.repo[self.state.parentctxnode]
+        return parentctx, [(self.node, tuple())]
 
 def message(ui, state, ha, opts):
     repo, ctxnode = state.repo, state.parentctxnode