diff --git a/tests/test-pull.out b/tests/test-pull.out deleted file mode 100644 index df78d6f89a0765822460319f1b4ffc1ce6808ff6_dGVzdHMvdGVzdC1wdWxsLm91dA==..0000000000000000000000000000000000000000 --- a/tests/test-pull.out +++ /dev/null @@ -1,31 +0,0 @@ -Initialized empty Git repository in gitrepo/.git/ - -Switched to a new branch "beta" -% clone a tag -importing git objects into hg -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 0:3442585be8a6 - tag: alpha - tag: default/master - tag: tip - user: test <test@example.org> - date: Mon Jan 01 00:00:10 2007 +0000 - summary: add alpha - -% clone a branch -importing git objects into hg -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 1:7bcd915dc873 -| tag: default/beta -| tag: tip -| user: test <test@example.org> -| date: Mon Jan 01 00:00:11 2007 +0000 -| summary: add beta -| -o changeset: 0:3442585be8a6 - tag: alpha - tag: default/master - user: test <test@example.org> - date: Mon Jan 01 00:00:10 2007 +0000 - summary: add alpha - diff --git a/tests/test-pull b/tests/test-pull.t similarity index 2% rename from tests/test-pull rename to tests/test-pull.t index df78d6f89a0765822460319f1b4ffc1ce6808ff6_dGVzdHMvdGVzdC1wdWxs..122bf0dfe16275921b93f2748d32056fac8aab41_dGVzdHMvdGVzdC1wdWxsLnQ= 100755 --- a/tests/test-pull +++ b/tests/test-pull.t @@ -1,3 +1,1 @@ -#!/bin/sh - # Fails for some reason, need to investigate @@ -3,3 +1,3 @@ # Fails for some reason, need to investigate -# "$TESTDIR/hghave" git || exit 80 +# $ "$TESTDIR/hghave" git || exit 80 @@ -5,4 +3,4 @@ -# bail if the user does not have dulwich -python -c 'import dulwich, dulwich.repo' || exit 80 +bail if the user does not have dulwich + $ python -c 'import dulwich, dulwich.repo' || exit 80 @@ -8,4 +6,4 @@ -# bail early if the user is already running git-daemon -echo hi | nc localhost 9418 2>/dev/null && exit 80 +bail early if the user is already running git-daemon + $ ! (echo hi | nc localhost 9418 2>/dev/null) || exit 80 @@ -11,6 +9,6 @@ -echo "[extensions]" >> $HGRCPATH -echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH -echo 'hgext.bookmarks =' >> $HGRCPATH + $ echo "[extensions]" >> $HGRCPATH + $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH + $ echo 'hgext.graphlog =' >> $HGRCPATH + $ echo 'hgext.bookmarks =' >> $HGRCPATH @@ -16,8 +14,8 @@ -GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME -GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL -GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE -GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME -GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL -GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE + $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME + $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL + $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE + $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME + $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL + $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE @@ -23,10 +21,10 @@ -count=10 -commit() -{ - GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" - GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" - git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" - count=`expr $count + 1` -} + $ count=10 + $ commit() + > { + > GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" + > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" + > git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" + > count=`expr $count + 1` + > } @@ -32,8 +30,10 @@ -mkdir gitrepo -cd gitrepo -git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" -echo alpha > alpha -git add alpha -commit -m 'add alpha' + $ mkdir gitrepo + $ cd gitrepo + $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" + Initialized empty Git repository in gitrepo/.git/ + + $ echo alpha > alpha + $ git add alpha + $ commit -m 'add alpha' @@ -39,3 +39,3 @@ -git tag alpha + $ git tag alpha @@ -41,7 +41,8 @@ -git checkout -b beta 2>&1 | sed s/\'/\"/g -echo beta > beta -git add beta -commit -m 'add beta' + $ git checkout -b beta 2>&1 | sed s/\'/\"/g + Switched to a new branch "beta" + $ echo beta > beta + $ git add beta + $ commit -m 'add beta' @@ -46,9 +47,25 @@ -cd .. -git daemon --base-path="$(pwd)"\ - --listen=localhost\ - --export-all\ - --pid-file="$DAEMON_PIDS" \ - --detach --reuseaddr + $ cd .. + $ git daemon --base-path="$(pwd)"\ + > --listen=localhost\ + > --export-all\ + > --pid-file="$DAEMON_PIDS" \ + > --detach --reuseaddr + + $ echo % clone a tag + % clone a tag + $ hg clone -r alpha git://localhost/gitrepo hgrepo-a | grep -v '^updating' + importing git objects into hg + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd hgrepo-a + $ hg log --graph | egrep -v ': *(beta|master)' + @ changeset: 0:3442585be8a6 + tag: alpha + tag: default/master + tag: tip + user: test <test@example.org> + date: Mon Jan 01 00:00:10 2007 +0000 + summary: add alpha + @@ -54,13 +71,25 @@ -echo % clone a tag -hg clone -r alpha git://localhost/gitrepo hgrepo-a | grep -v '^updating' -cd hgrepo-a -hg log --graph | egrep -v ': *(beta|master)' - -cd .. -echo % clone a branch -hg clone -r beta git://localhost/gitrepo hgrepo-b | grep -v '^updating' -cd hgrepo-b -hg log --graph | egrep -v ': *(beta|master)' + $ cd .. + $ echo % clone a branch + % clone a branch + $ hg clone -r beta git://localhost/gitrepo hgrepo-b | grep -v '^updating' + importing git objects into hg + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd hgrepo-b + $ hg log --graph | egrep -v ': *(beta|master)' + @ changeset: 1:7bcd915dc873 + | tag: default/beta + | tag: tip + | user: test <test@example.org> + | date: Mon Jan 01 00:00:11 2007 +0000 + | summary: add beta + | + o changeset: 0:3442585be8a6 + tag: alpha + tag: default/master + user: test <test@example.org> + date: Mon Jan 01 00:00:10 2007 +0000 + summary: add alpha + @@ -65,3 +94,3 @@ -cd .. + $ cd ..