zeroconf: forward all arguments passed to ui.configitems() wrapper

f43988e5954c added 'ignoresub' argument to ui.configitems(), but zeroconf
wrapper wasn't updated. It caused the following crash:

  Traceback (most recent call last):
    File "bin/hg", line 43, in <module>
      mercurial.dispatch.run()
    File "lib/python/mercurial/dispatch.py", line 54, in run
      sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
    File "lib/python/mercurial/dispatch.py", line 120, in dispatch
      ret = _runcatch(req)
    File "lib/python/mercurial/dispatch.py", line 191, in _runcatch
      return _dispatch(req)
    File "lib/python/mercurial/dispatch.py", line 924, in _dispatch
      cmdpats, cmdoptions)
    File "lib/python/mercurial/dispatch.py", line 681, in runcommand
      ret = _runcommand(ui, options, cmd, d)
    File "lib/python/mercurial/extensions.py", line 195, in closure
      return func(*(args + a), **kw)
    File "lib/python/hgext/zeroconf/__init__.py", line 180, in cleanupafterdispatch
      return orig(ui, options, cmd, cmdfunc)
    File "lib/python/mercurial/dispatch.py", line 1055, in _runcommand
      return checkargs()
    File "lib/python/mercurial/dispatch.py", line 1015, in checkargs
      return cmdfunc()
    File "lib/python/mercurial/dispatch.py", line 921, in <lambda>
      d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
    File "lib/python/mercurial/util.py", line 991, in check
      return func(*args, **kwargs)
    File "lib/python/mercurial/commands.py", line 5405, in paths
      pathitems = sorted(ui.paths.iteritems())
    File "lib/python/mercurial/util.py", line 723, in __get__
      result = self.func(obj)
    File "lib/python/mercurial/ui.py", line 619, in paths
      return paths(self)
    File "lib/python/mercurial/ui.py", line 1099, in __init__
      for name, loc in ui.configitems('paths', ignoresub=True):
    File "lib/python/mercurial/extensions.py", line 195, in closure
      return func(*(args + a), **kw)
  TypeError: configitems() got an unexpected keyword argument 'ignoresub'

We have no test coverage for zeroconf, so I've added a minimal test that
could reproduce this problem.

hgext/zeroconf/__init__.py

@@ -1,193 +1,193 b''
 # zeroconf.py - zeroconf support for Mercurial
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''discover and advertise repositories on the local network
 
 Zeroconf-enabled repositories will be announced in a network without
 the need to configure a server or a service. They can be discovered
 without knowing their actual IP address.
 
 To allow other people to discover your repository using run
 :hg:`serve` in your repository::
 
   $ cd test
   $ hg serve
 
 You can discover Zeroconf-enabled repositories by running
 :hg:`paths`::
 
   $ hg paths
   zc-test = http://example.com:8000/test
 '''
 
 import socket, time, os
 
 import Zeroconf
 from mercurial import ui, hg, encoding, dispatch
 from mercurial import extensions
 from mercurial.hgweb import server as servermod
 
 # Note for extension authors: ONLY specify testedwith = 'internal' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
 testedwith = 'internal'
 
 # publish
 
 server = None
 localip = None
 
 def getip():
     # finds external-facing interface without sending any packets (Linux)
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         s.connect(('1.0.0.1', 0))
         ip = s.getsockname()[0]
         return ip
     except socket.error:
         pass
 
     # Generic method, sometimes gives useless results
     try:
         dumbip = socket.gethostbyaddr(socket.gethostname())[2][0]
         if not dumbip.startswith('127.') and ':' not in dumbip:
             return dumbip
     except (socket.gaierror, socket.herror):
         dumbip = '127.0.0.1'
 
     # works elsewhere, but actually sends a packet
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         s.connect(('1.0.0.1', 1))
         ip = s.getsockname()[0]
         return ip
     except socket.error:
         pass
 
     return dumbip
 
 def publish(name, desc, path, port):
     global server, localip
     if not server:
         ip = getip()
         if ip.startswith('127.'):
             # if we have no internet connection, this can happen.
             return
         localip = socket.inet_aton(ip)
         server = Zeroconf.Zeroconf(ip)
 
     hostname = socket.gethostname().split('.')[0]
     host = hostname + ".local"
     name = "%s-%s" % (hostname, name)
 
     # advertise to browsers
     svc = Zeroconf.ServiceInfo('_http._tcp.local.',
                                name + '._http._tcp.local.',
                                server = host,
                                port = port,
                                properties = {'description': desc,
                                              'path': "/" + path},
                                address = localip, weight = 0, priority = 0)
     server.registerService(svc)
 
     # advertise to Mercurial clients
     svc = Zeroconf.ServiceInfo('_hg._tcp.local.',
                                name + '._hg._tcp.local.',
                                server = host,
                                port = port,
                                properties = {'description': desc,
                                              'path': "/" + path},
                                address = localip, weight = 0, priority = 0)
     server.registerService(svc)
 
 def zc_create_server(create_server, ui, app):
     httpd = create_server(ui, app)
     port = httpd.port
 
     try:
         repos = app.repos
     except AttributeError:
         # single repo
         with app._obtainrepo() as repo:
             name = app.reponame or os.path.basename(repo.root)
             path = repo.ui.config("web", "prefix", "").strip('/')
             desc = repo.ui.config("web", "description", name)
         publish(name, desc, path, port)
     else:
         # webdir
         prefix = app.ui.config("web", "prefix", "").strip('/') + '/'
         for repo, path in repos:
             u = app.ui.copy()
             u.readconfig(os.path.join(path, '.hg', 'hgrc'))
             name = os.path.basename(repo)
             path = (prefix + repo).strip('/')
             desc = u.config('web', 'description', name)
             publish(name, desc, path, port)
     return httpd
 
 # listen
 
 class listener(object):
     def __init__(self):
         self.found = {}
     def removeService(self, server, type, name):
         if repr(name) in self.found:
             del self.found[repr(name)]
     def addService(self, server, type, name):
         self.found[repr(name)] = server.getServiceInfo(type, name)
 
 def getzcpaths():
     ip = getip()
     if ip.startswith('127.'):
         return
     server = Zeroconf.Zeroconf(ip)
     l = listener()
     Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l)
     time.sleep(1)
     server.close()
     for value in l.found.values():
         name = value.name[:value.name.index('.')]
         url = "http://%s:%s%s" % (socket.inet_ntoa(value.address), value.port,
                                   value.properties.get("path", "/"))
         yield "zc-" + name, url
 
 def config(orig, self, section, key, default=None, untrusted=False):
     if section == "paths" and key.startswith("zc-"):
         for name, path in getzcpaths():
             if name == key:
                 return path
     return orig(self, section, key, default, untrusted)
 
-def configitems(orig, self, section, untrusted=False):
-    repos = orig(self, section, untrusted)
+def configitems(orig, self, section, *args, **kwargs):
+    repos = orig(self, section, *args, **kwargs)
     if section == "paths":
         repos += getzcpaths()
     return repos
 
 def defaultdest(orig, source):
     for name, path in getzcpaths():
         if path == source:
             return name.encode(encoding.encoding)
     return orig(source)
 
 def cleanupafterdispatch(orig, ui, options, cmd, cmdfunc):
     try:
         return orig(ui, options, cmd, cmdfunc)
     finally:
         # we need to call close() on the server to notify() the various
         # threading Conditions and allow the background threads to exit
         global server
         if server:
             server.close()
 
 extensions.wrapfunction(dispatch, '_runcommand', cleanupafterdispatch)
 
 extensions.wrapfunction(ui.ui, 'config', config)
 extensions.wrapfunction(ui.ui, 'configitems', configitems)
 extensions.wrapfunction(hg, 'defaultdest', defaultdest)
 extensions.wrapfunction(servermod, 'create_server', zc_create_server)

tests/test-paths.t

@@ -1,173 +1,181 b''
   $ hg init a
   $ hg clone a b
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd a
 
 with no paths:
 
   $ hg paths
   $ hg paths unknown
   not found!
   [1]
   $ hg paths -Tjson
   [
   ]
 
 with paths:
 
   $ echo '[paths]' >> .hg/hgrc
   $ echo 'dupe = ../b#tip' >> .hg/hgrc
   $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
   $ hg in dupe
   comparing with $TESTTMP/b (glob)
   no changes found
   [1]
   $ cd ..
   $ hg -R a in dupe
   comparing with $TESTTMP/b (glob)
   no changes found
   [1]
   $ cd a
   $ hg paths
   dupe = $TESTTMP/b#tip (glob)
   expand = $TESTTMP/a/$SOMETHING/bar (glob)
   $ SOMETHING=foo hg paths
   dupe = $TESTTMP/b#tip (glob)
   expand = $TESTTMP/a/foo/bar (glob)
 #if msys
   $ SOMETHING=//foo hg paths
   dupe = $TESTTMP/b#tip (glob)
   expand = /foo/bar
 #else
   $ SOMETHING=/foo hg paths
   dupe = $TESTTMP/b#tip (glob)
   expand = /foo/bar
 #endif
   $ hg paths -q
   dupe
   expand
   $ hg paths dupe
   $TESTTMP/b#tip (glob)
   $ hg paths -q dupe
   $ hg paths unknown
   not found!
   [1]
   $ hg paths -q unknown
   [1]
 
 formatter output with paths:
 
   $ echo 'dupe:pushurl = https://example.com/dupe' >> .hg/hgrc
   $ hg paths -Tjson
   [
    {
     "name": "dupe",
     "pushurl": "https://example.com/dupe",
     "url": "$TESTTMP/b#tip"
    },
    {
     "name": "expand",
     "url": "$TESTTMP/a/$SOMETHING/bar"
    }
   ]
   $ hg paths -Tjson dupe
   [
    {
     "name": "dupe",
     "pushurl": "https://example.com/dupe",
     "url": "$TESTTMP/b#tip"
    }
   ]
   $ hg paths -Tjson -q unknown
   [
   ]
   [1]
 
 password should be masked in plain output, but not in machine-readable output:
 
   $ echo 'insecure = http://foo:[e-mail]/' >> .hg/hgrc
   $ hg paths insecure
   http://foo:***@example.com/
   $ hg paths -Tjson insecure
   [
    {
     "name": "insecure",
     "url": "http://foo:[e-mail]/"
    }
   ]
 
+zeroconf wraps ui.configitems(), which shouldn't crash at least:
+
+  $ hg paths --config extensions.zeroconf=
+  dupe = $TESTTMP/b#tip (glob)
+  dupe:pushurl = https://example.com/dupe
+  expand = $TESTTMP/a/$SOMETHING/bar (glob)
+  insecure = http://foo:***@example.com/
+
   $ cd ..
 
 sub-options for an undeclared path are ignored
 
   $ hg init suboptions
   $ cd suboptions
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > path0 = https://example.com/path0
   > path1:pushurl = https://example.com/path1
   > EOF
   $ hg paths
   path0 = https://example.com/path0
 
 unknown sub-options aren't displayed
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > path0 = https://example.com/path0
   > path0:foo = https://example.com/path1
   > EOF
 
   $ hg paths
   path0 = https://example.com/path0
 
 :pushurl must be a URL
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > default = /path/to/nothing
   > default:pushurl = /not/a/url
   > EOF
 
   $ hg paths
   (paths.default:pushurl not a URL; ignoring)
   default = /path/to/nothing
 
 #fragment is not allowed in :pushurl
 
   $ cat > .hg/hgrc << EOF
   > [paths]
   > default = https://example.com/repo
   > invalid = https://example.com/repo
   > invalid:pushurl = https://example.com/repo#branch
   > EOF
 
   $ hg paths
   ("#fragment" in paths.invalid:pushurl not supported; ignoring)
   default = https://example.com/repo
   invalid = https://example.com/repo
   invalid:pushurl = https://example.com/repo
 
   $ cd ..
 
 'file:' disables [paths] entries for clone destination
 
   $ cat >> $HGRCPATH <<EOF
   > [paths]
   > gpath1 = http://hg.example.com
   > EOF
 
   $ hg clone a gpath1
   abort: cannot create new http repository
   [255]
 
   $ hg clone a file:gpath1
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd gpath1
   $ hg -q id
   000000000000
 
   $ cd ..