changeset 36724:ca201470abb4

util: fix unsafe url abort with bytestr() on url Differential Revision: https://phab.mercurial-scm.org/D2669
author Augie Fackler <augie@google.com>
date Sun, 04 Mar 2018 15:55:55 -0500
parents 1f9bbd1d6b8a
children 93b8c83ef136
files mercurial/util.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Sun Mar 04 15:16:42 2018 -0500
+++ b/mercurial/util.py	Sun Mar 04 15:55:55 2018 -0500
@@ -3097,7 +3097,7 @@
     path = urlreq.unquote(path)
     if path.startswith('ssh://-') or path.startswith('svn+ssh://-'):
         raise error.Abort(_('potentially unsafe url: %r') %
-                          (path,))
+                          (pycompat.bytestr(path),))
 
 def hidepassword(u):
     '''hide user credential in a url string'''