[PATCH 2 of 2] py3: convert unicode paths given for hgweb config

Yuya Nishihara yuya at tcha.org
Mon Apr 22 19:22:20 EDT 2019


On Fri, 19 Apr 2019 14:34:14 +0000, Ludovic Chabant wrote:
> # HG changeset patch
> # User Ludovic Chabant <ludovic at chabant.com>
> # Date 1555683992 0
> #      Fri Apr 19 14:26:32 2019 +0000
> # Branch stable
> # Node ID b1baf28288faf3fd628d5104211e1482e77bdf39
> # Parent  96a51193678400abf9d04af65e60a8dccf540cd7
> py3: convert unicode paths given for hgweb config
> 
> diff --git a/mercurial/hgweb/__init__.py b/mercurial/hgweb/__init__.py
> --- a/mercurial/hgweb/__init__.py
> +++ b/mercurial/hgweb/__init__.py
> @@ -38,6 +38,8 @@
>      - list of virtual:real tuples (multi-repo view)
>      '''

We'll probably need to fix the caller to not pass in a unicode.
Can you copy-paste the traceback?

> +    if isinstance(config, str):

Should be pycompat.unicode for py2 compatibility.

> +        config = config.encode()

Maybe encoding.unitolocal() as the best guess. The encoding isn't known.


More information about the Mercurial-devel mailing list