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

echo "[extensions]" >> $HGRCPATH

     4

echo "mq=" >> $HGRCPATH

     5

     6

hg init a

     7

cd a

     8

     9

echo 'base' > base

    10

hg ci -Ambase -d '1 0'

    11

    12

hg qnew -mmqbase mqbase

    13

hg qrename mqbase renamed

    14

mkdir .hg/patches/foo

    15

hg qrename renamed foo

    16

hg qseries

    17

ls .hg/patches/foo

    18

mkdir .hg/patches/bar

    19

hg qrename foo/renamed bar

    20

hg qseries

    21

ls .hg/patches/bar

    22

hg qrename bar/renamed baz

    23

hg qseries

    24

ls .hg/patches/baz

    25