serve: webdir_conf -> webconf

mercurial/commands.py

@@ -2938,8 +2938,9 b' def serve(ui, repo, **opts):'
         if repo and repo.ui != baseui:
             repo.ui.setconfig("web", o, val)
 
-    if opts.get('webdir_conf'):
-        app = hgwebdir_mod.hgwebdir(opts['webdir_conf'], baseui=ui)
+    o = opts.get('web_conf') or opts.get('webdir_conf')
+    if o:
+        app = hgwebdir_mod.hgwebdir(o, baseui=ui)
     elif repo is not None:
         app = hgweb_mod.hgweb(hg.repository(repo.ui, repo.root))
     else:
@@ -3851,8 +3852,10 b' table = {'
            _('prefix path to serve from (default: server root)')),
           ('n', 'name', '',
            _('name to show in web pages (default: working directory)')),
-          ('', 'webdir-conf', '', _('name of the webdir config file'
+          ('', 'web-conf', '', _('name of the hgweb config file'
                                     ' (serve more than one repository)')),
+          ('', 'webdir-conf', '', _('name of the hgweb config file'
+                                    ' (DEPRECATED)')),
           ('', 'pid-file', '', _('name of file to write process ID to')),
           ('', 'stdio', None, _('for remote clients')),
           ('t', 'templates', '', _('web templates to use')),

tests/test-debugcomplete.out

@@ -143,7 +143,7 b' root'
 --traceback
 --verbose
 --version
---webdir-conf
+--web-conf
 -6
 -A
 -E
@@ -176,7 +176,7 b' merge: force, rev, preview'
 pull: update, force, rev, branch, ssh, remotecmd
 push: force, rev, branch, ssh, remotecmd
 remove: after, force, include, exclude
-serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, webdir-conf, pid-file, stdio, templates, style, ipv6, certificate
+serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, templates, style, ipv6, certificate
 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude
 summary: remote
 update: clean, check, date, rev