Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-eol-patch.t
branchstable
changeset 12943 7439ea4146f8
parent 12420 e9db6bc37659
child 13519 43b3b761d9d1 
--- a/tests/test-eol-patch.t	Mon Nov 08 01:41:41 2010 +0100
+++ b/tests/test-eol-patch.t	Mon Nov 08 01:41:42 2010 +0100
@@ -50,30 +50,30 @@
   > native = $1
   > EOF
   >     hg update
-  >     echo '% printrepr.py native.txt'
-  >     python $TESTDIR/printrepr.py < native.txt
-  >     echo '% printrepr.py unix.txt'
-  >     python $TESTDIR/printrepr.py < unix.txt
-  >     echo '% printrepr.py win.txt'
-  >     python $TESTDIR/printrepr.py < win.txt
+  >     echo '% native.txt'
+  >     cat native.txt
+  >     echo '% unix.txt'
+  >     cat unix.txt
+  >     echo '% win.txt'
+  >     cat win.txt
   >     printf "first${EOL}third${EOL}" > native.txt
   >     printf "first\r\nthird\r\n" > win.txt
   >     printf "first\nthird\n" > unix.txt
   >     echo '% hg diff'
   >     hg diff > p
-  >     python $TESTDIR/printrepr.py < p
+  >     cat p
   >     echo '% hg revert'
   >     hg revert --all
   >     echo '% hg import'
   >     hg import -m 'patch' p
-  >     echo '% printrepr.py native.txt'
-  >     python $TESTDIR/printrepr.py < native.txt
-  >     echo '% printrepr.py unix.txt'
-  >     python $TESTDIR/printrepr.py < unix.txt
-  >     echo '% printrepr.py win.txt'
-  >     python $TESTDIR/printrepr.py < win.txt
+  >     echo '% native.txt'
+  >     cat native.txt
+  >     echo '% unix.txt'
+  >     cat unix.txt
+  >     echo '% win.txt'
+  >     cat win.txt
   >     echo '% hg diff -c tip'
-  >     hg diff -c tip | python $TESTDIR/printrepr.py
+  >     hg diff -c tip
   >     cd ..
   >     rm -r repo-$1
   > }
@@ -92,18 +92,18 @@
   
   % hg clone repo repo-LF
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  % printrepr.py native.txt
+  % native.txt
   first
   second
   third
-  % printrepr.py unix.txt
+  % unix.txt
   first
   second
   third
-  % printrepr.py win.txt
-  first\r
-  second\r
-  third\r
+  % win.txt
+  first\r (esc)
+  second\r (esc)
+  third\r (esc)
   % hg diff
   diff --git a/native.txt b/native.txt
   --- a/native.txt
@@ -123,24 +123,24 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   % hg revert
   reverting native.txt
   reverting unix.txt
   reverting win.txt
   % hg import
   applying p
-  % printrepr.py native.txt
+  % native.txt
   first
   third
-  % printrepr.py unix.txt
+  % unix.txt
   first
   third
-  % printrepr.py win.txt
-  first\r
-  third\r
+  % win.txt
+  first\r (esc)
+  third\r (esc)
   % hg diff -c tip
   diff --git a/native.txt b/native.txt
   --- a/native.txt
@@ -160,25 +160,25 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   $ dotest CRLF
   
   % 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
+  % native.txt
+  first\r (esc)
+  second\r (esc)
+  third\r (esc)
+  % unix.txt
   first
   second
   third
-  % printrepr.py win.txt
-  first\r
-  second\r
-  third\r
+  % win.txt
+  first\r (esc)
+  second\r (esc)
+  third\r (esc)
   % hg diff
   diff --git a/native.txt b/native.txt
   --- a/native.txt
@@ -198,24 +198,24 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   % 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
+  % native.txt
+  first\r (esc)
+  third\r (esc)
+  % unix.txt
   first
   third
-  % printrepr.py win.txt
-  first\r
-  third\r
+  % win.txt
+  first\r (esc)
+  third\r (esc)
   % hg diff -c tip
   diff --git a/native.txt b/native.txt
   --- a/native.txt
@@ -235,9 +235,9 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   $ rm -r repo
   $ makerepo CRLF
   
@@ -251,26 +251,26 @@
   
   % hg clone repo repo-LF
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  % printrepr.py native.txt
+  % native.txt
   first
   second
   third
-  % printrepr.py unix.txt
+  % unix.txt
   first
   second
   third
-  % printrepr.py win.txt
-  first\r
-  second\r
-  third\r
+  % win.txt
+  first\r (esc)
+  second\r (esc)
+  third\r (esc)
   % 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
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   diff --git a/unix.txt b/unix.txt
   --- a/unix.txt
   +++ b/unix.txt
@@ -282,32 +282,32 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   % hg revert
   reverting native.txt
   reverting unix.txt
   reverting win.txt
   % hg import
   applying p
-  % printrepr.py native.txt
+  % native.txt
   first
   third
-  % printrepr.py unix.txt
+  % unix.txt
   first
   third
-  % printrepr.py win.txt
-  first\r
-  third\r
+  % win.txt
+  first\r (esc)
+  third\r (esc)
   % 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
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   diff --git a/unix.txt b/unix.txt
   --- a/unix.txt
   +++ b/unix.txt
@@ -319,33 +319,33 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   $ dotest CRLF
   
   % 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
+  % native.txt
+  first\r (esc)
+  second\r (esc)
+  third\r (esc)
+  % unix.txt
   first
   second
   third
-  % printrepr.py win.txt
-  first\r
-  second\r
-  third\r
+  % win.txt
+  first\r (esc)
+  second\r (esc)
+  third\r (esc)
   % 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
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   diff --git a/unix.txt b/unix.txt
   --- a/unix.txt
   +++ b/unix.txt
@@ -357,32 +357,32 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   % 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
+  % native.txt
+  first\r (esc)
+  third\r (esc)
+  % unix.txt
   first
   third
-  % printrepr.py win.txt
-  first\r
-  third\r
+  % win.txt
+  first\r (esc)
+  third\r (esc)
   % 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
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   diff --git a/unix.txt b/unix.txt
   --- a/unix.txt
   +++ b/unix.txt
@@ -394,7 +394,7 @@
   --- a/win.txt
   +++ b/win.txt
   @@ -1,3 +1,2 @@
-   first\r
-  -second\r
-   third\r
+   first\r (esc)
+  -second\r (esc)
+   third\r (esc)
   $ rm -r repo
mercurial