Patchwork D3131: py3: fix error string with bytestr() on repr()d value

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 1:48 p.m.
Message ID <2ab44fdbde94e1baa139730196d38e92@localhost.localdomain>
Download mbox | patch
Permalink /patch/30371/
State Not Applicable
Headers show

Comments

phabricator - April 5, 2018, 1:48 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb6de372b4309: py3: fix error string with bytestr() on repr()d value (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3131?vs=7714&id=7729

REVISION DETAIL
  https://phab.mercurial-scm.org/D3131

AFFECTED FILES
  mercurial/mdiff.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -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)