diff options
Diffstat (limited to 'tests/test-status-color.t')
| -rw-r--r-- | tests/test-status-color.t | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/test-status-color.t b/tests/test-status-color.t index f7917f7..0c8af2b 100644 --- a/tests/test-status-color.t +++ b/tests/test-status-color.t @@ -1,5 +1,3 @@ - $ "$TESTDIR/hghave" tic || exit 80 - $ echo "[extensions]" >> $HGRCPATH $ echo "color=" >> $HGRCPATH $ echo "[color]" >> $HGRCPATH @@ -136,7 +134,7 @@ hg status: hg status modified added removed deleted unknown never-existed ignored: $ hg status --color=always modified added removed deleted unknown never-existed ignored - never-existed: * (glob) + never-existed: No such file or directory \x1b[0;32;1mA added\x1b[0m (esc) \x1b[0;31;1mR removed\x1b[0m (esc) \x1b[0;36;1;4m! deleted\x1b[0m (esc) @@ -169,9 +167,9 @@ hg status -A: hg status -A (with terminfo color): - $ mkdir "$TESTTMP/terminfo" - $ TERMINFO="$TESTTMP/terminfo" tic "$TESTDIR/hgterm.ti" - $ TERM=hgterm TERMINFO="$TESTTMP/terminfo" hg status --config color.mode=terminfo --color=always -A + $ mkdir $TESTTMP/terminfo + $ TERMINFO=$TESTTMP/terminfo tic $TESTDIR/hgterm.ti + $ TERM=hgterm TERMINFO=$TESTTMP/terminfo hg status --config color.mode=terminfo --color=always -A \x1b[30m\x1b[32m\x1b[1mA added\x1b[30m (esc) \x1b[30m\x1b[32m\x1b[1mA copied\x1b[30m (esc) \x1b[30m\x1b[30m modified\x1b[30m (esc) @@ -282,10 +280,10 @@ test 'resolve -l' $ hg merge merging a warning: conflicts during merge. - merging a incomplete! (edit conflicts, then use 'hg resolve --mark') + merging a failed! merging b warning: conflicts during merge. - merging b incomplete! (edit conflicts, then use 'hg resolve --mark') + merging b failed! 0 files updated, 0 files merged, 0 files removed, 2 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] @@ -296,5 +294,3 @@ hg resolve with one unresolved, one resolved: $ hg resolve --color=always -l \x1b[0;31;1mU a\x1b[0m (esc) \x1b[0;32;1mR b\x1b[0m (esc) - - $ cd .. |