diff -r cffc4f7c6c36 -r 30657909b2ba hgext/mq.py
--- a/hgext/mq.py	Wed Sep 30 21:48:53 2015 -0700
+++ b/hgext/mq.py	Mon Oct 12 03:37:09 2015 -0500
@@ -1428,9 +1428,9 @@
             except AbortNoCleanup:
                 raise
             except: # re-raises
-                self.ui.warn(_('cleaning up working directory...'))
-                node = repo.dirstate.p1()
-                hg.revert(repo, node, None)
+                self.ui.warn(_('cleaning up working directory...\n'))
+                cmdutil.revert(self.ui, repo, repo['.'],
+                               repo.dirstate.parents(), no_backup=True)
                 # only remove unknown files that we know we touched or
                 # created while patching
                 for f in all_files: