| author | Matt Mackall <mpm@selenic.com> |
| Sat, 15 Oct 2011 14:30:50 -0500 | |
| branch | stable |
| changeset 15273 | 384082750f2c |
| parent 15243 | 1e9451476bf8 |
| child 15442 | db0340f4b507 |
| permissions | -rw-r--r-- |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
1 |
Setup |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
2 |
|
|
13987
e0f07847f8de
color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents:
13774
diff
changeset
|
3 |
$ echo "[color]" >> $HGRCPATH |
|
e0f07847f8de
color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents:
13774
diff
changeset
|
4 |
$ echo "mode = ansi" >> $HGRCPATH |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
5 |
$ echo "[extensions]" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
6 |
$ echo "color=" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
7 |
$ hg init repo |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
8 |
$ cd repo |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
9 |
$ cat > a <<EOF |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
10 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
11 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
12 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
13 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
14 |
> b |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
15 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
16 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
17 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
18 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
19 |
> EOF |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
20 |
$ hg ci -Am adda |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
21 |
adding a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
22 |
$ cat > a <<EOF |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
23 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
24 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
25 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
26 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
27 |
> dd |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
28 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
29 |
> a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
30 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
31 |
> c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
32 |
> EOF |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
33 |
|
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
34 |
default context |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
35 |
|
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
36 |
$ hg diff --nodates --color=always |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
37 |
\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
38 |
\x1b[0;31;1m--- a/a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
39 |
\x1b[0;32;1m+++ b/a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
40 |
\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
41 |
c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
42 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
43 |
a |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
44 |
\x1b[0;31m-b\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
45 |
\x1b[0;32m+dd\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
46 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
47 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
48 |
c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
49 |
|
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
50 |
--unified=2 |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
51 |
|
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
52 |
$ hg diff --nodates -U 2 --color=always |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
53 |
\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
54 |
\x1b[0;31;1m--- a/a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
55 |
\x1b[0;32;1m+++ b/a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
56 |
\x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
57 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
58 |
a |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
59 |
\x1b[0;31m-b\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
60 |
\x1b[0;32m+dd\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
61 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
62 |
a |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
63 |
|
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
64 |
diffstat |
|
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
65 |
|
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
66 |
$ hg diff --stat --color=always |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
67 |
a | 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
68 |
1 files changed, 1 insertions(+), 1 deletions(-) |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
69 |
$ echo "record=" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
70 |
$ echo "[ui]" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
71 |
$ echo "interactive=true" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
72 |
$ echo "[diff]" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
73 |
$ echo "git=True" >> $HGRCPATH |
| 9641 | 74 |
|
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
75 |
record |
|
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
76 |
|
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
77 |
$ chmod 0755 a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
78 |
$ hg record --color=always -m moda a <<EOF |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
79 |
> y |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
80 |
> y |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
81 |
> EOF |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
82 |
\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
83 |
\x1b[0;36;1mold mode 100644\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
84 |
\x1b[0;36;1mnew mode 100755\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
85 |
1 hunks, 1 lines changed |
|
13774
1ce0e80799c0
ui: label prompts, default to yellow prompts
Martin Geisler <mg@lazybytes.net>
parents:
13446
diff
changeset
|
86 |
\x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
87 |
\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
88 |
c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
89 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
90 |
a |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
91 |
\x1b[0;31m-b\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
92 |
\x1b[0;32m+dd\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
93 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
94 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
95 |
c |
|
13774
1ce0e80799c0
ui: label prompts, default to yellow prompts
Martin Geisler <mg@lazybytes.net>
parents:
13446
diff
changeset
|
96 |
\x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) |
|
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13987
diff
changeset
|
97 |
|
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
98 |
$ echo "[extensions]" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
99 |
$ echo "mq=" >> $HGRCPATH |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
100 |
$ hg rollback |
|
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12942
diff
changeset
|
101 |
repository tip rolled back to revision 0 (undo commit) |
|
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12942
diff
changeset
|
102 |
working directory now based on revision 0 |
| 9711 | 103 |
|
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
104 |
qrecord |
| 9711 | 105 |
|
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
106 |
$ hg qrecord --color=always -m moda patch <<EOF |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
107 |
> y |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
108 |
> y |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
109 |
> EOF |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
110 |
\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
111 |
\x1b[0;36;1mold mode 100644\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
112 |
\x1b[0;36;1mnew mode 100755\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
113 |
1 hunks, 1 lines changed |
|
13774
1ce0e80799c0
ui: label prompts, default to yellow prompts
Martin Geisler <mg@lazybytes.net>
parents:
13446
diff
changeset
|
114 |
\x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
115 |
\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
116 |
c |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
117 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
118 |
a |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
119 |
\x1b[0;31m-b\x1b[0m (esc) |
|
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
120 |
\x1b[0;32m+dd\x1b[0m (esc) |
|
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
121 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
122 |
a |
|
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
123 |
c |
|
13774
1ce0e80799c0
ui: label prompts, default to yellow prompts
Martin Geisler <mg@lazybytes.net>
parents:
13446
diff
changeset
|
124 |
\x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) |