Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix a str + bytes issue in an exception handler stable
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 21 Nov 2019 14:28:28 -0500
branchstable
changeset 43439 eab0b7383cd3
parent 43438 aff3f6e407a1
child 43440 5be128f669d4
patch: fix a str + bytes issue in an exception handler Flagged by pytype. Differential Revision: https://phab.mercurial-scm.org/D7466
mercurial/patch.py file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Wed Nov 20 08:11:21 2019 -0800
+++ b/mercurial/patch.py	Thu Nov 21 14:28:28 2019 -0500
@@ -2290,7 +2290,7 @@
             try:
                 current_file = patcher(ui, gp, backend, store, eolmode=eolmode)
             except PatchError as inst:
-                ui.warn(str(inst) + b'\n')
+                ui.warn(stringutil.forcebytestr(inst) + b'\n')
                 current_file = None
                 rejects += 1
                 continue
hg-stable