Mercurial > hg

diff mercurial/bundle2.py @ 37084:f0b6fbea00cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stringutil: bulk-replace call sites to point to new module This might conflict with other patches floating around, sorry.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 22 Mar 2018 21:56:20 +0900
parents 66c0ff381cfc
children 6c7a6b04b274
line wrap: on
line diff
--- a/mercurial/bundle2.py	Thu Mar 22 21:19:31 2018 +0900
+++ b/mercurial/bundle2.py	Thu Mar 22 21:56:20 2018 +0900
@@ -171,6 +171,9 @@
     url,
     util,
 )
+from .utils import (
+    stringutil,
+)
 
 urlerr = util.urlerr
 urlreq = util.urlreq
@@ -1091,7 +1094,7 @@
             ui.debug('bundle2-generatorexit\n')
             raise
         except BaseException as exc:
-            bexc = util.forcebytestr(exc)
+            bexc = stringutil.forcebytestr(exc)
             # backup exception data for later
             ui.debug('bundle2-input-stream-interrupt: encoding exception %s'
                      % bexc)