view tests/test-diff-ignore-whitespace @ 3347:25d270e0b27f

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)
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 10 Oct 2006 18:43:20 -0300
parents 096f1c73cdc3
children 372d93f03d3a
line wrap: on
line source

#!/bin/sh

# GNU diff is the reference for all of these results.

hgdiff() {
    hg diff --nodates "$@"
}

test_added_blank_lines() {
    printf '\nhello world\n\ngoodbye world\n\n' >foo

    echo '>>> two diffs showing three added lines <<<'
    hgdiff
    hgdiff -b

    echo '>>> no diffs <<<'
    hgdiff -B
    hgdiff -Bb
}

test_added_horizontal_space_first_on_a_line() {
    printf '\t hello world\ngoodbye world\n' >foo

    echo '>>> four diffs showing added space first on the first line <<<'
    hgdiff
    hgdiff -b
    hgdiff -B
    hgdiff -Bb
}

test_added_horizontal_space_last_on_a_line() {
    printf 'hello world\t \ngoodbye world\n' >foo

    echo '>>> two diffs showing space appended to the first line <<<'
    hgdiff
    hgdiff -B

    echo '>>> no diffs <<<'
    hgdiff -b
    hgdiff -Bb
}

test_added_horizontal_space_in_the_middle_of_a_word() {
    printf 'hello world\ngood bye world\n' >foo

    echo '>>> four diffs showing space inserted into "goodbye" <<<'
    hgdiff
    hgdiff -B
    hgdiff -b
    hgdiff -Bb
}

test_increased_horizontal_whitespace_amount() {
    printf 'hello world\ngoodbye\t\t  \tworld\n' >foo

    echo '>>> two diffs showing changed whitespace amount in the last line <<<'
    hgdiff
    hgdiff -B

    echo '>>> no diffs <<<'
    hgdiff -b
    hgdiff -Bb
}

test_added_blank_line_with_horizontal_whitespace() {
    printf 'hello world\n \t\ngoodbye world\n' >foo

    echo '>>> four diffs showing added blank line w/horizontal space <<<'
    hgdiff
    hgdiff -B
    hgdiff -b
    hgdiff -Bb
}

hg init
printf 'hello world\ngoodbye world\n' >foo
hg ci -Amfoo -ufoo -d '0 0'

test_added_blank_lines
test_added_horizontal_space_first_on_a_line
test_added_horizontal_space_last_on_a_line
test_added_horizontal_space_in_the_middle_of_a_word
test_increased_horizontal_whitespace_amount
test_added_blank_line_with_horizontal_whitespace