Mercurial Mercurial > mercurial / 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.
branching: merge with stable
authorMartin von Zweigbergk <martinvonz@google.com>
Sun, 13 Dec 2020 18:29:22 -0800
changeset 46112 d6afa9c149c3
parent 46111 9e24b3d8e896 (current diff)
parent 46081 734d051d0efb (diff)
child 46113 59fa3890d40a
branching: merge with stable
hgext/bugzilla.py file | annotate | diff | comparison | revisions
mercurial/debugcommands.py file | annotate | diff | comparison | revisions 
--- a/hgext/bugzilla.py	Fri Dec 11 15:25:11 2020 +0100
+++ b/hgext/bugzilla.py	Sun Dec 13 18:29:22 2020 -0800
@@ -795,7 +795,9 @@
         self.fixstatus = self.ui.config(b'bugzilla', b'fixstatus')
         self.fixresolution = self.ui.config(b'bugzilla', b'fixresolution')
 
-        self.bzproxy = xmlrpclib.ServerProxy(bzweb, self.transport(bzweb))
+        self.bzproxy = xmlrpclib.ServerProxy(
+            pycompat.strurl(bzweb), self.transport(bzweb)
+        )
         ver = self.bzproxy.Bugzilla.version()[b'version'].split(b'.')
         self.bzvermajor = int(ver[0])
         self.bzverminor = int(ver[1])
@@ -1247,4 +1249,4 @@
                 bz.update(bug, bugs[bug], ctx)
             bz.notify(bugs, stringutil.email(ctx.user()))
     except Exception as e:
-        raise error.Abort(_(b'Bugzilla error: %s') % e)
+        raise error.Abort(_(b'Bugzilla error: %s') % stringutil.forcebytestr(e))
--- a/mercurial/debugcommands.py	Fri Dec 11 15:25:11 2020 +0100
+++ b/mercurial/debugcommands.py	Sun Dec 13 18:29:22 2020 -0800
@@ -3850,9 +3850,7 @@
 def debuguigetpass(ui, prompt=b''):
     """show prompt to type password"""
     r = ui.getpass(prompt)
-    if r is not None:
-        r = encoding.strtolocal(r)
-    else:
+    if r is None:
         r = b"<default response>"
     ui.writenoi18n(b'response: %s\n' % r)
mercurial