diff -r c4c8d0d1267f -r 0ea8b9576d7c mercurial/patch.py --- a/mercurial/patch.py Mon Apr 09 20:52:54 2018 +0900 +++ b/mercurial/patch.py Mon Apr 09 20:54:00 2018 +0900 @@ -28,6 +28,7 @@ ) from . import ( copies, + diffhelpers, encoding, error, mail, @@ -39,7 +40,6 @@ util, vfs as vfsmod, ) -from .pure import diffhelpers from .utils import ( dateutil, procutil,