test-diff-color.t
244 lines
| 4.7 KiB
| text/troff
|
Tads3Lexer
/ tests / test-diff-color.t
Matt Mackall
|
r12415 | Setup | ||
Yuya Nishihara
|
r23172 | $ cat <<EOF >> $HGRCPATH | ||
Pierre-Yves David
|
r31110 | > [ui] | ||
> color = always | ||||
Pierre-Yves David
|
r32103 | > formatted = always | ||
Yuya Nishihara
|
r23172 | > [color] | ||
> mode = ansi | ||||
> EOF | ||||
Matt Mackall
|
r12415 | $ hg init repo | ||
$ cd repo | ||||
$ cat > a <<EOF | ||||
> c | ||||
> c | ||||
> a | ||||
> a | ||||
> b | ||||
> a | ||||
> a | ||||
> c | ||||
> c | ||||
> EOF | ||||
$ hg ci -Am adda | ||||
adding a | ||||
$ cat > a <<EOF | ||||
> c | ||||
> c | ||||
> a | ||||
> a | ||||
> dd | ||||
> a | ||||
> a | ||||
> c | ||||
> c | ||||
> EOF | ||||
default context | ||||
Pierre-Yves David
|
r31110 | $ hg diff --nodates | ||
Mads Kiilerich
|
r12942 | \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) | ||||
\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | c | ||
a | ||||
a | ||||
Mads Kiilerich
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | a | ||
a | ||||
c | ||||
Pierre-Yves David
|
r32103 | (check that 'ui.color=yes' match '--color=auto') | ||
$ hg diff --nodates --config ui.formatted=no | ||||
diff -r cf9f4ba66af2 a | ||||
--- a/a | ||||
+++ b/a | ||||
@@ -2,7 +2,7 @@ | ||||
c | ||||
a | ||||
a | ||||
-b | ||||
+dd | ||||
a | ||||
a | ||||
c | ||||
(check that 'ui.color=no' disable color) | ||||
$ hg diff --nodates --config ui.formatted=yes --config ui.color=no | ||||
diff -r cf9f4ba66af2 a | ||||
--- a/a | ||||
+++ b/a | ||||
@@ -2,7 +2,7 @@ | ||||
c | ||||
a | ||||
a | ||||
-b | ||||
+dd | ||||
a | ||||
a | ||||
c | ||||
Matt Mackall
|
r12415 | --unified=2 | ||
Pierre-Yves David
|
r31110 | $ hg diff --nodates -U 2 | ||
Mads Kiilerich
|
r12942 | \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) | ||||
\x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | a | ||
a | ||||
Mads Kiilerich
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | a | ||
a | ||||
diffstat | ||||
Pierre-Yves David
|
r31110 | $ hg diff --stat | ||
Mads Kiilerich
|
r12942 | a | 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc) | ||
Matt Mackall
|
r12415 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
Yuya Nishihara
|
r23172 | $ cat <<EOF >> $HGRCPATH | ||
Pierre-Yves David
|
r31110 | > [extensions] | ||
Yuya Nishihara
|
r23172 | > record = | ||
> [ui] | ||||
> interactive = true | ||||
> [diff] | ||||
> git = True | ||||
> EOF | ||||
Matt Mackall
|
r12415 | |||
Mads Kiilerich
|
r16899 | #if execbit | ||
Matt Mackall
|
r12415 | record | ||
Mads Kiilerich
|
r15442 | $ chmod +x a | ||
Pierre-Yves David
|
r31110 | $ hg record -m moda a <<EOF | ||
Matt Mackall
|
r12415 | > y | ||
> y | ||||
> EOF | ||||
Mads Kiilerich
|
r12942 | \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) | ||
\x1b[0;36;1mold mode 100644\x1b[0m (esc) | ||||
\x1b[0;36;1mnew mode 100755\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | 1 hunks, 1 lines changed | ||
Mads Kiilerich
|
r22589 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
timeless
|
r27411 | \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc) | ||
Matt Mackall
|
r12415 | c | ||
a | ||||
a | ||||
Mads Kiilerich
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | a | ||
a | ||||
c | ||||
Mads Kiilerich
|
r22589 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
Mads Kiilerich
|
r15243 | |||
Matt Mackall
|
r12415 | $ echo "[extensions]" >> $HGRCPATH | ||
$ echo "mq=" >> $HGRCPATH | ||||
$ hg rollback | ||||
Gilles Moris
|
r13446 | repository tip rolled back to revision 0 (undo commit) | ||
working directory now based on revision 0 | ||||
Matt Mackall
|
r12415 | |||
qrecord | ||||
Pierre-Yves David
|
r31110 | $ hg qrecord -m moda patch <<EOF | ||
Matt Mackall
|
r12415 | > y | ||
> y | ||||
> EOF | ||||
Mads Kiilerich
|
r12942 | \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) | ||
\x1b[0;36;1mold mode 100644\x1b[0m (esc) | ||||
\x1b[0;36;1mnew mode 100755\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | 1 hunks, 1 lines changed | ||
Mads Kiilerich
|
r22589 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
timeless
|
r27411 | \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc) | ||
Matt Mackall
|
r12415 | c | ||
a | ||||
a | ||||
Mads Kiilerich
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
Matt Mackall
|
r12415 | a | ||
a | ||||
c | ||||
Mads Kiilerich
|
r22589 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
Mads Kiilerich
|
r16899 | |||
FUJIWARA Katsunori
|
r18006 | $ hg qpop -a | ||
popping patch | ||||
patch queue now empty | ||||
Mads Kiilerich
|
r16899 | #endif | ||
Mads Kiilerich
|
r16913 | |||
FUJIWARA Katsunori
|
r18006 | issue3712: test colorization of subrepo diff | ||
$ hg init sub | ||||
$ echo b > sub/b | ||||
$ hg -R sub commit -Am 'create sub' | ||||
adding b | ||||
$ echo 'sub = sub' > .hgsub | ||||
$ hg add .hgsub | ||||
$ hg commit -m 'add subrepo sub' | ||||
$ echo aa >> a | ||||
$ echo bb >> sub/b | ||||
Pierre-Yves David
|
r31110 | $ hg diff -S | ||
FUJIWARA Katsunori
|
r18006 | \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) | ||||
\x1b[0;35m@@ -7,3 +7,4 @@\x1b[0m (esc) | ||||
a | ||||
c | ||||
c | ||||
\x1b[0;32m+aa\x1b[0m (esc) | ||||
Simon Heimberg
|
r18720 | \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc) | ||
FUJIWARA Katsunori
|
r18006 | \x1b[0;31;1m--- a/sub/b\x1b[0m (esc) | ||
\x1b[0;32;1m+++ b/sub/b\x1b[0m (esc) | ||||
\x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) | ||||
b | ||||
\x1b[0;32m+bb\x1b[0m (esc) | ||||
Jordi GutiƩrrez Hermoso
|
r22460 | test tabs | ||
$ cat >> a <<EOF | ||||
> one tab | ||||
> two tabs | ||||
> end tab | ||||
> mid tab | ||||
> all tabs | ||||
> EOF | ||||
Pierre-Yves David
|
r31110 | $ hg diff --nodates | ||
Jordi GutiƩrrez Hermoso
|
r22460 | \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) | ||||
\x1b[0;35m@@ -7,3 +7,9 @@\x1b[0m (esc) | ||||
a | ||||
c | ||||
c | ||||
\x1b[0;32m+aa\x1b[0m (esc) | ||||
\x1b[0;32m+\x1b[0m \x1b[0;32mone tab\x1b[0m (esc) | ||||
\x1b[0;32m+\x1b[0m \x1b[0;32mtwo tabs\x1b[0m (esc) | ||||
\x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m \x1b[0m (esc) | ||||
\x1b[0;32m+mid\x1b[0m \x1b[0;32mtab\x1b[0m (esc) | ||||
\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 | ||||
Pierre-Yves David
|
r31110 | $ hg diff --nodates | ||
Jordi GutiƩrrez Hermoso
|
r22460 | \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) | ||||
\x1b[0;35m@@ -7,3 +7,9 @@\x1b[0m (esc) | ||||
a | ||||
c | ||||
c | ||||
\x1b[0;32m+aa\x1b[0m (esc) | ||||
\x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mone tab\x1b[0m (esc) | ||||
\x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtwo tabs\x1b[0m (esc) | ||||
\x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m \x1b[0m (esc) | ||||
\x1b[0;32m+mid\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtab\x1b[0m (esc) | ||||
\x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mall\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtabs\x1b[0m\x1b[0;1;41m \x1b[0m (esc) | ||||
Mads Kiilerich
|
r16913 | $ cd .. | ||