# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-04-26 16:03:40
# Node ID c1b43d786889b5a36735e18c766f93db14ab8bf1
# Parent  a9b8c8c8ce80beb77e6dd4fee8d5a00dd6e9e192

hgweb: make baseui parameter non-positional

diff --git a/hgext/zeroconf/__init__.py b/hgext/zeroconf/__init__.py
--- a/hgext/zeroconf/__init__.py
+++ b/hgext/zeroconf/__init__.py
@@ -107,7 +107,7 @@ class hgwebzc(hgweb_mod.hgweb):
 
 class hgwebdirzc(hgwebdir_mod.hgwebdir):
     def __init__(self, conf, baseui=None):
-        super(hgwebdirzc, self).__init__(conf, baseui)
+        super(hgwebdirzc, self).__init__(conf, baseui=baseui)
         prefix = self.ui.config("web", "prefix", "").strip('/') + '/'
         for repo, path in self.repos:
             u = self.ui.copy()
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2939,7 +2939,7 @@ def serve(ui, repo, **opts):
             repo.ui.setconfig("web", o, val)
 
     if opts.get('webdir_conf'):
-        app = hgwebdir_mod.hgwebdir(opts['webdir_conf'], ui)
+        app = hgwebdir_mod.hgwebdir(opts['webdir_conf'], baseui=ui)
     elif repo is not None:
         app = hgweb_mod.hgweb(hg.repository(repo.ui, repo.root))
     else: