Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 37369:22f19da5736e | 37370:b6de372b4309 |
|---|---|
| 76 | 76 |
| 77 try: | 77 try: |
| 78 self.context = int(self.context) | 78 self.context = int(self.context) |
| 79 except ValueError: | 79 except ValueError: |
| 80 raise error.Abort(_('diff context lines count must be ' | 80 raise error.Abort(_('diff context lines count must be ' |
| 81 'an integer, not %r') % self.context) | 81 'an integer, not %r') % |
| 82 pycompat.bytestr(self.context)) | |
| 82 | 83 |
| 83 def copy(self, **kwargs): | 84 def copy(self, **kwargs): |
| 84 opts = dict((k, getattr(self, k)) for k in self.defaults) | 85 opts = dict((k, getattr(self, k)) for k in self.defaults) |
| 85 opts = pycompat.strkwargs(opts) | 86 opts = pycompat.strkwargs(opts) |
| 86 opts.update(kwargs) | 87 opts.update(kwargs) |