diff --git a/tests/test-git-tags.out b/tests/test-git-tags.out deleted file mode 100644 index fddb22fc03033c4d4e35f0135bac72fda69f87e9_dGVzdHMvdGVzdC1naXQtdGFncy5vdXQ=..0000000000000000000000000000000000000000 --- a/tests/test-git-tags.out +++ /dev/null @@ -1,22 +0,0 @@ -Initialized empty Git repository in gitrepo/.git/ - -importing git objects into hg -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 1:99dcc15b7b07 -| tag: beta -| tag: default/master -| tag: tip -| user: test <test@example.org> -| date: Mon Jan 01 00:00:12 2007 +0000 -| summary: add beta -| -o changeset: 0:3442585be8a6 - tag: alpha - user: test <test@example.org> - date: Mon Jan 01 00:00:10 2007 +0000 - summary: add alpha - -pushing to git://localhost/gitrepo -exporting hg objects to git -creating and sending data - default::refs/heads/master => GIT:3b7fd1b3 diff --git a/tests/test-git-tags b/tests/test-git-tags.t similarity index 0% rename from tests/test-git-tags rename to tests/test-git-tags.t index fddb22fc03033c4d4e35f0135bac72fda69f87e9_dGVzdHMvdGVzdC1naXQtdGFncw==..ce0b350dba996a543583b28752a0685d5c30c32e_dGVzdHMvdGVzdC1naXQtdGFncy50 100755 --- a/tests/test-git-tags +++ b/tests/test-git-tags.t @@ -1,2 +1,3 @@ -#!/bin/sh +# Fails for some reason, need to investigate +# $ "$TESTDIR/hghave" git || exit 80 @@ -2,4 +3,4 @@ -# Fails for some reason, need to investigate -# "$TESTDIR/hghave" git || exit 80 +bail if the user does not have dulwich + $ python -c 'import dulwich, dulwich.repo' || exit 80 @@ -5,4 +6,4 @@ -# bail if the user does not have dulwich -python -c 'import dulwich, dulwich.repo' || exit 80 +bail early if the user is already running git-daemon + $ ! (echo hi | nc localhost 9418 2>/dev/null) || exit 80 @@ -8,4 +9,6 @@ -# bail early if the user is already running git-daemon -echo hi | nc localhost 9418 2>/dev/null && exit 80 + $ echo "[extensions]" >> $HGRCPATH + $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH + $ echo 'hgext.graphlog =' >> $HGRCPATH + $ echo 'hgext.bookmarks =' >> $HGRCPATH @@ -11,6 +14,8 @@ -echo "[extensions]" >> $HGRCPATH -echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH -echo 'hgext.bookmarks =' >> $HGRCPATH + $ 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 @@ -16,8 +21,17 @@ -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 + $ 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` + > } + $ tag() + > { + > GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" + > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" + > git tag "$@" >/dev/null 2>/dev/null || echo "git commit error" + > count=`expr $count + 1` + > } @@ -23,17 +37,26 @@ -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` -} -tag() -{ - GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" - GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" - git tag "$@" >/dev/null 2>/dev/null || echo "git commit error" - count=`expr $count + 1` -} + $ mkdir gitrepo + $ cd gitrepo + $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" + Initialized empty Git repository in gitrepo/.git/ + + $ git config receive.denyCurrentBranch ignore + $ echo alpha > alpha + $ git add alpha + $ commit -m 'add alpha' + $ tag alpha + + $ echo beta > beta + $ git add beta + $ commit -m 'add beta' + $ tag -a -m 'added tag beta' beta + +dulwich does not presently support local git repos, workaround + $ cd .. + $ git daemon --base-path="$(pwd)"\ + > --listen=localhost\ + > --export-all\ + > --pid-file="$DAEMON_PIDS" \ + > --detach --reuseaddr \ + > --enable=receive-pack @@ -39,15 +62,5 @@ -mkdir gitrepo -cd gitrepo -git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" -git config receive.denyCurrentBranch ignore -echo alpha > alpha -git add alpha -commit -m 'add alpha' -tag alpha - -echo beta > beta -git add beta -commit -m 'add beta' -tag -a -m 'added tag beta' beta + $ hg clone git://localhost/gitrepo hgrepo | grep -v '^updating' + importing git objects into hg + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -53,10 +66,25 @@ -# dulwich does not presently support local git repos, workaround -cd .. -git daemon --base-path="$(pwd)"\ - --listen=localhost\ - --export-all\ - --pid-file="$DAEMON_PIDS" \ - --detach --reuseaddr \ - --enable=receive-pack + $ cd hgrepo + $ hg log --graph | grep -v ': *master' + @ changeset: 1:99dcc15b7b07 + | tag: beta + | tag: default/master + | tag: tip + | user: test <test@example.org> + | date: Mon Jan 01 00:00:12 2007 +0000 + | summary: add beta + | + o changeset: 0:3442585be8a6 + tag: alpha + user: test <test@example.org> + date: Mon Jan 01 00:00:10 2007 +0000 + summary: add alpha + + $ echo beta-fix >> beta + $ hg commit -m 'fix for beta' + $ hg push + pushing to git://localhost/gitrepo + exporting hg objects to git + creating and sending data + default::refs/heads/master => GIT:3b7fd1b3 @@ -62,10 +90,2 @@ -hg clone git://localhost/gitrepo hgrepo | grep -v '^updating' - -cd hgrepo -hg log --graph | grep -v ': *master' -echo beta-fix >> beta -hg commit -m 'fix for beta' -hg push - -cd .. + $ cd ..