Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix error string with bytestr() on repr()d value
authorPulkit Goyal <7895pulkit@gmail.com>
Thu, 05 Apr 2018 17:15:52 +0530
changeset 37370 b6de372b4309
parent 37369 22f19da5736e
child 37371 d3286dd2ca2f
py3: fix error string with bytestr() on repr()d value Differential Revision: https://phab.mercurial-scm.org/D3131
mercurial/mdiff.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial