Map long option names containing dashes to ones containing underscores.

mercurial/fancyopts.py

@@ -1,29 +1,30 b''
 import getopt
 
 def fancyopts(args, options, state):
     long=[]
     short=''
     map={}
     dt={}
 
     for s, l, d, c in options:
-        map['-'+s] = map['--'+l]=l
-        state[l] = d
-        dt[l] = type(d)
+        pl = l.replace('-', '_')
+        map['-'+s] = map['--'+l] = pl
+        state[pl] = d
+        dt[pl] = type(d)
         if not d is None and not callable(d):
             if s: s += ':'
             if l: l += '='
         if s: short = short + s
         if l: long.append(l)
 
     opts, args = getopt.getopt(args, short, long)
 
     for opt, arg in opts:
         if dt[map[opt]] is type(fancyopts): state[map[opt]](state,map[opt],arg)
         elif dt[map[opt]] is type(1): state[map[opt]] = int(arg)
         elif dt[map[opt]] is type(''): state[map[opt]] = arg
         elif dt[map[opt]] is type([]): state[map[opt]].append(arg)
         elif dt[map[opt]] is type(None): state[map[opt]] = 1
 
     return args