Mercurial > hg

annotate tests/test-diff-color.out @ 9827:4fe9ca519637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents d29bd00bbc50
children d7732d2df54a
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
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
33 1 hunks, 2 lines changed
9602
fc493cb90bb1 Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com>
parents: 9579
diff changeset
34 examine changes to 'a'? [Ynsfdaq?] @@ -2,7 +2,7 @@
9579
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
35 c
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
36 a
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 -b
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
39 +dd
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
40 a
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 c
9602
fc493cb90bb1 Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com>
parents: 9579
diff changeset
43 record this change to 'a'? [Ynsfdaq?]
9711
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
44 rolling back last transaction
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
45 % qrecord
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
46 diff --git a/a b/a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
47 old mode 100644
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
48 new mode 100755
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
49 1 hunks, 2 lines changed
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
50 examine changes to 'a'? [Ynsfdaq?] @@ -2,7 +2,7 @@
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
51 c
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
52 a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
53 a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
54 -b
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
55 +dd
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 a
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
58 c
d29bd00bbc50 color: wrap qrecord
Martin Geisler <mg@lazybytes.net>
parents: 9641
diff changeset
59 record this change to 'a'? [Ynsfdaq?]