Mercurial > public > mercurial-scm > hg-stable
diff mercurial/ui.py @ 8193:94246e90081e
config: add section filter to read
move section filtering out of ui.readconfig
kill section filtering in config.update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Apr 2009 16:50:43 -0500 |
parents | 9b8ac5fb7760 |
children | b7c85a809a54 |
line wrap: on
line diff
--- a/mercurial/ui.py Sun Apr 26 16:50:43 2009 -0500 +++ b/mercurial/ui.py Sun Apr 26 16:50:43 2009 -0500 @@ -82,17 +82,17 @@ trusted = sections or assumetrusted or self._is_trusted(fp, filename) try: - cdata.read(filename, fp) + cdata.read(filename, fp, sections=sections) except error.ConfigError, inst: if trusted: raise self.warn(_("Ignored: %s\n") % str(inst)) if trusted: - self.cdata.update(cdata, sections) - self.cdata.update(self.overlay, sections) - self.ucdata.update(cdata, sections) - self.ucdata.update(self.overlay, sections) + self.cdata.update(cdata) + self.cdata.update(self.overlay) + self.ucdata.update(cdata) + self.ucdata.update(self.overlay) if root is None: root = os.path.expanduser('~')