comparison mercurial/ui.py @ 14922:1bc970a77977

ui: fix error, base can not be a list
author Simon Heimberg <simohe@besonet.ch>
date Sat, 23 Jul 2011 06:08:49 +0200
parents dccecfaebdd2
children 351624f8f523
comparison
equal deleted inserted replaced
14921:e259375459d6 14922:1bc970a77977
167 'get a path config item, expanded relative to config file' 167 'get a path config item, expanded relative to config file'
168 v = self.config(section, name, default, untrusted) 168 v = self.config(section, name, default, untrusted)
169 if not os.path.isabs(v) or "://" not in v: 169 if not os.path.isabs(v) or "://" not in v:
170 src = self.configsource(section, name, untrusted) 170 src = self.configsource(section, name, untrusted)
171 if ':' in src: 171 if ':' in src:
172 base = os.path.dirname(src.rsplit(':')) 172 base = os.path.dirname(src.rsplit(':')[0])
173 v = os.path.join(base, os.path.expanduser(v)) 173 v = os.path.join(base, os.path.expanduser(v))
174 return v 174 return v
175 175
176 def configbool(self, section, name, default=False, untrusted=False): 176 def configbool(self, section, name, default=False, untrusted=False):
177 """parse a configuration element as a boolean 177 """parse a configuration element as a boolean