Skip to content
Snippets Groups Projects
Commit ff461baa9c4e authored by Benoit Boissinot's avatar Benoit Boissinot
Browse files

merge with -stable

No related branches found
No related tags found
No related merge requests found
......@@ -203,16 +203,4 @@
return open(opt, 'w')
return default
def create_getconfig(section, *uis): # uis are least significant to most
def getconfig(var, default=None):
val = default
for u in uis:
val = u.config(section, var, val)
return val
def getconfigbool(var, default=None):
val = default
for u in uis:
val = u.configbool(section, var, val)
return (getconfig, getconfigbool)
if repo is None:
......@@ -218,3 +206,3 @@
if repo is None:
getconfig, getconfigbool = create_getconfig("web", ui)
myui = ui
else:
......@@ -220,12 +208,12 @@
else:
getconfig, getconfigbool = create_getconfig("web", ui, repo.ui)
address = getconfig("address", "")
port = int(getconfig("port", 8000))
use_ipv6 = getconfigbool("ipv6")
webdir_conf = getconfig("webdir_conf")
ssl_cert = getconfig("certificate")
accesslog = openlog(getconfig("accesslog", "-"), sys.stdout)
errorlog = openlog(getconfig("errorlog", "-"), sys.stderr)
myui = repo.ui
address = myui.config("web", "address", "")
port = int(myui.config("web", "port", 8000))
use_ipv6 = myui.configbool("web", "ipv6")
webdir_conf = myui.config("web", "webdir_conf")
ssl_cert = myui.config("web", "certificate")
accesslog = openlog(myui.config("web", "accesslog", "-"), sys.stdout)
errorlog = openlog(myui.config("web", "errorlog", "-"), sys.stderr)
if use_threads:
try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment