diff -r f99d64e8a4e4 -r f0b6fbea00cf mercurial/crecord.py --- a/mercurial/crecord.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/crecord.py Thu Mar 22 21:56:20 2018 +0900 @@ -23,6 +23,9 @@ scmutil, util, ) +from .utils import ( + stringutil, +) stringio = util.stringio # This is required for ncurses to display non-ASCII characters in default user @@ -585,7 +588,7 @@ # long as not explicitly set to a falsy value - especially, # when not set at all. This is to stay most compatible with # previous (color only) behaviour. - uicolor = util.parsebool(self.ui.config('ui', 'color')) + uicolor = stringutil.parsebool(self.ui.config('ui', 'color')) self.usecolor = uicolor is not False # the currently selected header, hunk, or hunk-line @@ -1058,7 +1061,7 @@ if len(lines) != self.numstatuslines: self.numstatuslines = len(lines) self.statuswin.resize(self.numstatuslines, self.xscreensize) - return [util.ellipsis(l, self.xscreensize - 1) for l in lines] + return [stringutil.ellipsis(l, self.xscreensize - 1) for l in lines] def updatescreen(self): self.statuswin.erase()