diff --git a/mercurial/config.py b/mercurial/config.py --- a/mercurial/config.py +++ b/mercurial/config.py @@ -50,7 +50,7 @@ class config(object): self._source.update(src._source) def get(self, section, item, default=None): return self._data.get(section, {}).get(item, default) - def getsource(self, section, item): + def source(self, section, item): return self._source.get((section, item), "") def sections(self): return sorted(self._data.keys()) diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -72,7 +72,7 @@ class templater(object): self.cache[key] = parsestring(val) except SyntaxError, inst: raise SyntaxError('%s: %s' % - (conf.getsource('', key), inst.args[0])) + (conf.source('', key), inst.args[0])) else: self.map[key] = os.path.join(self.base, val) diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -133,7 +133,7 @@ class ui(object): return self.cdata def configsource(self, section, name, untrusted=False): - return self._get_cdata(untrusted).getsource(section, name) or 'none' + return self._get_cdata(untrusted).source(section, name) or 'none' def config(self, section, name, default=None, untrusted=False): value = self._get_cdata(untrusted).get(section, name, default)