hgweb: make baseui parameter non-positional
authorMatt Mackall <mpm@selenic.com>
Mon, 26 Apr 2010 11:03:40 -0500
changeset 10993 c1b43d786889
parent 10992 a9b8c8c8ce80
child 10994 c12a57c1a67e
hgweb: make baseui parameter non-positional
hgext/zeroconf/__init__.py
mercurial/commands.py
--- a/hgext/zeroconf/__init__.py	Mon Apr 26 11:03:40 2010 -0500
+++ b/hgext/zeroconf/__init__.py	Mon Apr 26 11:03:40 2010 -0500
@@ -107,7 +107,7 @@
 
 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()
--- a/mercurial/commands.py	Mon Apr 26 11:03:40 2010 -0500
+++ b/mercurial/commands.py	Mon Apr 26 11:03:40 2010 -0500
@@ -2939,7 +2939,7 @@
             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: