Mercurial > hg-stable

changeset 38594:e46c3b6a47b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix dumbhttp.py to convert --daemon-postexec arguments back to bytes
author Yuya Nishihara <yuya@tcha.org>
date Sun, 08 Jul 2018 16:45:40 +0900
parents 21be76e07148
children b263133eeb5a
files contrib/python3-whitelist tests/dumbhttp.py
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/python3-whitelist	Sun Jul 08 16:31:14 2018 +0900
+++ b/contrib/python3-whitelist	Sun Jul 08 16:45:40 2018 +0900
@@ -15,6 +15,7 @@
 test-automv.t
 test-backout.t
 test-backwards-remove.t
+test-bad-pull.t
 test-basic.t
 test-bheads.t
 test-bisect.t
@@ -53,6 +54,7 @@
 test-clone-pull-corruption.t
 test-clone-r.t
 test-clone-update-order.t
+test-clonebundles.t
 test-commit-amend.t
 test-commit-interactive.t
 test-commit-multiple.t
--- a/tests/dumbhttp.py	Sun Jul 08 16:31:14 2018 +0900
+++ b/tests/dumbhttp.py	Sun Jul 08 16:45:40 2018 +0900
@@ -13,6 +13,7 @@
 import sys
 
 from mercurial import (
+    encoding,
     pycompat,
     server,
     util,
@@ -66,7 +67,8 @@
 
     opts = {b'pid_file': options.pid,
             b'daemon': not options.foreground,
-            b'daemon_postexec': options.daemon_postexec}
+            b'daemon_postexec': pycompat.rapply(encoding.strtolocal,
+                                                options.daemon_postexec)}
     service = simplehttpservice(options.host, options.port)
     runargs = [sys.executable, __file__] + sys.argv[1:]
     runargs = [pycompat.fsencode(a) for a in runargs]