Mercurial > hg-stable
changeset 12424:1aa7ba33f6a9
tests: unify test-eol-update
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 26 Sep 2010 13:41:32 -0500 |
| parents | 10c3385fa89e |
| children | fcf55506c2f4 |
| files | tests/test-eol-update tests/test-eol-update.out tests/test-eol-update.t |
| diffstat | 3 files changed, 152 insertions(+), 152 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-eol-update Sun Sep 26 13:41:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -#!/bin/sh - -cat > $HGRCPATH <<EOF -[diff] -git = 1 -EOF - -seteol () { - if [ $1 = "LF" ]; then - EOL='\n' - else - EOL='\r\n' - fi -} - -makerepo () { - echo - echo "# ==== setup repository ====" - echo '% hg init' - hg init repo - cd repo - - cat > .hgeol <<EOF -[patterns] -**.txt = LF -EOF - - printf "first\nsecond\nthird\n" > a.txt - hg commit --addremove -m 'LF commit' - - cat > .hgeol <<EOF -[patterns] -**.txt = CRLF -EOF - - printf "first\r\nsecond\r\nthird\r\n" > a.txt - hg commit -m 'CRLF commit' - - cd .. -} - -dotest () { - seteol $1 - - echo - echo "% hg clone repo repo-$1" - hg clone --noupdate repo repo-$1 - cd repo-$1 - - cat > .hg/hgrc <<EOF -[extensions] -eol = -EOF - - hg update - - echo '% printrepr.py a.txt (before)' - python $TESTDIR/printrepr.py < a.txt - - printf "first${EOL}third${EOL}" > a.txt - - echo '% printrepr.py a.txt (after)' - python $TESTDIR/printrepr.py < a.txt - echo '% hg diff' - hg diff | python $TESTDIR/printrepr.py - - echo '% hg update 0' - hg update 0 - - echo '% printrepr.py a.txt' - python $TESTDIR/printrepr.py < a.txt - echo '% hg diff' - hg diff | python $TESTDIR/printrepr.py - - - cd .. - rm -r repo-$1 -} - -makerepo -dotest LF -dotest CRLF -rm -r repo
--- a/tests/test-eol-update.out Sun Sep 26 13:41:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ - -# ==== setup repository ==== -% hg init -adding .hgeol -adding a.txt - -% hg clone repo repo-LF -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -% printrepr.py a.txt (before) -first\r -second\r -third\r -% printrepr.py a.txt (after) -first -third -% hg diff -diff --git a/a.txt b/a.txt ---- a/a.txt -+++ b/a.txt -@@ -1,3 +1,2 @@ - first\r --second\r - third\r -% hg update 0 -merging a.txt -1 files updated, 1 files merged, 0 files removed, 0 files unresolved -% printrepr.py a.txt -first -third -% hg diff -diff --git a/a.txt b/a.txt ---- a/a.txt -+++ b/a.txt -@@ -1,3 +1,2 @@ - first --second - third - -% hg clone repo repo-CRLF -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -% printrepr.py a.txt (before) -first\r -second\r -third\r -% printrepr.py a.txt (after) -first\r -third\r -% hg diff -diff --git a/a.txt b/a.txt ---- a/a.txt -+++ b/a.txt -@@ -1,3 +1,2 @@ - first\r --second\r - third\r -% hg update 0 -merging a.txt -1 files updated, 1 files merged, 0 files removed, 0 files unresolved -% printrepr.py a.txt -first -third -% hg diff -diff --git a/a.txt b/a.txt ---- a/a.txt -+++ b/a.txt -@@ -1,3 +1,2 @@ - first --second - third
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-eol-update.t Sun Sep 26 13:41:32 2010 -0500 @@ -0,0 +1,152 @@ +Test EOL update + + $ cat > $HGRCPATH <<EOF + > [diff] + > git = 1 + > EOF + + $ seteol () { + > if [ $1 = "LF" ]; then + > EOL='\n' + > else + > EOL='\r\n' + > fi + > } + + $ makerepo () { + > echo + > echo "# ==== setup repository ====" + > echo '% hg init' + > hg init repo + > cd repo + > + > cat > .hgeol <<EOF + > [patterns] + > **.txt = LF + > EOF + > + > printf "first\nsecond\nthird\n" > a.txt + > hg commit --addremove -m 'LF commit' + > + > cat > .hgeol <<EOF + > [patterns] + > **.txt = CRLF + > EOF + > + > printf "first\r\nsecond\r\nthird\r\n" > a.txt + > hg commit -m 'CRLF commit' + > + > cd .. + > } + + $ dotest () { + > seteol $1 + > + > echo + > echo "% hg clone repo repo-$1" + > hg clone --noupdate repo repo-$1 + > cd repo-$1 + > + > cat > .hg/hgrc <<EOF + > [extensions] + > eol = + > EOF + > + > hg update + > + > echo '% printrepr.py a.txt (before)' + > python $TESTDIR/printrepr.py < a.txt + > + > printf "first${EOL}third${EOL}" > a.txt + > + > echo '% printrepr.py a.txt (after)' + > python $TESTDIR/printrepr.py < a.txt + > echo '% hg diff' + > hg diff | python $TESTDIR/printrepr.py + > + > echo '% hg update 0' + > hg update 0 + > + > echo '% printrepr.py a.txt' + > python $TESTDIR/printrepr.py < a.txt + > echo '% hg diff' + > hg diff | python $TESTDIR/printrepr.py + > + > + > cd .. + > rm -r repo-$1 + > } + + $ makerepo + + # ==== setup repository ==== + % hg init + adding .hgeol + adding a.txt + $ dotest LF + + % hg clone repo repo-LF + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + % printrepr.py a.txt (before) + first\r + second\r + third\r + % printrepr.py a.txt (after) + first + third + % hg diff + diff --git a/a.txt b/a.txt + --- a/a.txt + +++ b/a.txt + @@ -1,3 +1,2 @@ + first\r + -second\r + third\r + % hg update 0 + merging a.txt + 1 files updated, 1 files merged, 0 files removed, 0 files unresolved + % printrepr.py a.txt + first + third + % hg diff + diff --git a/a.txt b/a.txt + --- a/a.txt + +++ b/a.txt + @@ -1,3 +1,2 @@ + first + -second + third + $ dotest CRLF + + % hg clone repo repo-CRLF + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + % printrepr.py a.txt (before) + first\r + second\r + third\r + % printrepr.py a.txt (after) + first\r + third\r + % hg diff + diff --git a/a.txt b/a.txt + --- a/a.txt + +++ b/a.txt + @@ -1,3 +1,2 @@ + first\r + -second\r + third\r + % hg update 0 + merging a.txt + 1 files updated, 1 files merged, 0 files removed, 0 files unresolved + % printrepr.py a.txt + first + third + % hg diff + diff --git a/a.txt b/a.txt + --- a/a.txt + +++ b/a.txt + @@ -1,3 +1,2 @@ + first + -second + third + $ rm -r repo