[PATCH 1 of 2] hgwebdir: read --webdir-conf as actual configuration to ui (issue 1586)

Alexander Solovyov piranha at piranha.org.ua
Mon Apr 27 03:44:23 CDT 2009


# HG changeset patch
# User Alexander Solovyov <piranha at piranha.org.ua>
# Date 1239291072 -10800
# Node ID 279d93f52b803f0d83e443bd10d7b86425722f0c
# Parent  a2af1d92b913f878cc8ec57197e40145ef85843a
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
@@ -61,6 +61,8 @@ class config(object):
             self._data[section] = sortdict()
         self._data[section][item] = value
         self._source[(section, item)] = source
+    def remove_section(self, section):
+        del self._data[section]
 
     def read(self, path, fp=None, sections=None):
         sectionre = re.compile(r'\[([^\[]+)\]')
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
@@ -23,62 +23,66 @@ class hgwebdir(object):
                     for name, path in items]
 
         if baseui:
-           self.ui = baseui.copy()
+            self.ui = baseui.copy()
+            # baseui will contain 'paths' if they were present in user or
+            # system-wide config. They should be dropped.
+            if self.ui.configitems('paths'):
+                self.ui.remove_section('paths')
         else:
             self.ui = ui.ui()
             self.ui.setconfig('ui', 'report_untrusted', 'off')
             self.ui.setconfig('ui', 'interactive', 'off')
 
-        self.motd = None
-        self.style = 'paper'
-        self.stripecount = None
         self.repos_sorted = ('name', False)
-        self._baseurl = None
         if isinstance(conf, (list, tuple)):
             self.repos = cleannames(conf)
             self.repos_sorted = ('', False)
         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)
             self.repos = []
-            self.motd = cp.get('web', 'motd')
-            self.style = cp.get('web', 'style', 'paper')
-            self.stripecount = cp.get('web', 'stripes')
-            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'):
+
+        self.motd = self.ui.config('web', 'motd')
+        self.style = self.ui.config('web', 'style', 'paper')
+        self.stripecount = self.ui.config('web', 'stripes')
+        if self.stripecount:
+            self.stripecount = int(self.stripecount)
+        self._baseurl = self.ui.config('web', 'baseurl')
+
+        if self.repos:
+            return
+
+        if self.ui.configitems('paths'):
+            paths = cleannames(self.ui.configitems('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))
+        if self.ui.configitems('collections'):
+            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()
+        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
@@ -159,6 +159,10 @@ class ui(object):
                                 "%s.%s = %s\n") % (section, k, v))
         return items
 
+    def remove_section(self, section, untrusted=False):
+        '''remove section from config'''
+        self._data(untrusted).remove_section(section)
+
     def walkconfig(self, untrusted=False):
         cfg = self._data(untrusted)
         for section in cfg.sections():


More information about the Mercurial-devel mailing list