remote-hg: trivial cleanups

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index 7419b52f4f9af6372990967bcf97e81755921dad..af27a0f65fae51771740bc5a31671c8a976f8a1d 100755 (executable)
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -21,11 +21,15 @@ if ! python -c 'import mercurial'; then
 fi
 
 check () {
-       (cd $1 &&
+       (
+       cd $1 &&
        git log --format='%s' -1 &&
-       git symbolic-ref HEAD) > actual &&
-       (echo $2 &&
-       echo "refs/heads/$3") > expected &&
+       git symbolic-ref HEAD
+       ) > actual &&
+       (
+       echo $2 &&
+       echo "refs/heads/$3"
+       ) > expected &&
        test_cmp expected actual
 }
 
@@ -33,6 +37,8 @@ setup () {
        (
        echo "[ui]"
        echo "username = H G Wells <wells@example.com>"
+       echo "[extensions]"
+       echo "mq ="
        ) >> "$HOME"/.hgrc
 }
 
@@ -49,7 +55,7 @@ test_expect_success 'cloning' '
        hg commit -m zero
        ) &&
 
-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&
        check gitrepo zero master
 '
 
@@ -63,12 +69,12 @@ test_expect_success 'cloning with branches' '
        hg commit -m next
        ) &&
 
-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&
        check gitrepo next next &&
 
        (cd hgrepo && hg checkout default) &&
 
-       git clone "hg::$PWD/hgrepo" gitrepo2 &&
+       git clone "hg::hgrepo" gitrepo2 &&
        check gitrepo2 zero master
 '
 
@@ -82,7 +88,7 @@ test_expect_success 'cloning with bookmarks' '
        hg commit -m feature-a
        ) &&
 
-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&
        check gitrepo feature-a feature-a
 '
 
@@ -94,7 +100,7 @@ test_expect_success 'cloning with detached head' '
        hg update -r 0
        ) &&
 
-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&
        check gitrepo zero master
 '
 
@@ -107,7 +113,7 @@ test_expect_success 'update bookmark' '
        ) &&
 
        (
-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
        git checkout --quiet devel &&
        echo devel > content &&
@@ -118,6 +124,9 @@ test_expect_success 'update bookmark' '
        hg -R hgrepo bookmarks | egrep "devel[   ]+3:"
 '
 
+# cleanup previous stuff
+rm -rf hgrepo
+
 author_test () {
        echo $1 >> content &&
        hg commit -u "$2" -m "add $1" &&
@@ -125,8 +134,7 @@ author_test () {
 }
 
 test_expect_success 'authors' '
-       mkdir -p tmp && cd tmp &&
-       test_when_finished "cd .. && rm -rf tmp" &&
+       test_when_finished "rm -rf hgrepo gitrepo" &&
 
        (
        hg init hgrepo &&
@@ -135,6 +143,7 @@ test_expect_success 'authors' '
        touch content &&
        hg add content &&
 
+       > ../expected &&
        author_test alpha "" "H G Wells <wells@example.com>" &&
        author_test beta "test" "test <unknown>" &&
        author_test beta "test <test@example.com> (comment)" "test <test@example.com>" &&
@@ -148,10 +157,48 @@ test_expect_success 'authors' '
        author_test kappa "test@example.com" "Unknown <test@example.com>"
        ) &&
 
-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&
        git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
 
        test_cmp expected actual
 '
 
+test_expect_success 'strip' '
+       test_when_finished "rm -rf hgrepo gitrepo" &&
+
+       (
+       hg init hgrepo &&
+       cd hgrepo &&
+
+       echo one >> content &&
+       hg add content &&
+       hg commit -m one &&
+
+       echo two >> content &&
+       hg commit -m two
+       ) &&
+
+       git clone "hg::hgrepo" gitrepo &&
+
+       (
+       cd hgrepo &&
+       hg strip 1 &&
+
+       echo three >> content &&
+       hg commit -m three &&
+
+       echo four >> content &&
+       hg commit -m four
+       ) &&
+
+       (
+       cd gitrepo &&
+       git fetch &&
+       git log --format="%s" origin/master > ../actual
+       ) &&
+
+       hg -R hgrepo log --template "{desc}\n" > expected &&
+       test_cmp actual expected
+'
+
 test_done