Mercurial > hg-stable

changeset 36692:2dce0049176c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: ensure PatchError messages are coerded to bytes, not str Differential Revision: https://phab.mercurial-scm.org/D2613
author Augie Fackler <augie@google.com>
date Sat, 03 Mar 2018 17:09:26 -0500
parents 3715a5ffcf92
children 6f9442c6b404
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sat Mar 03 17:08:41 2018 -0500
+++ b/mercurial/cmdutil.py	Sat Mar 03 17:09:26 2018 -0500
@@ -1478,7 +1478,7 @@
                     patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
                                     files, eolmode=None)
                 except error.PatchError as e:
-                    raise error.Abort(str(e))
+                    raise error.Abort(util.forcebytestr(e))
                 if opts.get('exact'):
                     editor = None
                 else: