[PATCH] hgwebdir: read --webdir-conf as actual configuration to ui (issue 1586)
Alexander Solovyov
piranha at piranha.org.ua
Tue Apr 28 16:26:23 CDT 2009
# HG changeset patch
# User Alexander Solovyov <piranha at piranha.org.ua>
# Date 1240953943 -10800
# Node ID 4f8b6e95e6b5dc30c6cfcd93a8b26f92cc3a2f2b
# Parent c50510b661ba4ccded8fe9d3c6bd8db020a64e7a
hgwebdir: read --webdir-conf as actual configuration to ui (issue 1586)
This cleans up code and allows specification of values more globally. For
example, it's now possible to specify web.contact in webdir-conf for all
repositories with unspecified contact.
diff --git a/mercurial/config.py b/mercurial/config.py
--- a/mercurial/config.py
+++ b/mercurial/config.py
@@ -69,7 +69,7 @@ class config(object):
self._data[section][item] = value
self._source[(section, item)] = source
- def read(self, path, fp=None, sections=None):
+ def read(self, path, fp=None, sections=None, remap=None):
sectionre = re.compile(r'\[([^\[]+)\]')
itemre = re.compile(r'([^=\s]+)\s*=\s*(.*\S|)')
contre = re.compile(r'\s+(\S.*\S)')
@@ -84,6 +84,9 @@ class config(object):
if not fp:
fp = open(path)
+ if not remap:
+ remap = {}
+
for l in fp:
line += 1
if cont:
@@ -108,6 +111,7 @@ class config(object):
m = sectionre.match(l)
if m:
section = m.group(1)
+ section = remap.get(section, section)
if section not in self:
self._data[section] = sortdict()
continue
diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py
+++ b/mercurial/hgweb/hgwebdir_mod.py
@@ -9,7 +9,7 @@
import os
from mercurial.i18n import _
from mercurial import ui, hg, util, templater, templatefilters
-from mercurial import config, error, encoding
+from mercurial import error, encoding
from common import ErrorResponse, get_mtime, staticfile, paritygen,\
get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
from hgweb_mod import hgweb
@@ -30,11 +30,7 @@ class hgwebdir(object):
self.ui.setconfig('ui', 'report_untrusted', 'off')
self.ui.setconfig('ui', 'interactive', 'off')
- self.motd = None
- self.style = 'paper'
- self.stripecount = 1
self.repos_sorted = ('name', False)
- self._baseurl = None
if isinstance(conf, (list, tuple)):
self.repos = cleannames(conf)
@@ -42,45 +38,47 @@ class hgwebdir(object):
elif isinstance(conf, dict):
self.repos = sorted(cleannames(conf.items()))
else:
- if isinstance(conf, config.config):
- cp = conf
- else:
- cp = config.config()
- cp.read(conf)
+ self.ui.readconfig(conf, remap={'paths': 'hgweb-paths'})
self.repos = []
- self.motd = cp.get('web', 'motd')
- self.style = cp.get('web', 'style', 'paper')
- self.stripecount = cp.get('web', 'stripes', 1)
- self._baseurl = cp.get('web', 'baseurl')
- if 'paths' in cp:
- paths = cleannames(cp.items('paths'))
- for prefix, root in paths:
- roothead, roottail = os.path.split(root)
- # "foo = /bar/*" makes every subrepo of /bar/ to be
- # mounted as foo/subrepo
- # and "foo = /bar/**" does even recurse inside the
- # subdirectories, remember to use it without working dir.
- try:
- recurse = {'*': False, '**': True}[roottail]
- except KeyError:
- self.repos.append((prefix, root))
- continue
- roothead = os.path.normpath(roothead)
- for path in util.walkrepos(roothead, followsym=True,
- recurse=recurse):
- path = os.path.normpath(path)
- name = util.pconvert(path[len(roothead):]).strip('/')
- if prefix:
- name = prefix + '/' + name
- self.repos.append((name, path))
- for prefix, root in cp.items('collections'):
- for path in util.walkrepos(root, followsym=True):
- repo = os.path.normpath(path)
- name = repo
- if name.startswith(prefix):
- name = name[len(prefix):]
- self.repos.append((name.lstrip(os.sep), repo))
- self.repos.sort()
+
+ self.motd = self.ui.config('web', 'motd')
+ self.style = self.ui.config('web', 'style', 'paper')
+ self.stripecount = self.ui.config('web', 'stripes', 1)
+ if self.stripecount:
+ self.stripecount = int(self.stripecount)
+ self._baseurl = self.ui.config('web', 'baseurl')
+
+ if self.repos:
+ return
+
+ for prefix, root in cleannames(self.ui.configitems('hgweb-paths')):
+ roothead, roottail = os.path.split(root)
+ # "foo = /bar/*" makes every subrepo of /bar/ to be
+ # mounted as foo/subrepo
+ # and "foo = /bar/**" does even recurse inside the
+ # subdirectories, remember to use it without working dir.
+ try:
+ recurse = {'*': False, '**': True}[roottail]
+ except KeyError:
+ continue
+ roothead = os.path.normpath(roothead)
+ for path in util.walkrepos(roothead, followsym=True,
+ recurse=recurse):
+ path = os.path.normpath(path)
+ name = util.pconvert(path[len(roothead):]).strip('/')
+ if prefix:
+ name = prefix + '/' + name
+ self.repos.append((name, path))
+
+ for prefix, root in self.ui.configitems('collections'):
+ for path in util.walkrepos(root, followsym=True):
+ repo = os.path.normpath(path)
+ name = repo
+ if name.startswith(prefix):
+ name = name[len(prefix):]
+ self.repos.append((name.lstrip(os.sep), repo))
+
+ self.repos.sort()
def run(self):
if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -58,7 +58,7 @@ class ui(object):
return False
def readconfig(self, filename, root=None, trust=False,
- sections=None):
+ sections=None, remap=None):
try:
fp = open(filename)
except IOError:
@@ -70,7 +70,7 @@ class ui(object):
trusted = sections or trust or self._is_trusted(fp, filename)
try:
- cfg.read(filename, fp, sections=sections)
+ cfg.read(filename, fp, sections=sections, remap=remap)
except error.ConfigError, inst:
if trusted:
raise
More information about the Mercurial-devel
mailing list