diff -r f99d64e8a4e4 -r f0b6fbea00cf hgext/convert/subversion.py --- a/hgext/convert/subversion.py Thu Mar 22 21:19:31 2018 +0900 +++ b/hgext/convert/subversion.py Thu Mar 22 21:56:20 2018 +0900 @@ -16,7 +16,10 @@ util, vfs as vfsmod, ) -from mercurial.utils import dateutil +from mercurial.utils import ( + dateutil, + stringutil, +) from . import common @@ -147,7 +150,7 @@ # Caller may interrupt the iteration pickle.dump(None, fp, protocol) except Exception as inst: - pickle.dump(util.forcebytestr(inst), fp, protocol) + pickle.dump(stringutil.forcebytestr(inst), fp, protocol) else: pickle.dump(None, fp, protocol) fp.flush() @@ -1315,7 +1318,7 @@ fp.close() try: output = self.run0('commit', - username=util.shortuser(commit.author), + username=stringutil.shortuser(commit.author), file=messagefile, encoding='utf-8') try: