# HG changeset patch # User Thomas Arendsen Hein # Date 1132251513 -3600 # Node ID 4aeba581990bf84dd5287c62a959e7b5657535e1 # Parent 7509fa02437f8dadaea6266e9512843ac272b38d# Parent fbe4bbd847e5aa0b95039a833252bbd896dfd9a8 Merge with mercurial/crew diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ try: py2exe_opts = {} if py2exe_for_demandload is not None: cmdclass['py2exe'] = py2exe_for_demandload - py2exe_opts['console'] = 'hg' + py2exe_opts['console'] = ['hg'] setup(name='mercurial', version=mercurial.version.get_version(), author='Matt Mackall', diff --git a/templates/notfound.tmpl b/templates/notfound.tmpl --- a/templates/notfound.tmpl +++ b/templates/notfound.tmpl @@ -5,7 +5,7 @@

Mercurial Repositories

-The specified repository "#repo#" is unknown, sorry. +The specified repository "#repo|escape#" is unknown, sorry. Please go back to the main repository list page. diff --git a/templates/tags.tmpl b/templates/tags.tmpl --- a/templates/tags.tmpl +++ b/templates/tags.tmpl @@ -1,5 +1,5 @@ #header# -#repo#: tags +#repo|escape#: tags