# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1123861352 28800
# Node ID 63ca8a68d59e68bf25c60667fb7cdb1c50d4fed7
# Parent  409a9a7b0da25a3faf15da75a8c19c77c5df1256# Parent  bc9ca4d51d239dd5ac24f86d5499a618bedaa92a
Update to tip.


diff --git a/.hgignore b/.hgignore
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
diff --git a/TODO b/TODO
diff --git a/doc/hg.1.txt b/doc/hg.1.txt
diff --git a/mercurial/commands.py b/mercurial/commands.py
diff --git a/mercurial/hg.py b/mercurial/hg.py
diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@@ -708,7 +708,12 @@ def create_server(path, name, templates,
     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 --git a/mercurial/revlog.py b/mercurial/revlog.py
diff --git a/mercurial/util.py b/mercurial/util.py
diff --git a/templates/map b/templates/map
diff --git a/tests/test-help b/tests/test-help
diff --git a/tests/test-help.out b/tests/test-help.out