# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1206982155 -7200
# Node ID 626a8e39684656e356c68fd178b255f6b9cb0ab2
# Parent  7c36aee46bf5d12e1706e270e4c305d8d6164a3c# Parent  593a598a93771273c62e86980c58d27831b9ad12
merge with crew

diff -r 593a598a9377 -r 626a8e396846 mercurial/commands.py
--- a/mercurial/commands.py	Mon Mar 31 13:10:47 2008 +0200
+++ b/mercurial/commands.py	Mon Mar 31 18:49:15 2008 +0200
@@ -2527,8 +2527,17 @@
             if port == ':80':
                 port = ''
 
-            ui.status(_('listening at http://%s%s/%s (%s:%d)\n') %
-                      (self.httpd.fqaddr, port, prefix, self.httpd.addr, self.httpd.port))
+            bindaddr = self.httpd.addr
+            if bindaddr == '0.0.0.0':
+                bindaddr = '*'
+            elif ':' in bindaddr: # IPv6
+                bindaddr = '[%s]' % bindaddr
+
+            fqaddr = self.httpd.fqaddr
+            if ':' in fqaddr:
+                fqaddr = '[%s]' % fqaddr
+            ui.status(_('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()
diff -r 593a598a9377 -r 626a8e396846 tests/test-serve.out
--- a/tests/test-serve.out	Mon Mar 31 13:10:47 2008 +0200
+++ b/tests/test-serve.out	Mon Mar 31 18:49:15 2008 +0200
@@ -1,12 +1,12 @@
 % Without -v
 access log created - .hg/hgrc respected
 % With -v
-listening at http://localhost/ (127.0.0.1)
+listening at http://localhost/ (bound to 127.0.0.1)
 % With --prefix foo
-listening at http://localhost/foo/ (127.0.0.1)
+listening at http://localhost/foo/ (bound to 127.0.0.1)
 % With --prefix /foo
-listening at http://localhost/foo/ (127.0.0.1)
+listening at http://localhost/foo/ (bound to 127.0.0.1)
 % With --prefix foo/
-listening at http://localhost/foo/ (127.0.0.1)
+listening at http://localhost/foo/ (bound to 127.0.0.1)
 % With --prefix /foo/
-listening at http://localhost/foo/ (127.0.0.1)
+listening at http://localhost/foo/ (bound to 127.0.0.1)