remote-hg: use notes to keep track of Hg revisions

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index f7ce8aa853d5ad9689f49a9cadf0d43ce16ed34f..5a6f7451babe71871a8363bb3b21dc1d5b690825 100755 (executable)
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -75,10 +75,10 @@ check_push () {
                        grep "^   [a-f0-9]*\.\.[a-f0-9]* *${branch} -> ${branch}$" error || ref_ret=1
                        ;;
                esac
-               let 'ref_ret' && echo "match for '$branch' failed" && break
+               test $ref_ret -ne 0 && echo "match for '$branch' failed" && break
        done
 
-       if let 'expected_ret != ret || ref_ret'
+       if test $expected_ret -ne $ret -o $ref_ret -ne 0
        then
                return 1
        fi
@@ -577,11 +577,9 @@ test_expect_success 'remote big push fetch first' '
        echo five > content &&
        git commit -q -a -m five &&
 
-       check_push 1 --all <<-EOF
+       check_push 1 --all <<-EOF &&
        master
        good_bmark
-       new_bmark:new
-       new_branch:new
        bad_bmark:fetch-first
        branches/bad_branch:festch-first
        EOF
@@ -635,7 +633,7 @@ test_expect_failure 'remote big push dry-run' '
        (
        cd gitrepo &&
 
-       check_push 0 --dry-run --all <<-EOF
+       check_push 1 --dry-run --all <<-EOF &&
        master
        good_bmark
        branches/good_branch