Mercurial > hg
view tests/test-eol-patch.out @ 11548:dd2f356e1f6f
inotify: Better implementation of the event string representation.
This patch reimplements the event_repr function. It got mostly rewritten to
eliminate the need for conditional compilation of the module when building in
py3k. The trick there (thanks to Antoine Pitrou) is to use the % operator to
let the python interpreter format the string to be returned.
| author | Renato Cunha <renatoc@gmail.com> |
|---|---|
| date | Fri, 02 Jul 2010 16:21:46 -0300 |
| parents | 0bb67503ad4b |
| children |
line wrap: on
line source
# ==== setup LF repository ==== % hg init adding .hgeol adding native.txt adding unix.txt adding win.txt % hg clone repo repo-LF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first second third % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first third % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg clone repo repo-CRLF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first\r second\r third\r % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first\r third\r % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r # ==== setup CRLF repository ==== % hg init adding .hgeol adding native.txt adding unix.txt adding win.txt % hg clone repo repo-LF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first second third % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first third % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg clone repo repo-CRLF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first\r second\r third\r % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first\r third\r % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r