annotate tests/test-diff-color.out @ 12408:78a97859b90d

revset: support raw string literals This adds support for r'...' and r"..." as string literals. Strings with the "r" prefix will not have their escape characters interpreted. This is especially useful for grep(), where, with regular string literals, \number is interpreted as an octal escape code, and \b is interpreted as the backspace character (\x08).
author Brodie Rao <brodie@bitheap.org>
date Fri, 24 Sep 2010 15:36:53 -0500
parents b8b4a2417fbd
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 diff -r cf9f4ba66af2 a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
4 --- a/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
5 +++ b/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
6 @@ -2,7 +2,7 @@
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 -b
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
11 +dd
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 diff -r cf9f4ba66af2 a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
17 --- a/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
18 +++ b/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
19 @@ -3,5 +3,5 @@
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 -b
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
23 +dd
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
9b99f158348a color: colorize diff --stat
Brodie Rao <me+hg@dackz.net>
parents: 9602
diff changeset
26 % diffstat
9b99f158348a color: colorize diff --stat
Brodie Rao <me+hg@dackz.net>
parents: 9602
diff changeset
27 a | 2 +-
9b99f158348a color: colorize diff --stat
Brodie Rao <me+hg@dackz.net>
parents: 9602
diff changeset
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 diff --git a/a b/a
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
31 old mode 100644
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
32 new mode 100755
11751
b8b4a2417fbd color: fix test-diff-color breakage
Matt Mackall <mpm@selenic.com>
parents: 11175
diff changeset
33 1 hunks, 1 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 @@ -2,7 +2,7 @@
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 -b
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
40 +dd
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
39e7f14a8286 rollback: fix up tests
Matt Mackall <mpm@selenic.com>
parents: 10893
diff changeset
46 rolling back to revision 0 (undo commit)
9711
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
47 % qrecord
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
48 diff --git a/a b/a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
49 old mode 100644
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
50 new mode 100755
11751
b8b4a2417fbd color: fix test-diff-color breakage
Matt Mackall <mpm@selenic.com>
parents: 11175
diff changeset
51 1 hunks, 1 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 @@ -2,7 +2,7 @@
9711
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
54 c
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
55 a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
56 a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
57 -b
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
58 +dd
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
59 a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
60 a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
61 c
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
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