Mercurial > public > mercurial-scm > hg
comparison mercurial/crecord.py @ 43364:dd64e229c46b stable
py3: fix crecord.py's editpatchwitheditor exception message encoding
Differential Revision: https://phab.mercurial-scm.org/D7194
| author | Emmanuel Leblond <emmanuel.leblond@gmail.com> |
|---|---|
| date | Fri, 01 Nov 2019 17:38:07 +0100 |
| parents | b02387005515 |
| children | 117b41b1859d |
comparison
equal
deleted
inserted
replaced
| 43363:2ded39ef5bf7 | 43364:dd64e229c46b |
|---|---|
| 1814 | 1814 |
| 1815 # start the editor and wait for it to complete | 1815 # start the editor and wait for it to complete |
| 1816 try: | 1816 try: |
| 1817 patch = self.ui.edit(patch.getvalue(), b"", action=b"diff") | 1817 patch = self.ui.edit(patch.getvalue(), b"", action=b"diff") |
| 1818 except error.Abort as exc: | 1818 except error.Abort as exc: |
| 1819 self.errorstr = str(exc) | 1819 self.errorstr = stringutil.forcebytestr(exc) |
| 1820 return None | 1820 return None |
| 1821 finally: | 1821 finally: |
| 1822 self.stdscr.clear() | 1822 self.stdscr.clear() |
| 1823 self.stdscr.refresh() | 1823 self.stdscr.refresh() |
| 1824 | 1824 |