Mercurial > hg
annotate tests/test-diff-color.t @ 13405:682edefe7dbb
tests: use printenv.py where it is - don't copy it around
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 15 Feb 2011 02:17:43 +0100 |
parents | 05fffd665170 |
children | 1e497df514e2 |
rev | line source |
---|---|
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 |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
3 $ echo "[extensions]" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
4 $ echo "color=" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
5 $ hg init repo |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
6 $ cd repo |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
7 $ cat > a <<EOF |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
8 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
9 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
10 > a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
11 > a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
12 > b |
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 > a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
15 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
16 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
17 > EOF |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
18 $ hg ci -Am adda |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
19 adding a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
20 $ cat > a <<EOF |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
21 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
22 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
23 > a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
24 > a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
25 > dd |
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 > a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
28 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
29 > c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
30 > EOF |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
31 |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
32 default context |
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 $ 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
|
35 \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
|
36 \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
|
37 \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
|
38 \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
|
39 c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
40 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
41 a |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
42 \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
|
43 \x1b[0;32m+dd\x1b[0m (esc) |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
44 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
45 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
46 c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
47 |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
48 --unified=2 |
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 $ 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
|
51 \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
|
52 \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
|
53 \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
|
54 \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
|
55 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
56 a |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
57 \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
|
58 \x1b[0;32m+dd\x1b[0m (esc) |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
59 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
60 a |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
61 |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
62 diffstat |
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
63 |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
64 $ 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
|
65 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
|
66 1 files changed, 1 insertions(+), 1 deletions(-) |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
67 $ echo "record=" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
68 $ echo "[ui]" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
69 $ echo "interactive=true" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
70 $ echo "[diff]" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
71 $ echo "git=True" >> $HGRCPATH |
9641 | 72 |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
73 record |
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
74 |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
75 $ chmod 0755 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
76 $ hg record --color=always -m moda a <<EOF |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
77 > y |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
78 > y |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
79 > EOF |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
80 \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
|
81 \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
|
82 \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
|
83 1 hunks, 1 lines changed |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
84 examine changes to 'a'? [Ynsfdaq?] |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
85 \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
|
86 c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
87 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
88 a |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
89 \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
|
90 \x1b[0;32m+dd\x1b[0m (esc) |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
91 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
92 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
93 c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
94 record this change to 'a'? [Ynsfdaq?] |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
95 $ echo |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
96 |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
97 $ echo "[extensions]" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
98 $ echo "mq=" >> $HGRCPATH |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
99 $ hg rollback |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
100 rolling back to revision 0 (undo commit) |
9711 | 101 |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
102 qrecord |
9711 | 103 |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
104 $ hg qrecord --color=always -m moda patch <<EOF |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
105 > y |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
106 > y |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
107 > EOF |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
108 \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
|
109 \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
|
110 \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
|
111 1 hunks, 1 lines changed |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
112 examine changes to 'a'? [Ynsfdaq?] |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
113 \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
|
114 c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
115 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
116 a |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12415
diff
changeset
|
117 \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
|
118 \x1b[0;32m+dd\x1b[0m (esc) |
12415
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
119 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
120 a |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
121 c |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
122 record this change to 'a'? [Ynsfdaq?] |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
123 $ echo |
1ff3fc4b6a66
tests: unify test-diff-color
Matt Mackall <mpm@selenic.com>
parents:
9711
diff
changeset
|
124 |