# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1141985205 -3600
# Node ID a84829140fb1757d12e57dda431014d51ad38a67
# Parent  205f04b04ec64d26ed76ee569161a9079ab3085d
Inherit config from real parentui and don't use ConfigParser internals.
Added comments for the meaning of parentui.


diff -r 205f04b04ec6 -r a84829140fb1 mercurial/ui.py
--- a/mercurial/ui.py	Fri Mar 10 10:44:17 2006 +0100
+++ b/mercurial/ui.py	Fri Mar 10 11:06:45 2006 +0100
@@ -14,9 +14,10 @@
     def __init__(self, verbose=False, debug=False, quiet=False,
                  interactive=True, parentui=None):
         self.overlay = {}
-        self.cdata = ConfigParser.SafeConfigParser()
-        self.parentui = parentui and parentui.parentui or parentui
         if parentui is None:
+            # this is the parent of all ui children
+            self.parentui = None
+            self.cdata = ConfigParser.SafeConfigParser()
             self.readconfig(util.rcpath)
 
             self.quiet = self.configbool("ui", "quiet")
@@ -27,9 +28,15 @@
             self.updateopts(verbose, debug, quiet, interactive)
             self.diffcache = None
         else:
-            self.cdata._defaults = parentui.cdata._defaults
-            for key, value in parentui.cdata._sections.iteritems():
-                self.cdata._sections[key] = value.copy()
+            # parentui may point to an ui object which is already a child
+            self.parentui = parentui.parentui or parentui
+            parent_cdata = self.parentui.cdata
+            self.cdata = ConfigParser.SafeConfigParser(parent_cdata.defaults())
+            # make interpolation work
+            for section in parent_cdata.sections():
+                self.cdata.add_section(section)
+                for name, value in parent_cdata.items(section, raw=True):
+                    self.cdata.set(section, name, value)
 
     def __getattr__(self, key):
         return getattr(self.parentui, key)