--- a/mercurial/fancyopts.py	Wed Jun 09 12:45:48 2010 +0100
+++ b/mercurial/fancyopts.py	Sun Jun 06 17:25:00 2010 +0900
@@ -43,6 +43,7 @@
       long option
       default value
       description
+      option value label(optional)
 
     option types include:
 
@@ -59,7 +60,11 @@
     argmap = {}
     defmap = {}
 
-    for short, name, default, comment in options:
+    for option in options:
+        if len(option) == 5:
+            short, name, default, comment, dummy = option
+        else:
+            short, name, default, comment = option
         # convert opts to getopt format
         oname = name
         name = name.replace('-', '_')