Mercurial: tests/test-diff-color.out annotate

annotate tests/test-diff-color.out @ 11148:a912f26777d3

merge: introduce tool.check parameter tool.check is a list of check options, and can be used in place of tool.checkchanged and tool.checkconflicts: Equivalences: tool.checkchanged = yes tool.checkconflicts = no tool.check = changed tool.checkchanged = no tool.checkconflicts = yes tool.check = conflicts tool.checkchanged = yes tool.checkconflicts = yes tool.check = changed, conflicts Add _toollist() wrapper for ui.configlist() to implement this consistently. checkchanged and checkconflicts are still supported, but check is preferred for implementing new check options.

author	David Champion <dgc@uchicago.edu>
date	Mon, 10 May 2010 11:04:56 -0500
parents	468876bc3885
children	39e7f14a8286

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 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 [0;32m+[0m[0;31m-[0m
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 [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
10893 468876bc3885 rollback: improve message Matt Mackall <mpm@selenic.com> parents: 10882 diff changeset	46 rolling back to revision 1 (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 [0;1mdiff --git a/a b/a[0m
d29bd00bbc50 color: wrap qrecord Martin Geisler <mg@lazybytes.net> parents: 9641 diff changeset	49 [0;36;1mold mode 100644[0m
d29bd00bbc50 color: wrap qrecord Martin Geisler <mg@lazybytes.net> parents: 9641 diff changeset	50 [0;36;1mnew mode 100755[0m
d29bd00bbc50 color: wrap qrecord Martin Geisler <mg@lazybytes.net> parents: 9641 diff changeset	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 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 [0;31m-b[0m
d29bd00bbc50 color: wrap qrecord Martin Geisler <mg@lazybytes.net> parents: 9641 diff changeset	58 [0;32m+dd[0m
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

Mercurial > hg

annotate tests/test-diff-color.out @ 11148:a912f26777d3