diff -r 764f4581d1f3 -r 71a6723c0029 mercurial/patch.py
--- a/mercurial/patch.py	Mon Mar 06 03:25:09 2017 -0800
+++ b/mercurial/patch.py	Mon Mar 06 03:25:29 2017 -0800
@@ -1064,7 +1064,8 @@
                     # Start the editor and wait for it to complete
                     editor = ui.geteditor()
                     ret = ui.system("%s \"%s\"" % (editor, patchfn),
-                                    environ={'HGUSER': ui.username()})
+                                    environ={'HGUSER': ui.username()},
+                                    blockedtag='filterpatch')
                     if ret != 0:
                         ui.warn(_("editor exited with exit code %d\n") % ret)
                         continue