Mercurial > hg
annotate tests/test-diff-color.out @ 11733:b43cfaf571d6
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Aug 2010 10:55:51 -0500 |
parents | 39e7f14a8286 |
children | b8b4a2417fbd |
rev | line source |
---|---|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 adding a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
2 % default context |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
3 [0;1mdiff -r cf9f4ba66af2 a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
4 [0;31;1m--- a/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
5 [0;32;1m+++ b/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
6 [0;35m@@ -2,7 +2,7 @@[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
7 c |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
8 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
9 a |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
10 [0;31m-b[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
11 [0;32m+dd[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
12 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
13 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
14 c |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
15 % --unified=2 |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
16 [0;1mdiff -r cf9f4ba66af2 a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
17 [0;31;1m--- a/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
18 [0;32;1m+++ b/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
19 [0;35m@@ -3,5 +3,5 @@[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
20 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
21 a |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
22 [0;31m-b[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
23 [0;32m+dd[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
24 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
25 a |
9641 | 26 % diffstat |
27 a | 2 [0;32m+[0m[0;31m-[0m | |
28 1 files changed, 1 insertions(+), 1 deletions(-) | |
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
29 % record |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
30 [0;1mdiff --git a/a b/a[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
31 [0;36;1mold mode 100644[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
32 [0;36;1mnew mode 100755[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
33 1 hunks, 2 lines changed |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9711
diff
changeset
|
34 examine changes to 'a'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9711
diff
changeset
|
35 [0;35m@@ -2,7 +2,7 @@[0m |
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
36 c |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
37 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
38 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
39 [0;31m-b[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
40 [0;32m+dd[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
41 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
42 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
43 c |
9602
fc493cb90bb1
Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com>
parents:
9579
diff
changeset
|
44 record this change to 'a'? [Ynsfdaq?] |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9711
diff
changeset
|
45 |
11175 | 46 rolling back to revision 0 (undo commit) |
9711 | 47 % qrecord |
48 [0;1mdiff --git a/a b/a[0m | |
49 [0;36;1mold mode 100644[0m | |
50 [0;36;1mnew mode 100755[0m | |
51 1 hunks, 2 lines changed | |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9711
diff
changeset
|
52 examine changes to 'a'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9711
diff
changeset
|
53 [0;35m@@ -2,7 +2,7 @@[0m |
9711 | 54 c |
55 a | |
56 a | |
57 [0;31m-b[0m | |
58 [0;32m+dd[0m | |
59 a | |
60 a | |
61 c | |
62 record this change to 'a'? [Ynsfdaq?] | |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9711
diff
changeset
|
63 |