base85: proxy through util module I'm going to replace hgimporter with a simpler import function, so we can access to pure/cext modules by name: # util.py base85 = policy.importmod('base85') # select pure.base85 or cext.base85 # cffi/base85.py from ..pure.base85 import * # may re-export pure.base85 functions This means we'll have to use policy.importmod() function in place of the standard import statement, but we wouldn't want to write it every place where C extension modules are used. So this patch makes util host base85 functions.

--- 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