diff --git a/tests/test-git-submodules.out b/tests/test-git-submodules.out deleted file mode 100644 index deb7f683e0d545d86ad559c4faf4c98fee9643cf_dGVzdHMvdGVzdC1naXQtc3VibW9kdWxlcy5vdXQ=..0000000000000000000000000000000000000000 --- a/tests/test-git-submodules.out +++ /dev/null @@ -1,39 +0,0 @@ -Initialized empty Git repository in gitrepo1/.git/ - -Initialized empty Git repository in gitsubrepo/.git/ - -Initialized empty Git repository in ... - -Initialized empty Git repository in ... - -[master e42b08b] add subrepo - 2 files changed, 4 insertions(+) - create mode 100644 .gitmodules - create mode 160000 subrepo -rm 'subrepo' -rm '.gitmodules' -[master 7e4c934] rm subrepo - 2 files changed, 4 deletions(-) - delete mode 100644 .gitmodules - delete mode 160000 subrepo -importing git objects into hg -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 2:954cdf1c8c82 -| tag: default/master -| tag: tip -| user: test <test@example.org> -| date: Mon Jan 01 00:00:11 2007 +0000 -| summary: rm subrepo -| -o changeset: 1:145121c71064 -| user: test <test@example.org> -| date: Mon Jan 01 00:00:11 2007 +0000 -| summary: add subrepo -| -o changeset: 0:3442585be8a6 - user: test <test@example.org> - date: Mon Jan 01 00:00:10 2007 +0000 - summary: add alpha - -% we should have some bookmarks - * master 2:954cdf1c8c82 diff --git a/tests/test-git-submodules b/tests/test-git-submodules.t similarity index 0% rename from tests/test-git-submodules rename to tests/test-git-submodules.t index deb7f683e0d545d86ad559c4faf4c98fee9643cf_dGVzdHMvdGVzdC1naXQtc3VibW9kdWxlcw==..fddb22fc03033c4d4e35f0135bac72fda69f87e9_dGVzdHMvdGVzdC1naXQtc3VibW9kdWxlcy50 100755 --- a/tests/test-git-submodules +++ b/tests/test-git-submodules.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,10 @@ -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" | sed 's/, 0 deletions(-)//' + > count=`expr $count + 1` + > } @@ -23,10 +30,24 @@ -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" | sed 's/, 0 deletions(-)//' - count=`expr $count + 1` -} + $ mkdir gitrepo1 + $ cd gitrepo1 + $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" + Initialized empty Git repository in gitrepo1/.git/ + + $ echo alpha > alpha + $ git add alpha + $ commit -m 'add alpha' + $ cd .. + + $ mkdir gitsubrepo + $ cd gitsubrepo + $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" + Initialized empty Git repository in gitsubrepo/.git/ + + $ echo beta > beta + $ git add beta + $ commit -m 'add beta' + $ cd .. + + $ mkdir gitrepo2 + $ cd gitrepo2 @@ -32,20 +53,8 @@ -mkdir gitrepo1 -cd gitrepo1 -git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" -echo alpha > alpha -git add alpha -commit -m 'add alpha' -cd .. - -mkdir gitsubrepo -cd gitsubrepo -git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" -echo beta > beta -git add beta -commit -m 'add beta' -cd .. - -mkdir gitrepo2 -cd gitrepo2 + $ rmpwd="import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" +different versions of git spell the dir differently. Older versions +use the full path to the directory all the time, whereas newer +version spell it sanely as it was given (eg . in a newer version, +while older git will use the full normalized path for .) + $ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../' @@ -51,8 +60,23 @@ -rmpwd="import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" -# different versions of git spell the dir differently. Older versions -# use the full path to the directory all the time, whereas newer -# version spell it sanely as it was given (eg . in a newer version, -# while older git will use the full normalized path for .) -clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../' + $ git clone ../gitrepo1 . | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' + Initialized empty Git repository in ... + + $ git submodule add ../gitsubrepo subrepo | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' + Initialized empty Git repository in ... + + $ git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//' + [master e42b08b] add subrepo + 2 files changed, 4 insertions(+) + create mode 100644 .gitmodules + create mode 160000 subrepo + $ git rm --cached subrepo + rm 'subrepo' + $ git rm .gitmodules + rm '.gitmodules' + $ git commit -m 'rm subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//' + [master 7e4c934] rm subrepo + 2 files changed, 4 deletions(-) + delete mode 100644 .gitmodules + delete mode 160000 subrepo + $ cd .. @@ -58,9 +82,24 @@ -git clone ../gitrepo1 . | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' -git submodule add ../gitsubrepo subrepo | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' -git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//' -git rm --cached subrepo -git rm .gitmodules -git commit -m 'rm subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//' -cd .. + $ hg clone gitrepo2 hgrepo | grep -v '^updating' + importing git objects into hg + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd hgrepo + $ hg log --graph | grep -v ': *master' + @ changeset: 2:954cdf1c8c82 + | tag: default/master + | tag: tip + | user: test <test@example.org> + | date: Mon Jan 01 00:00:11 2007 +0000 + | summary: rm subrepo + | + o changeset: 1:145121c71064 + | user: test <test@example.org> + | date: Mon Jan 01 00:00:11 2007 +0000 + | summary: add subrepo + | + o changeset: 0:3442585be8a6 + user: test <test@example.org> + date: Mon Jan 01 00:00:10 2007 +0000 + summary: add alpha + @@ -66,7 +105,5 @@ -hg clone gitrepo2 hgrepo | grep -v '^updating' -cd hgrepo -hg log --graph | grep -v ': *master' - -echo % we should have some bookmarks -hg book + $ echo % we should have some bookmarks + % we should have some bookmarks + $ hg book + * master 2:954cdf1c8c82