diff -r 52e4bfebc4ba -r 7cf332318f62 mercurial/encoding.py --- a/mercurial/encoding.py Sat Nov 16 12:19:43 2019 -0500 +++ b/mercurial/encoding.py Sat Nov 16 15:43:21 2019 +0900 @@ -327,6 +327,7 @@ t = s[start:x] if colwidth(t) == c: return t + raise ValueError('substring not found') def trim(s, width, ellipsis=b'', leftside=False):