Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mdiff.py @ 37370:b6de372b4309
py3: fix error string with bytestr() on repr()d value
Differential Revision: https://phab.mercurial-scm.org/D3131
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 05 Apr 2018 17:15:52 +0530 |
| parents | c6a61298ac32 |
| children | d3286dd2ca2f |
line wrap: on
line diff
--- a/mercurial/mdiff.py Thu Apr 05 17:14:11 2018 +0530 +++ b/mercurial/mdiff.py Thu Apr 05 17:15:52 2018 +0530 @@ -78,7 +78,8 @@ self.context = int(self.context) except ValueError: raise error.Abort(_('diff context lines count must be ' - 'an integer, not %r') % self.context) + 'an integer, not %r') % + pycompat.bytestr(self.context)) def copy(self, **kwargs): opts = dict((k, getattr(self, k)) for k in self.defaults)