--- a/hgext/mq.py	Mon Nov 21 21:29:32 2016 -0500
+++ b/hgext/mq.py	Mon Nov 21 21:05:52 2016 -0500
@@ -79,6 +79,7 @@
 from mercurial import (
     cmdutil,
     commands,
+    dirstateguard,
     error,
     extensions,
     hg,
@@ -1724,7 +1725,7 @@
 
             dsguard = None
             try:
-                dsguard = cmdutil.dirstateguard(repo, 'mq.refresh')
+                dsguard = dirstateguard.dirstateguard(repo, 'mq.refresh')
                 if diffopts.git or diffopts.upgrade:
                     copies = {}
                     for dst in a: