diff -r e8a7c1a0565a -r a39dce4a76b8 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Fri Sep 01 12:34:36 2017 -0700
+++ b/mercurial/cmdutil.py	Fri Sep 01 12:34:36 2017 -0700
@@ -3026,8 +3026,7 @@
     else:
         return f not in ctx2.manifest()
 
-# TODO: remove the commitfunc parameter because it is no longer used
-def amend(ui, repo, commitfunc, old, extra, pats, opts):
+def amend(ui, repo, old, extra, pats, opts):
     # avoid cycle context -> subrepo -> cmdutil
     from . import context