Mercurial > hg
view tests/test-diff-ignore-whitespace.out @ 4540:133a52d70958
Respect locale environment variables on darwin.
In python 2.4+ on darwin, locale.getpreferredencoding() returns
mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can
produce hard-to-notice conversion errors if input text is not in
mac-roman. So this patch overrides it with setlocale/getlocale if the
environment has been customized, on the assumption that the user has
done so deliberately.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Mon, 11 Jun 2007 12:14:31 -0700 |
| parents | bdf9d809467c |
| children | 372d93f03d3a |
line wrap: on
line source
adding foo >>> two diffs showing three added lines <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world + hello world + goodbye world + diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,5 @@ hello world + hello world + goodbye world + >>> no diffs <<< >>> four diffs showing added space first on the first line <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world + hello world goodbye world >>> two diffs showing space appended to the first line <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world +hello world goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world -hello world +hello world goodbye world >>> no diffs <<< >>> four diffs showing space inserted into "goodbye" <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +good bye world >>> two diffs showing changed whitespace amount in the last line <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,2 @@ hello world hello world -goodbye world +goodbye world >>> no diffs <<< >>> four diffs showing added blank line w/horizontal space <<< diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world hello world + goodbye world