diff --git a/salt/hg/config/repos.conf b/salt/hg/config/repos.conf index 52c4b52c..9ce46f3e 100644 --- a/salt/hg/config/repos.conf +++ b/salt/hg/config/repos.conf @@ -6,7 +6,7 @@ git = 1 showfunc = 1 [web] -llow_archive = gz, zip, bz2 +allow_archive = gz, zip, bz2 collapse = True contact = - descend = True @@ -15,5 +15,5 @@ logourl = https://hg.python.org pygments_style = default style = hgpythonorg -[extensions] -hgext.highlight = +; [extensions] +; hgext.highlight = diff --git a/salt/hg/files/hg/wsgi/python.wsgi b/salt/hg/files/hg/wsgi/python.wsgi index b1eb056d..5632caaf 100644 --- a/salt/hg/files/hg/wsgi/python.wsgi +++ b/salt/hg/files/hg/wsgi/python.wsgi @@ -3,4 +3,4 @@ from mercurial import encoding CONFIG = '/srv/hg/repos.conf' encoding.encoding = 'utf-8' -application = hgwebdir(CONFIG) +application = hgwebdir(CONFIG.encode())