Mercurial > public > mercurial-scm > hg-stable

diff hgext/transplant.py @ 37087:f0b6fbea00cf
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: 5bc7ff103081
children: a8a902d7176e
--- a/hgext/transplant.py	Thu Mar 22 21:19:31 2018 +0900
+++ b/hgext/transplant.py	Thu Mar 22 21:56:20 2018 +0900
@@ -38,6 +38,9 @@
     util,
     vfs as vfsmod,
 )
+from mercurial.utils import (
+    stringutil,
+)
 
 class TransplantError(error.Abort):
     pass
@@ -311,7 +314,7 @@
                 p1 = repo.dirstate.p1()
                 p2 = node
                 self.log(user, date, message, p1, p2, merge=merge)
-                self.ui.write(util.forcebytestr(inst) + '\n')
+                self.ui.write(stringutil.forcebytestr(inst) + '\n')
                 raise TransplantError(_('fix up the working directory and run '
                                         'hg transplant --continue'))
         else: