Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'web.logourl' config
authorBoris Feld <boris.feld@octobus.net>
Wed, 11 Oct 2017 04:16:17 +0200
changeset 34612 c2cb6be4212f
parent 34611 c879fc7bd71f
child 34613 5e61cd5fb0fc
configitems: register the 'web.logourl' config
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/hgweb/hgweb_mod.py file | annotate | diff | comparison | revisions
mercurial/hgweb/hgwebdir_mod.py file | annotate | diff | comparison | revisions 
--- a/mercurial/configitems.py	Wed Oct 11 04:16:05 2017 +0200
+++ b/mercurial/configitems.py	Wed Oct 11 04:16:17 2017 +0200
@@ -748,6 +748,9 @@
 coreconfigitem('web', 'logoimg',
     default='hglogo.png',
 )
+coreconfigitem('web', 'logourl',
+    default='https://mercurial-scm.org/',
+)
 coreconfigitem('web', 'accesslog',
     default='-',
 )
--- a/mercurial/hgweb/hgweb_mod.py	Wed Oct 11 04:16:05 2017 +0200
+++ b/mercurial/hgweb/hgweb_mod.py	Wed Oct 11 04:16:17 2017 +0200
@@ -168,7 +168,7 @@
         port = req.env['SERVER_PORT']
         port = port != default_port and (':' + port) or ''
         urlbase = '%s://%s%s' % (proto, req.env['SERVER_NAME'], port)
-        logourl = self.config('web', 'logourl', 'https://mercurial-scm.org/')
+        logourl = self.config('web', 'logourl')
         logoimg = self.config('web', 'logoimg')
         staticurl = self.config('web', 'staticurl') or req.url + 'static/'
         if not staticurl.endswith('/'):
--- a/mercurial/hgweb/hgwebdir_mod.py	Wed Oct 11 04:16:05 2017 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Wed Oct 11 04:16:17 2017 +0200
@@ -510,7 +510,7 @@
 
         start = url[-1] == '?' and '&' or '?'
         sessionvars = webutil.sessionvars(vars, start)
-        logourl = config('web', 'logourl', 'https://mercurial-scm.org/')
+        logourl = config('web', 'logourl')
         logoimg = config('web', 'logoimg')
         staticurl = config('web', 'staticurl') or url + 'static/'
         if not staticurl.endswith('/'):
Mercurial