Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorAugie Fackler <augie@google.com>
Sat, 03 Mar 2018 17:09:26 -0500
changeset 36663 2dce0049176c
parent 36662 3715a5ffcf92
child 36664 6f9442c6b404
cmdutil: ensure PatchError messages are coerded to bytes, not str Differential Revision: https://phab.mercurial-scm.org/D2613
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- 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:
Mercurial