diff -r 77cd647b04ac -r 762c8a128357 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Mon Nov 21 21:06:34 2016 -0500
+++ b/mercurial/cmdutil.py	Mon Nov 21 21:16:54 2016 -0500
@@ -3522,4 +3522,9 @@
         hint = after[0]
     raise error.Abort(_('no %s in progress') % task, hint=hint)
 
-dirstateguard = dirstateguardmod.dirstateguard
+class dirstateguard(dirstateguardmod.dirstateguard):
+    def __init__(self, repo, name):
+        dirstateguardmod.dirstateguard.__init__(self, repo, name)
+        repo.ui.deprecwarn(
+            'dirstateguard has moved from cmdutil to dirstateguard',
+            '4.1')