commands: refactor 'serve', extract the http service class

mercurial/commands.py

@@ -5183,13 +5183,20 b' def serve(ui, repo, **opts):'
         o = repo
 
     app = hgweb.hgweb(o, baseui=baseui)
-
-    class service(object):
+    service = httpservice(ui, app, opts)
+    cmdutil.service(opts, initfn=service.init, runfn=service.run)
+
+class httpservice(object):
+    def __init__(self, ui, app, opts):
+        self.ui = ui
+        self.app = app
+        self.opts = opts
+
         def init(self):
             util.setsignalhandler()
-            self.httpd = hgweb_server.create_server(ui, app)
-
-            if opts['port'] and not ui.verbose:
+        self.httpd = hgweb_server.create_server(self.ui, self.app)
+
+        if self.opts['port'] and not self.ui.verbose:
                 return
 
             if self.httpd.prefix:
@@ -5210,19 +5217,16 b' def serve(ui, repo, **opts):'
             fqaddr = self.httpd.fqaddr
             if ':' in fqaddr:
                 fqaddr = '[%s]' % fqaddr
-            if opts['port']:
-                write = ui.status
+        if self.opts['port']:
+            write = self.ui.status
             else:
-                write = ui.write
+            write = self.ui.write
             write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
                   (fqaddr, port, prefix, bindaddr, self.httpd.port))
 
         def run(self):
             self.httpd.serve_forever()
 
-    service = service()
-
-    cmdutil.service(opts, initfn=service.init, runfn=service.run)
 
 @command('showconfig|debugconfig',
     [('u', 'untrusted', None, _('show untrusted configuration options'))],