# HG changeset patch # User Thomas Arendsen Hein # Date 1151333244 -7200 # Node ID b73552a00b209c8fcd71fd23fb990c5d05910010 # Parent 76ff5efe8181dcf79fc59fd6cbd87e9d546e60c0 Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist. diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -845,15 +845,11 @@ class hgweb(object): user = req.env.get('REMOTE_USER') - deny = self.repo.ui.config('web', 'deny_' + op, '') - deny = deny.replace(',', ' ').split() - + deny = self.repo.ui.configlist('web', 'deny_' + op) if deny and (not user or deny == ['*'] or user in deny): return False - allow = self.repo.ui.config('web', 'allow_' + op, '') - allow = allow.replace(',', ' ').split() - + allow = self.repo.ui.configlist('web', 'allow_' + op) return (allow and (allow == ['*'] or user in allow)) or default def do_unbundle(self, req): diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py --- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -120,9 +120,8 @@ class httprepository(remoterepository): # see if we should use a proxy for this url no_list = [ "localhost", "127.0.0.1" ] - no_list.extend([p.strip().lower() for - p in ui.config("http_proxy", "no", '').split(',') - if p.strip()]) + no_list.extend([p.lower() for + p in ui.configlist("http_proxy", "no")]) no_list.extend([p.strip().lower() for p in os.getenv("no_proxy", '').split(',') if p.strip()])