--- a/tests/test-diff-color.t Tue Feb 28 11:42:07 2017 +0100
+++ b/tests/test-diff-color.t Sat Feb 25 19:44:23 2017 +0100
@@ -1,10 +1,10 @@
Setup
$ cat <<EOF >> $HGRCPATH
+ > [ui]
+ > color = always
> [color]
> mode = ansi
- > [extensions]
- > color =
> EOF
$ hg init repo
$ cd repo
@@ -35,7 +35,7 @@
default context
- $ hg diff --nodates --color=always
+ $ hg diff --nodates
\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
\x1b[0;31;1m--- a/a\x1b[0m (esc)
\x1b[0;32;1m+++ b/a\x1b[0m (esc)
@@ -51,7 +51,7 @@
--unified=2
- $ hg diff --nodates -U 2 --color=always
+ $ hg diff --nodates -U 2
\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
\x1b[0;31;1m--- a/a\x1b[0m (esc)
\x1b[0;32;1m+++ b/a\x1b[0m (esc)
@@ -65,10 +65,11 @@
diffstat
- $ hg diff --stat --color=always
+ $ hg diff --stat
a | 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)
1 files changed, 1 insertions(+), 1 deletions(-)
$ cat <<EOF >> $HGRCPATH
+ > [extensions]
> record =
> [ui]
> interactive = true
@@ -81,7 +82,7 @@
record
$ chmod +x a
- $ hg record --color=always -m moda a <<EOF
+ $ hg record -m moda a <<EOF
> y
> y
> EOF
@@ -111,7 +112,7 @@
qrecord
- $ hg qrecord --color=always -m moda patch <<EOF
+ $ hg qrecord -m moda patch <<EOF
> y
> y
> EOF
@@ -151,7 +152,7 @@
$ echo aa >> a
$ echo bb >> sub/b
- $ hg diff --color=always -S
+ $ hg diff -S
\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
\x1b[0;31;1m--- a/a\x1b[0m (esc)
\x1b[0;32;1m+++ b/a\x1b[0m (esc)
@@ -176,7 +177,7 @@
> mid tab
> all tabs
> EOF
- $ hg diff --nodates --color=always
+ $ hg diff --nodates
\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
\x1b[0;31;1m--- a/a\x1b[0m (esc)
\x1b[0;32;1m+++ b/a\x1b[0m (esc)
@@ -192,7 +193,7 @@
\x1b[0;32m+\x1b[0m \x1b[0;32mall\x1b[0m \x1b[0;32mtabs\x1b[0m\x1b[0;1;41m \x1b[0m (esc)
$ echo "[color]" >> $HGRCPATH
$ echo "diff.tab = bold magenta" >> $HGRCPATH
- $ hg diff --nodates --color=always
+ $ hg diff --nodates
\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
\x1b[0;31;1m--- a/a\x1b[0m (esc)
\x1b[0;32;1m+++ b/a\x1b[0m (esc)