This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8978

hgweb: compatibility of hgweb.cgi template with Python 3
ClosedPublic

Authored by haraldkl on Sep 2 2020, 9:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd58a205d0672: hgweb: compatibility of hgweb.cgi template with Python 3
Summary

When running Mercurial on Python 3 hgweb expects the config variable to be a
bytestring.
The solution proposed by Anton Shestakov is to use a byteprefix to the literal
string defined cgi script as provided in this patch for hgweb.cgi,
contrib/hgweb.fcgi and contrib/hgweb.wsgi.
I am not sure whether this covers all relevant templates, but I couldn't find
others.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

haraldkl created this revision.Sep 2 2020, 9:16 AM
pulkit accepted this revision.Sep 2 2020, 12:04 PM
This revision is now accepted and ready to land.Sep 2 2020, 12:04 PM

Revision Contents
Changeset List

PathPackages
Mcontrib/hgweb.fcgi (2 lines)
Mcontrib/hgweb.wsgi (2 lines)
Mhgweb.cgi (2 lines)

Diff 22520

contrib/hgweb.fcgi

#!/usr/bin/env python #!/usr/bin/env python
# #
# An example FastCGI script for use with flup, edit as necessary # An example FastCGI script for use with flup, edit as necessary
# Path to repo or hgweb config to serve (see 'hg help hgweb') # Path to repo or hgweb config to serve (see 'hg help hgweb')
config = "/path/to/repo/or/config" config = b"/path/to/repo/or/config"
# Uncomment and adjust if Mercurial is not installed system-wide # Uncomment and adjust if Mercurial is not installed system-wide
# (consult "installed modules" path from 'hg debuginstall'): # (consult "installed modules" path from 'hg debuginstall'):
# import sys; sys.path.insert(0, "/path/to/python/lib") # import sys; sys.path.insert(0, "/path/to/python/lib")
# Uncomment to send python tracebacks to the browser if an error occurs: # Uncomment to send python tracebacks to the browser if an error occurs:
# import cgitb; cgitb.enable() # import cgitb; cgitb.enable()
from mercurial import demandimport from mercurial import demandimport
demandimport.enable() demandimport.enable()
from mercurial.hgweb import hgweb from mercurial.hgweb import hgweb
from flup.server.fcgi import WSGIServer from flup.server.fcgi import WSGIServer
application = hgweb(config) application = hgweb(config)
WSGIServer(application).run() WSGIServer(application).run()

contrib/hgweb.wsgi

# An example WSGI for use with mod_wsgi, edit as necessary # An example WSGI for use with mod_wsgi, edit as necessary
# See https://mercurial-scm.org/wiki/modwsgi for more information # See https://mercurial-scm.org/wiki/modwsgi for more information
# Path to repo or hgweb config to serve (see 'hg help hgweb') # Path to repo or hgweb config to serve (see 'hg help hgweb')
config = "/path/to/repo/or/config" config = b"/path/to/repo/or/config"
# Uncomment and adjust if Mercurial is not installed system-wide # Uncomment and adjust if Mercurial is not installed system-wide
# (consult "installed modules" path from 'hg debuginstall'): # (consult "installed modules" path from 'hg debuginstall'):
#import sys; sys.path.insert(0, "/path/to/python/lib") #import sys; sys.path.insert(0, "/path/to/python/lib")
# Uncomment to send python tracebacks to the browser if an error occurs: # Uncomment to send python tracebacks to the browser if an error occurs:
#import cgitb; cgitb.enable() #import cgitb; cgitb.enable()
# enable demandloading to reduce startup time # enable demandloading to reduce startup time
from mercurial import demandimport; demandimport.enable() from mercurial import demandimport; demandimport.enable()
from mercurial.hgweb import hgweb from mercurial.hgweb import hgweb
application = hgweb(config) application = hgweb(config)

hgweb.cgi

#!/usr/bin/env python #!/usr/bin/env python
# #
# An example hgweb CGI script, edit as necessary # An example hgweb CGI script, edit as necessary
# See also https://mercurial-scm.org/wiki/PublishingRepositories # See also https://mercurial-scm.org/wiki/PublishingRepositories
# Path to repo or hgweb config to serve (see 'hg help hgweb') # Path to repo or hgweb config to serve (see 'hg help hgweb')
config = "/path/to/repo/or/config" config = b"/path/to/repo/or/config"
# Uncomment and adjust if Mercurial is not installed system-wide # Uncomment and adjust if Mercurial is not installed system-wide
# (consult "installed modules" path from 'hg debuginstall'): # (consult "installed modules" path from 'hg debuginstall'):
# import sys; sys.path.insert(0, "/path/to/python/lib") # import sys; sys.path.insert(0, "/path/to/python/lib")
# Uncomment to send python tracebacks to the browser if an error occurs: # Uncomment to send python tracebacks to the browser if an error occurs:
# import cgitb; cgitb.enable() # import cgitb; cgitb.enable()
from mercurial import demandimport from mercurial import demandimport
demandimport.enable() demandimport.enable()
from mercurial.hgweb import hgweb, wsgicgi from mercurial.hgweb import hgweb, wsgicgi
application = hgweb(config) application = hgweb(config)
wsgicgi.launch(application) wsgicgi.launch(application)