# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1123706194 28800
# Node ID bc9ca4d51d239dd5ac24f86d5499a618bedaa92a
# Parent  c2e77581bc841e5bf978bc51e3323d1b49916a9e# Parent  16ce690c411d56736fde9fcfaac009c3bf999aff
Merge IPv6 fix.


diff -r c2e77581bc84 -r bc9ca4d51d23 .hgignore
diff -r c2e77581bc84 -r bc9ca4d51d23 CONTRIBUTORS
diff -r c2e77581bc84 -r bc9ca4d51d23 TODO
diff -r c2e77581bc84 -r bc9ca4d51d23 doc/hg.1.txt
diff -r c2e77581bc84 -r bc9ca4d51d23 mercurial/commands.py
diff -r c2e77581bc84 -r bc9ca4d51d23 mercurial/hg.py
diff -r c2e77581bc84 -r bc9ca4d51d23 mercurial/hgweb.py
--- a/mercurial/hgweb.py	Tue Aug 09 17:24:38 2005 -0800
+++ b/mercurial/hgweb.py	Wed Aug 10 12:36:34 2005 -0800
@@ -708,7 +708,12 @@
     import BaseHTTPServer
 
     class IPv6HTTPServer(BaseHTTPServer.HTTPServer):
-        address_family = socket.AF_INET6
+        address_family = getattr(socket, 'AF_INET6', None)
+
+        def __init__(self, *args, **kwargs):
+            if self.address_family is None:
+                raise RepoError('IPv6 not available on this system')
+            BaseHTTPServer.HTTPServer.__init__(self, *args, **kwargs)
 
     class hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler):
         def log_error(self, format, *args):
diff -r c2e77581bc84 -r bc9ca4d51d23 mercurial/revlog.py
diff -r c2e77581bc84 -r bc9ca4d51d23 mercurial/util.py
diff -r c2e77581bc84 -r bc9ca4d51d23 templates/map
diff -r c2e77581bc84 -r bc9ca4d51d23 tests/test-help
diff -r c2e77581bc84 -r bc9ca4d51d23 tests/test-help.out