test-diff-color.t
125 lines
| 2.3 KiB
| text/troff
|
Tads3Lexer
/ tests / test-diff-color.t
Matt Mackall
|
r12415 | Setup | ||
$ echo "[extensions]" >> $HGRCPATH | ||||
$ echo "color=" >> $HGRCPATH | ||||
$ 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 | ||||
$ hg diff --nodates --color=always | ||||
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 | ||||
--unified=2 | ||||
$ hg diff --nodates -U 2 --color=always | ||||
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 | ||||
$ hg diff --stat --color=always | ||||
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(-) | ||
$ echo "record=" >> $HGRCPATH | ||||
$ echo "[ui]" >> $HGRCPATH | ||||
$ echo "interactive=true" >> $HGRCPATH | ||||
$ echo "[diff]" >> $HGRCPATH | ||||
$ echo "git=True" >> $HGRCPATH | ||||
record | ||||
$ chmod 0755 a | ||||
$ hg record --color=always -m moda a <<EOF | ||||
> 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 | ||
Martin Geisler
|
r13774 | \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) | ||
Mads Kiilerich
|
r12942 | \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 | ||||
Martin Geisler
|
r13774 | \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) | ||
Matt Mackall
|
r12415 | $ echo | ||
$ 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 | ||||
$ hg qrecord --color=always -m moda patch <<EOF | ||||
> 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 | ||
Martin Geisler
|
r13774 | \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) | ||
Mads Kiilerich
|
r12942 | \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 | ||||
Martin Geisler
|
r13774 | \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) | ||
Matt Mackall
|
r12415 | $ echo | ||