Mercurial > hg
annotate tests/test-issue352.out @ 9827:4fe9ca519637
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 | 09847b90beae |
children |
rev | line source |
---|---|
3607
f4c9bb4ad7b1
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
1 adding he llo |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
2 abort: '\n' and '\r' disallowed in filenames: 'he\rllo' |
3607
f4c9bb4ad7b1
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
3 adding he llo |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
4 abort: '\n' and '\r' disallowed in filenames: 'he\rllo' |
4186
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
5 adding hell |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
6 o |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
7 abort: '\n' and '\r' disallowed in filenames: 'hell\no' |
4186
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
8 adding hell |
3607
f4c9bb4ad7b1
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
9 o |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
10 abort: '\n' and '\r' disallowed in filenames: 'hell\no' |
4186
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
11 f he llo he llo |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
12 f hell |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
13 o hell |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
14 o |