ui.py: untangle updateopts The code in ui.updateopts that handles ui.quiet, ui.verbose and ui.debugflag is too smart, making it somewhat hard to see what are the exact constraints placed on the values of these variables, hiding some buglets. This patch makes these constraints more explicit, fixing these buglets and changing the behaviour slightly. It also adds a test to make sure things work as expected in the future. The buglets: - setting ui.debug = True in a hgrc wouldn't turn on verbose mode - additionally, setting ui.quiet = True or using --quiet would give you a "quiet debug" mode. The behaviour change: - previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e. the final result would be quiet mode), but --verbose wins against --quiet - now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet. As a consequence, using -qv always gives you normal mode (unless debug mode was turned on somewhere)

     1

import getopt

     2

     3

def fancyopts(args, options, state):

     4

    long = []

     5

    short = ''

     6

    map = {}

     7

    dt = {}

     8

     9

    for s, l, d, c in options:

    10

        pl = l.replace('-', '_')

    11

        map['-'+s] = map['--'+l] = pl

    12

        state[pl] = d

    13

        dt[pl] = type(d)

    14

        if not d is None and not callable(d):

    15

            if s: s += ':'

    16

            if l: l += '='

    17

        if s: short = short + s

    18

        if l: long.append(l)

    19

    20

    opts, args = getopt.getopt(args, short, long)

    21

    22

    for opt, arg in opts:

    23

        if dt[map[opt]] is type(fancyopts): state[map[opt]](state,map[opt],arg)

    24

        elif dt[map[opt]] is type(1): state[map[opt]] = int(arg)

    25

        elif dt[map[opt]] is type(''): state[map[opt]] = arg

    26

        elif dt[map[opt]] is type([]): state[map[opt]].append(arg)

    27

        elif dt[map[opt]] is type(None): state[map[opt]] = 1

    28

    29

    return args

    30