diff --git a/tests/test-pull-after-strip.out b/tests/test-pull-after-strip.out deleted file mode 100644 index 122bf0dfe16275921b93f2748d32056fac8aab41_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXN0cmlwLm91dA==..0000000000000000000000000000000000000000 --- a/tests/test-pull-after-strip.out +++ /dev/null @@ -1,59 +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 - -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -pulling from git://localhost/gitrepo -importing git objects into hg -abort: you appear to have run strip - please run hg git-cleanup -git commit map cleaned -% pull works after 'hg git-cleanup' -pulling from git://localhost/gitrepo -importing git objects into hg -(run 'hg update' to get a working copy) -o changeset: 2:611948b1ec6a -| tag: default/beta -| tag: tip -| user: test <test@example.org> -| date: Mon Jan 01 00:00:12 2007 +0000 -| summary: add to beta -| -o changeset: 1:7bcd915dc873 -| user: test <test@example.org> -| date: Mon Jan 01 00:00:11 2007 +0000 -| summary: add beta -| -@ 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-after-strip b/tests/test-pull-after-strip.t similarity index 0% rename from tests/test-pull-after-strip rename to tests/test-pull-after-strip.t index 122bf0dfe16275921b93f2748d32056fac8aab41_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXN0cmlw..5f9267d9bf5de7b9f3a2a01824073f8f80f90cac_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXN0cmlwLnQ= 100755 --- a/tests/test-pull-after-strip +++ b/tests/test-pull-after-strip.t @@ -1,2 +1,14 @@ -#!/bin/sh +# Fails for some reason, need to investigate +# $ "$TESTDIR/hghave" git || exit 80 + +this test is busted on hg < 1.5. I'm not sure how to fix it. + $ cat > tmp.py <<EOF + > import sys + > v = sys.stdin.read().strip()[:-1] + > if v[1] == '.' and ((int(v[0]) == 1 and int(v[2]) > 4) or int(v[0]) > 1): + > sys.exit(0) + > sys.exit(1) + > EOF + + $ hg version | grep version | sed 's/.*(version //' | python tmp.py || exit 80 @@ -2,4 +14,15 @@ -# 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 + +bail early if the user is already running git-daemon + $ ! (echo hi | nc localhost 9418 2>/dev/null) || exit 80 + + $ cat >> $HGRCPATH <<EOF + > [extensions] + > graphlog= + > bookmarks= + > mq= + > EOF + $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH @@ -5,10 +28,17 @@ -# this test is busted on hg < 1.5. I'm not sure how to fix it. -cat > tmp.py <<EOF -import sys -v = sys.stdin.read().strip()[:-1] -if v[1] == '.' and ((int(v[0]) == 1 and int(v[2]) > 4) or int(v[0]) > 1): - sys.exit(0) -sys.exit(1) -EOF + $ 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` + > } @@ -14,3 +44,10 @@ -hg version | grep version | sed 's/.*(version //' | python tmp.py || exit 80 + $ 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' @@ -16,4 +53,3 @@ -# bail if the user does not have dulwich -python -c 'import dulwich, dulwich.repo' || exit 80 + $ git tag alpha @@ -19,5 +55,8 @@ -# bail early if the user is already running git-daemon -echo hi | nc localhost 9418 2>/dev/null && exit 80 + $ 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' @@ -22,17 +61,9 @@ -cat >> $HGRCPATH <<EOF -[extensions] -graphlog= -bookmarks= -mq= -EOF -echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $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 + $ cd .. + $ git daemon --base-path="$(pwd)"\ + > --listen=localhost\ + > --export-all\ + > --pid-file="$DAEMON_PIDS" \ + > --detach --reuseaddr @@ -38,19 +69,17 @@ -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` -} - -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' - -git tag alpha + $ 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 + @@ -56,7 +85,25 @@ -git checkout -b beta 2>&1 | sed s/\'/\"/g -echo beta > beta -git add beta -commit -m 'add beta' - + $ 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 + + $ cd .. @@ -62,13 +109,6 @@ -cd .. -git daemon --base-path="$(pwd)"\ - --listen=localhost\ - --export-all\ - --pid-file="$DAEMON_PIDS" \ - --detach --reuseaddr - -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 gitrepo + $ echo beta line 2 >> beta + $ git add beta + $ commit -m 'add to beta' @@ -74,8 +114,39 @@ -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 .. + $ cd .. + $ cd hgrepo-b + $ hg strip tip 2>&1 | grep -v saving | grep -v backup + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg pull -r beta + pulling from git://localhost/gitrepo + importing git objects into hg + abort: you appear to have run strip - please run hg git-cleanup + [255] + $ hg git-cleanup + git commit map cleaned + $ echo % pull works after \'hg git-cleanup\' + % pull works after 'hg git-cleanup' + $ hg pull -r beta + pulling from git://localhost/gitrepo + importing git objects into hg + (run 'hg update' to get a working copy) + $ hg log --graph | egrep -v ': *(beta|master)' + o changeset: 2:611948b1ec6a + | tag: default/beta + | tag: tip + | user: test <test@example.org> + | date: Mon Jan 01 00:00:12 2007 +0000 + | summary: add to beta + | + o changeset: 1:7bcd915dc873 + | user: test <test@example.org> + | date: Mon Jan 01 00:00:11 2007 +0000 + | summary: add beta + | + @ 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 + @@ -81,16 +152,2 @@ -cd gitrepo -echo beta line 2 >> beta -git add beta -commit -m 'add to beta' - -cd .. -cd hgrepo-b -hg strip tip 2>&1 | grep -v saving | grep -v backup -hg pull -r beta -hg git-cleanup -echo % pull works after \'hg git-cleanup\' -hg pull -r beta -hg log --graph | egrep -v ': *(beta|master)' - -cd .. + $ cd ..