hgweb: make baseui parameter non-positional

hgext/zeroconf/__init__.py

@@ -107,7 +107,7 b' 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()

mercurial/commands.py

@@ -2939,7 +2939,7 b' 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: