facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

ui.py: don't query parentui.cdata when looking up config items.

Browse Source 
We copied the contents of parentui.cdata on initialization.
This commit is contained in:
Alexis S. L. Carvalho 2006-10-10 18:43:20 -03:00
parent 615137ec99
commit 2a77e52007
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mercurial/ui.py
View File

@ -98,10 +98,7 @@ class ui(object):
raise util.Abort(_("Error in configuration section [%s] "
"parameter '%s':\n%s")
% (section, name, inst))
if self.parentui is None:
return default
else:
return self.parentui._config(section, name, default, funcname)
return default
def config(self, section, name, default=None):
return self._config(section, name, default, 'get')
@ -124,8 +121,6 @@ class ui(object):
def configitems(self, section):
items = {}
if self.parentui is not None:
items = dict(self.parentui.configitems(section))
if self.cdata.has_section(section):
try:
items.update(dict(self.cdata.items(section)))
@ -136,9 +131,8 @@ class ui(object):
x.sort()
return x
def walkconfig(self, seen=None):
if seen is None:
seen = {}
def walkconfig(self):
seen = {}
for (section, name), value in self.overlay.iteritems():
yield section, name, value
seen[section, name] = 1
@ -149,9 +143,6 @@ class ui(object):
if (section, name) in seen: continue
yield section, name, value.replace('\n', '\\n')
seen[section, name] = 1
if self.parentui is not None:
for parent in self.parentui.walkconfig(seen):
yield parent
def extensions(self):
result = self.configitems("extensions")