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

#!/bin/sh

     2

     3

hg init

     4

     5

echo foo > a

     6

echo foo > b

     7

hg add a b

     8

     9

hg ci -m "test" -d "1000000 0"

    10

    11

echo blah > a

    12

    13

hg ci -m "branch a" -d "1000000 0"

    14

    15

hg co 0

    16

    17

echo blah > b

    18

    19

hg ci -m "branch b" -d "1000000 0"

    20

HGMERGE=true hg merge 1

    21

    22

hg ci -m "merge b/a -> blah" -d "1000000 0"

    23

    24

hg co 1

    25

HGMERGE=true hg merge 2

    26

hg ci -m "merge a/b -> blah" -d "1000000 0"

    27

    28

hg log

    29

hg debugindex .hg/00changelog.i

    30

    31

echo

    32

    33

echo 1

    34

hg manifest 1

    35

echo 2

    36

hg manifest 2

    37

echo 3

    38

hg manifest 3

    39

echo 4

    40

hg manifest 4

    41

    42

echo

    43

    44

hg debugindex .hg/data/a.i

    45

    46

hg verify