Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 45688:ed0ded64a8a9
py3: convert an exception message to bytes
One of our users ran into this (unrelated to my recent work on
more specific errors).
Differential Revision: https://phab.mercurial-scm.org/D9184
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 09 Oct 2020 09:17:47 -0700 |
| parents | ebc14a2ad23d |
| children | 58e7ee23ddbd |
comparison
equal
deleted
inserted
replaced
| 45687:223296268c4e | 45688:ed0ded64a8a9 |
|---|---|
| 1307 wctx[f].audit() | 1307 wctx[f].audit() |
| 1308 try: | 1308 try: |
| 1309 wctx[f].remove(ignoremissing=True) | 1309 wctx[f].remove(ignoremissing=True) |
| 1310 except OSError as inst: | 1310 except OSError as inst: |
| 1311 repo.ui.warn( | 1311 repo.ui.warn( |
| 1312 _(b"update failed to remove %s: %s!\n") % (f, inst.strerror) | 1312 _(b"update failed to remove %s: %s!\n") |
| 1313 % (f, pycompat.bytestr(inst.strerror)) | |
| 1313 ) | 1314 ) |
| 1314 if i == 100: | 1315 if i == 100: |
| 1315 yield i, f | 1316 yield i, f |
| 1316 i = 0 | 1317 i = 0 |
| 1317 i += 1 | 1318 i += 1 |