--- a/mercurial/util.py	Tue May 02 17:05:22 2017 +0900
+++ b/mercurial/util.py	Wed Apr 26 21:56:47 2017 +0900
@@ -42,6 +42,7 @@
 import zlib
 
 from . import (
+    base85,
     encoding,
     error,
     i18n,
@@ -50,6 +51,9 @@
     pycompat,
 )
 
+b85decode = base85.b85decode
+b85encode = base85.b85encode
+
 cookielib = pycompat.cookielib
 empty = pycompat.empty
 httplib = pycompat.httplib