--- a/mercurial/commands.py	Wed Aug 17 16:37:04 2005 -0800
+++ b/mercurial/commands.py	Wed Aug 17 17:57:37 2005 -0800
@@ -1087,16 +1087,9 @@
                 r = repo.addchangegroup(fin)
                 respond("")
 
-    def openlog(opt, default):
-        if opts[opt] and opts[opt] != '-':
-            return open(opts[opt], 'w')
-        else:
-            return default
-
     httpd = hgweb.create_server(repo.root, opts["name"], opts["templates"],
                                 opts["address"], opts["port"], opts["ipv6"],
-                                openlog('accesslog', sys.stdout),
-                                openlog('errorlog', sys.stderr))
+                                opts['accesslog'], opts['errorlog'])
     if ui.verbose:
         addr, port = httpd.socket.getsockname()
         if addr == '0.0.0.0':
@@ -1368,9 +1361,9 @@
         (serve,
          [('A', 'accesslog', '', 'access log file'),
           ('E', 'errorlog', '', 'error log file'),
-          ('p', 'port', 8000, 'listen port'),
+          ('p', 'port', 0, 'listen port'),
           ('a', 'address', '', 'interface address'),
-          ('n', 'name', os.getcwd(), 'repository name'),
+          ('n', 'name', "", 'repository name'),
           ('', 'stdio', None, 'for remote clients'),
           ('t', 'templates', "", 'template map'),
           ('6', 'ipv6', None, 'use IPv6 in addition to IPv4')],