remote-hg: add check_bookmark() test helper

And check in a more proper way.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index d244e236f6eca721f69e7f6345f6cf2f1a3f30df..4e56640101a0f72d878366cff6ff50ff419948e2 100755 (executable)
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -32,6 +32,12 @@ check_branch () {
        test_cmp expected actual
 }
 
+check_bookmark () {
+       echo $3 > expected &&
+       hg -R $1 log -r "bookmark('$2')" --template '{desc}\n' > actual &&
+       test_cmp expected actual
+}
+
 setup () {
        (
        echo "[ui]"
@@ -108,7 +114,7 @@ test_expect_success 'update bookmark' '
        git push --quiet
        ) &&
 
-       hg -R hgrepo bookmarks | egrep "devel[   ]+3:"
+       check_bookmark hgrepo devel devel
 '
 
 # cleanup previous stuff