test-diff-color.t
416 lines
| 11.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-diff-color.t
|
r12415 | Setup | ||
|
r23172 | $ cat <<EOF >> $HGRCPATH | ||
|
r31110 | > [ui] | ||
|
r32104 | > color = yes | ||
|
r32103 | > formatted = always | ||
|
r32122 | > paginate = never | ||
|
r23172 | > [color] | ||
> mode = ansi | ||||
> EOF | ||||
|
r12415 | $ hg init repo | ||
$ cd repo | ||||
$ cat > a <<EOF | ||||
> c | ||||
> c | ||||
> a | ||||
> a | ||||
> b | ||||
> a | ||||
> a | ||||
> c | ||||
> c | ||||
> EOF | ||||
$ hg ci -Am adda | ||||
|
r39126 | \x1b[0;32madding a\x1b[0m (esc) | ||
|
r12415 | $ cat > a <<EOF | ||
> c | ||||
> c | ||||
> a | ||||
> a | ||||
> dd | ||||
> a | ||||
> a | ||||
> c | ||||
> c | ||||
> EOF | ||||
default context | ||||
|
r31110 | $ hg diff --nodates | ||
|
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) | ||||
|
r12415 | c | ||
a | ||||
a | ||||
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
|
r12415 | a | ||
a | ||||
c | ||||
|
r38682 | trailing whitespace | ||
$ cp a a.orig | ||||
|
r38775 | >>> with open('a', 'rb') as f: | ||
... data = f.read() | ||||
>>> with open('a', 'wb') as f: | ||||
... f.write(data.replace('dd', 'dd \r')) | ||||
|
r38682 | $ 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) | ||||
\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) | ||||
c | ||||
a | ||||
a | ||||
\x1b[0;31m-b\x1b[0m (esc) | ||||
\x1b[0;32m+dd\x1b[0m\x1b[0;1;41m \x1b[0m\r (esc) | ||||
a | ||||
a | ||||
c | ||||
$ mv a.orig a | ||||
|
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 | ||||
|
r32104 | (check that 'ui.color=always' force color) | ||
$ hg diff --nodates --config ui.formatted=no --config ui.color=always | ||||
\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) | ||||
c | ||||
a | ||||
a | ||||
\x1b[0;31m-b\x1b[0m (esc) | ||||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
a | ||||
a | ||||
c | ||||
|
r12415 | --unified=2 | ||
|
r31110 | $ hg diff --nodates -U 2 | ||
|
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) | ||||
|
r12415 | a | ||
a | ||||
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
|
r12415 | a | ||
a | ||||
diffstat | ||||
|
r31110 | $ hg diff --stat | ||
|
r12942 | a | 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc) | ||
|
r12415 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
|
r23172 | $ cat <<EOF >> $HGRCPATH | ||
|
r31110 | > [extensions] | ||
|
r23172 | > record = | ||
> [ui] | ||||
> interactive = true | ||||
> [diff] | ||||
> git = True | ||||
> EOF | ||||
|
r12415 | |||
|
r16899 | #if execbit | ||
|
r12415 | record | ||
|
r15442 | $ chmod +x a | ||
|
r31110 | $ hg record -m moda a <<EOF | ||
|
r12415 | > y | ||
> y | ||||
> EOF | ||||
|
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) | ||||
|
r12415 | 1 hunks, 1 lines changed | ||
|
r22589 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
|
r27411 | \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc) | ||
|
r12415 | c | ||
a | ||||
a | ||||
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
|
r12415 | a | ||
a | ||||
c | ||||
|
r22589 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
|
r15243 | |||
|
r12415 | $ echo "[extensions]" >> $HGRCPATH | ||
$ echo "mq=" >> $HGRCPATH | ||||
$ hg rollback | ||||
|
r13446 | repository tip rolled back to revision 0 (undo commit) | ||
working directory now based on revision 0 | ||||
|
r12415 | |||
qrecord | ||||
|
r31110 | $ hg qrecord -m moda patch <<EOF | ||
|
r12415 | > y | ||
> y | ||||
> EOF | ||||
|
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) | ||||
|
r12415 | 1 hunks, 1 lines changed | ||
|
r22589 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
|
r27411 | \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc) | ||
|
r12415 | c | ||
a | ||||
a | ||||
|
r12942 | \x1b[0;31m-b\x1b[0m (esc) | ||
\x1b[0;32m+dd\x1b[0m (esc) | ||||
|
r12415 | a | ||
a | ||||
c | ||||
|
r22589 | \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | ||
|
r16899 | |||
|
r18006 | $ hg qpop -a | ||
popping patch | ||||
patch queue now empty | ||||
|
r16899 | #endif | ||
|
r16913 | |||
|
r18006 | issue3712: test colorization of subrepo diff | ||
$ hg init sub | ||||
$ echo b > sub/b | ||||
$ hg -R sub commit -Am 'create sub' | ||||
|
r39126 | \x1b[0;32madding b\x1b[0m (esc) | ||
|
r18006 | $ echo 'sub = sub' > .hgsub | ||
$ hg add .hgsub | ||||
$ hg commit -m 'add subrepo sub' | ||||
$ echo aa >> a | ||||
$ echo bb >> sub/b | ||||
|
r31110 | $ hg diff -S | ||
|
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) | ||||
|
r18720 | \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc) | ||
|
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) | ||||
|
r22460 | test tabs | ||
$ cat >> a <<EOF | ||||
> one tab | ||||
> two tabs | ||||
> end tab | ||||
> mid tab | ||||
> all tabs | ||||
> EOF | ||||
|
r31110 | $ hg diff --nodates | ||
|
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 | ||||
|
r31110 | $ hg diff --nodates | ||
|
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) | ||||
|
r16913 | $ cd .. | ||
|
r35278 | |||
test inline color diff | ||||
$ hg init inline | ||||
$ cd inline | ||||
$ cat > file1 << EOF | ||||
> this is the first line | ||||
> this is the second line | ||||
> third line starts with space | ||||
> + starts with a plus sign | ||||
|
r35329 | > this one with one tab | ||
> now with full two tabs | ||||
> now tabs everywhere, much fun | ||||
|
r35278 | > | ||
> this line won't change | ||||
> | ||||
> two lines are going to | ||||
> be changed into three! | ||||
> | ||||
> three of those lines will | ||||
> collapse onto one | ||||
> (to see if it works) | ||||
> EOF | ||||
$ hg add file1 | ||||
$ hg ci -m 'commit' | ||||
|
r35329 | |||
|
r35278 | $ cat > file1 << EOF | ||
> that is the first paragraph | ||||
> this is the second line | ||||
> third line starts with space | ||||
> - starts with a minus sign | ||||
|
r35329 | > this one with two tab | ||
> now with full three tabs | ||||
> now there are tabs everywhere, much fun | ||||
|
r35278 | > | ||
> this line won't change | ||||
> | ||||
> two lines are going to | ||||
> (entirely magically, | ||||
> assuming this works) | ||||
> be changed into four! | ||||
> | ||||
> three of those lines have | ||||
> collapsed onto one | ||||
> EOF | ||||
|
r38610 | $ hg diff --config diff.word-diff=False --color=debug | ||
|
r35278 | [diff.diffline|diff --git a/file1 b/file1] | ||
[diff.file_a|--- a/file1] | ||||
[diff.file_b|+++ b/file1] | ||||
|
r35329 | [diff.hunk|@@ -1,16 +1,17 @@] | ||
|
r35278 | [diff.deleted|-this is the first line] | ||
[diff.deleted|-this is the second line] | ||||
[diff.deleted|- third line starts with space] | ||||
[diff.deleted|-+ starts with a plus sign] | ||||
|
r35329 | [diff.deleted|-][diff.tab| ][diff.deleted|this one with one tab] | ||
[diff.deleted|-][diff.tab| ][diff.deleted|now with full two tabs] | ||||
[diff.deleted|-][diff.tab| ][diff.deleted|now tabs][diff.tab| ][diff.deleted|everywhere, much fun] | ||||
|
r35278 | [diff.inserted|+that is the first paragraph] | ||
[diff.inserted|+ this is the second line] | ||||
[diff.inserted|+third line starts with space] | ||||
[diff.inserted|+- starts with a minus sign] | ||||
|
r35329 | [diff.inserted|+][diff.tab| ][diff.inserted|this one with two tab] | ||
[diff.inserted|+][diff.tab| ][diff.inserted|now with full three tabs] | ||||
[diff.inserted|+][diff.tab| ][diff.inserted|now there are tabs][diff.tab| ][diff.inserted|everywhere, much fun] | ||||
|
r35278 | |||
this line won't change | ||||
two lines are going to | ||||
[diff.deleted|-be changed into three!] | ||||
[diff.inserted|+(entirely magically,] | ||||
[diff.inserted|+ assuming this works)] | ||||
[diff.inserted|+be changed into four!] | ||||
[diff.deleted|-three of those lines will] | ||||
[diff.deleted|-collapse onto one] | ||||
[diff.deleted|-(to see if it works)] | ||||
[diff.inserted|+three of those lines have] | ||||
[diff.inserted|+collapsed onto one] | ||||
|
r38610 | $ hg diff --config diff.word-diff=True --color=debug | ||
|
r35278 | [diff.diffline|diff --git a/file1 b/file1] | ||
[diff.file_a|--- a/file1] | ||||
[diff.file_b|+++ b/file1] | ||||
|
r35329 | [diff.hunk|@@ -1,16 +1,17 @@] | ||
|
r37750 | [diff.deleted|-][diff.deleted.changed|this][diff.deleted.unchanged| is the first ][diff.deleted.changed|line] | ||
[diff.deleted|-][diff.deleted.unchanged|this is the second line] | ||||
[diff.deleted|-][diff.deleted.changed| ][diff.deleted.unchanged|third line starts with space] | ||||
[diff.deleted|-][diff.deleted.changed|+][diff.deleted.unchanged| starts with a ][diff.deleted.changed|plus][diff.deleted.unchanged| sign] | ||||
[diff.deleted|-][diff.tab| ][diff.deleted.unchanged|this one with ][diff.deleted.changed|one][diff.deleted.unchanged| tab] | ||||
[diff.deleted|-][diff.tab| ][diff.deleted.unchanged|now with full ][diff.deleted.changed|two][diff.deleted.unchanged| tabs] | ||||
[diff.deleted|-][diff.tab| ][diff.deleted.unchanged|now ][diff.deleted.unchanged|tabs][diff.tab| ][diff.deleted.unchanged|everywhere, much fun] | ||||
[diff.inserted|+][diff.inserted.changed|that][diff.inserted.unchanged| is the first ][diff.inserted.changed|paragraph] | ||||
[diff.inserted|+][diff.inserted.changed| ][diff.inserted.unchanged|this is the second line] | ||||
[diff.inserted|+][diff.inserted.unchanged|third line starts with space] | ||||
[diff.inserted|+][diff.inserted.changed|-][diff.inserted.unchanged| starts with a ][diff.inserted.changed|minus][diff.inserted.unchanged| sign] | ||||
[diff.inserted|+][diff.tab| ][diff.inserted.unchanged|this one with ][diff.inserted.changed|two][diff.inserted.unchanged| tab] | ||||
[diff.inserted|+][diff.tab| ][diff.inserted.unchanged|now with full ][diff.inserted.changed|three][diff.inserted.unchanged| tabs] | ||||
[diff.inserted|+][diff.tab| ][diff.inserted.unchanged|now ][diff.inserted.changed|there are ][diff.inserted.unchanged|tabs][diff.tab| ][diff.inserted.unchanged|everywhere, much fun] | ||||
|
r35278 | |||
this line won't change | ||||
two lines are going to | ||||
|
r37750 | [diff.deleted|-][diff.deleted.unchanged|be changed into ][diff.deleted.changed|three][diff.deleted.unchanged|!] | ||
[diff.inserted|+][diff.inserted.changed|(entirely magically,] | ||||
[diff.inserted|+][diff.inserted.changed| assuming this works)] | ||||
[diff.inserted|+][diff.inserted.unchanged|be changed into ][diff.inserted.changed|four][diff.inserted.unchanged|!] | ||||
|
r35278 | |||
|
r37750 | [diff.deleted|-][diff.deleted.unchanged|three of those lines ][diff.deleted.changed|will] | ||
[diff.deleted|-][diff.deleted.changed|collapse][diff.deleted.unchanged| onto one] | ||||
[diff.deleted|-][diff.deleted.changed|(to see if it works)] | ||||
[diff.inserted|+][diff.inserted.unchanged|three of those lines ][diff.inserted.changed|have] | ||||
[diff.inserted|+][diff.inserted.changed|collapsed][diff.inserted.unchanged| onto one] | ||||
|
r35384 | |||
multibyte character shouldn't be broken up in word diff: | ||||
$ $PYTHON <<'EOF' | ||||
> with open("utf8", "wb") as f: | ||||
> f.write(b"blah \xe3\x82\xa2 blah\n") | ||||
> EOF | ||||
$ hg ci -Am 'add utf8 char' utf8 | ||||
$ $PYTHON <<'EOF' | ||||
> with open("utf8", "wb") as f: | ||||
> f.write(b"blah \xe3\x82\xa4 blah\n") | ||||
> EOF | ||||
$ hg ci -m 'slightly change utf8 char' utf8 | ||||
|
r37749 | |||
|
r38610 | $ hg diff --config diff.word-diff=True --color=debug -c. | ||
|
r35384 | [diff.diffline|diff --git a/utf8 b/utf8] | ||
[diff.file_a|--- a/utf8] | ||||
[diff.file_b|+++ b/utf8] | ||||
[diff.hunk|@@ -1,1 +1,1 @@] | ||||
|
r37750 | [diff.deleted|-][diff.deleted.unchanged|blah ][diff.deleted.changed|\xe3\x82\xa2][diff.deleted.unchanged| blah] (esc) | ||
[diff.inserted|+][diff.inserted.unchanged|blah ][diff.inserted.changed|\xe3\x82\xa4][diff.inserted.unchanged| blah] (esc) | ||||