diff mercurial/ui.py @ 8345:dcebff8a25dd

hgwebdir: read --webdir-conf as actual configuration to ui (issue1586)

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 without a specified contact set.

--- a/mercurial/ui.py	Mon May 11 07:55:13 2009 +0200
+++ b/mercurial/ui.py	Mon May 11 14:20:18 2009 +0200
@@ -58,7 +58,7 @@
         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 @@
         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