Merge branch 'es/name-hash-no-trailing-slash-in-dirs'

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index 52c76ae0d7b1d58d1b2325db4846dd9b2134be93..72f745d63f2f225b4976b27875d726b4652198ed 100755 (executable)
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -10,51 +10,93 @@ test_description='Test remote-hg'
 
 . ./test-lib.sh
 
-if ! test_have_prereq PYTHON; then
+if ! test_have_prereq PYTHON
+then
        skip_all='skipping remote-hg tests; python not available'
        test_done
 fi
 
-if ! python -c 'import mercurial'; then
+if ! python -c 'import mercurial'
+then
        skip_all='skipping remote-hg tests; mercurial not available'
        test_done
 fi
 
 check () {
-       echo $3 > expected &&
-       git --git-dir=$1/.git log --format='%s' -1 $2 > actual
+       echo $3 >expected &&
+       git --git-dir=$1/.git log --format='%s' -1 $2 >actual
        test_cmp expected actual
 }
 
 check_branch () {
-       if [ -n "$3" ]; then
-               echo $3 > expected &&
-               hg -R $1 log -r $2 --template '{desc}\n' > actual &&
+       if test -n "$3"
+       then
+               echo $3 >expected &&
+               hg -R $1 log -r $2 --template '{desc}\n' >actual &&
                test_cmp expected actual
        else
-               hg -R $1 branches > out &&
+               hg -R $1 branches >out &&
                ! grep $2 out
        fi
 }
 
 check_bookmark () {
-       if [ -n "$3" ]; then
-               echo $3 > expected &&
-               hg -R $1 log -r "bookmark('$2')" --template '{desc}\n' > actual &&
+       if test -n "$3"
+       then
+               echo $3 >expected &&
+               hg -R $1 log -r "bookmark('$2')" --template '{desc}\n' >actual &&
                test_cmp expected actual
        else
-               hg -R $1 bookmarks > out &&
+               hg -R $1 bookmarks >out &&
                ! grep $2 out
        fi
 }
 
+check_push () {
+       local expected_ret=$1 ret=0 ref_ret=0 IFS=':'
+
+       shift
+       git push origin "$@" 2>error
+       ret=$?
+       cat error
+
+       while read branch kind
+       do
+               case "$kind" in
+               'new')
+                       grep "^ \* \[new branch\] *${branch} -> ${branch}$" error || ref_ret=1
+                       ;;
+               'non-fast-forward')
+                       grep "^ ! \[rejected\] *${branch} -> ${branch} (non-fast-forward)$" error || ref_ret=1
+                       ;;
+               'fetch-first')
+                       grep "^ ! \[rejected\] *${branch} -> ${branch} (fetch first)$" error || ref_ret=1
+                       ;;
+               'forced-update')
+                       grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *${branch} -> ${branch} (forced update)$" error || ref_ret=1
+                       ;;
+               '')
+                       grep "^   [a-f0-9]*\.\.[a-f0-9]* *${branch} -> ${branch}$" error || ref_ret=1
+                       ;;
+               esac
+               test $ref_ret -ne 0 && echo "match for '$branch' failed" && break
+       done
+
+       if test $expected_ret -ne $ret -o $ref_ret -ne 0
+       then
+               return 1
+       fi
+
+       return 0
+}
+
 setup () {
        (
        echo "[ui]"
        echo "username = H G Wells <wells@example.com>"
        echo "[extensions]"
        echo "mq ="
-       ) >> "$HOME"/.hgrc &&
+       ) >>"$HOME"/.hgrc &&
 
        GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230" &&
        GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" &&
@@ -69,7 +111,7 @@ test_expect_success 'cloning' '
        (
        hg init hgrepo &&
        cd hgrepo &&
-       echo zero > content &&
+       echo zero >content &&
        hg add content &&
        hg commit -m zero
        ) &&
@@ -84,7 +126,7 @@ test_expect_success 'cloning with branches' '
        (
        cd hgrepo &&
        hg branch next &&
-       echo next > content &&
+       echo next >content &&
        hg commit -m next
        ) &&
 
@@ -99,7 +141,7 @@ test_expect_success 'cloning with bookmarks' '
        cd hgrepo &&
        hg checkout default &&
        hg bookmark feature-a &&
-       echo feature-a > content &&
+       echo feature-a >content &&
        hg commit -m feature-a
        ) &&
 
@@ -119,7 +161,7 @@ test_expect_success 'update bookmark' '
        git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
        git checkout --quiet devel &&
-       echo devel > content &&
+       echo devel >content &&
        git commit -a -m devel &&
        git push --quiet
        ) &&
@@ -134,7 +176,7 @@ test_expect_success 'new bookmark' '
        git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
        git checkout --quiet -b feature-b &&
-       echo feature-b > content &&
+       echo feature-b >content &&
        git commit -a -m feature-b &&
        git push --quiet origin feature-b
        ) &&
@@ -146,9 +188,9 @@ test_expect_success 'new bookmark' '
 rm -rf hgrepo
 
 author_test () {
-       echo $1 >> content &&
+       echo $1 >>content &&
        hg commit -u "$2" -m "add $1" &&
-       echo "$3" >> ../expected
+       echo "$3" >>../expected
 }
 
 test_expect_success 'authors' '
@@ -161,7 +203,7 @@ test_expect_success 'authors' '
        touch content &&
        hg add content &&
 
-       > ../expected &&
+       >../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>" &&
@@ -176,7 +218,7 @@ test_expect_success 'authors' '
        ) &&
 
        git clone "hg::hgrepo" gitrepo &&
-       git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
+       git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" >actual &&
 
        test_cmp expected actual
 '
@@ -188,11 +230,11 @@ test_expect_success 'strip' '
        hg init hgrepo &&
        cd hgrepo &&
 
-       echo one >> content &&
+       echo one >>content &&
        hg add content &&
        hg commit -m one &&
 
-       echo two >> content &&
+       echo two >>content &&
        hg commit -m two
        ) &&
 
@@ -202,20 +244,20 @@ test_expect_success 'strip' '
        cd hgrepo &&
        hg strip 1 &&
 
-       echo three >> content &&
+       echo three >>content &&
        hg commit -m three &&
 
-       echo four >> content &&
+       echo four >>content &&
        hg commit -m four
        ) &&
 
        (
        cd gitrepo &&
        git fetch &&
-       git log --format="%s" origin/master > ../actual
+       git log --format="%s" origin/master >../actual
        ) &&
 
-       hg -R hgrepo log --template "{desc}\n" > expected &&
+       hg -R hgrepo log --template "{desc}\n" >expected &&
        test_cmp actual expected
 '
 
@@ -225,18 +267,18 @@ test_expect_success 'remote push with master bookmark' '
        (
        hg init hgrepo &&
        cd hgrepo &&
-       echo zero > content &&
+       echo zero >content &&
        hg add content &&
        hg commit -m zero &&
        hg bookmark master &&
-       echo one > content &&
+       echo one >content &&
        hg commit -m one
        ) &&
 
        (
        git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
-       echo two > content &&
+       echo two >content &&
        git commit -a -m two &&
        git push
        ) &&
@@ -244,7 +286,7 @@ test_expect_success 'remote push with master bookmark' '
        check_branch hgrepo default two
 '
 
-cat > expected <<EOF
+cat >expected <<\EOF
 changeset:   0:6e2126489d3d
 tag:         tip
 user:        A U Thor <author@example.com>
@@ -262,13 +304,13 @@ test_expect_success 'remote push from master branch' '
        git init gitrepo &&
        cd gitrepo &&
        git remote add origin "hg::../hgrepo" &&
-       echo one > content &&
+       echo one >content &&
        git add content &&
        git commit -a -m one &&
        git push origin master
        ) &&
 
-       hg -R hgrepo log > actual &&
+       hg -R hgrepo log >actual &&
        cat actual &&
        test_cmp expected actual &&
 
@@ -284,7 +326,7 @@ test_expect_success 'remote cloning' '
        (
        hg init hgrepo &&
        cd hgrepo &&
-       echo zero > content &&
+       echo zero >content &&
        hg add content &&
        hg commit -m zero
        ) &&
@@ -305,7 +347,7 @@ test_expect_success 'remote update bookmark' '
        git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
        git checkout --quiet devel &&
-       echo devel > content &&
+       echo devel >content &&
        git commit -a -m devel &&
        git push --quiet
        ) &&
@@ -320,7 +362,7 @@ test_expect_success 'remote new bookmark' '
        git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
        git checkout --quiet -b feature-b &&
-       echo feature-b > content &&
+       echo feature-b >content &&
        git commit -a -m feature-b &&
        git push --quiet origin feature-b
        ) &&
@@ -336,16 +378,17 @@ test_expect_success 'remote push diverged' '
        (
        cd hgrepo &&
        hg checkout default &&
-       echo bump > content &&
+       echo bump >content &&
        hg commit -m bump
        ) &&
 
        (
        cd gitrepo &&
-       echo diverge > content &&
+       echo diverge >content &&
        git commit -a -m diverged &&
-       test_expect_code 1 git push 2> error &&
-       grep "^ ! \[rejected\] *master -> master (non-fast-forward)$" error
+       check_push 1 <<-\EOF
+       master:non-fast-forward
+       EOF
        ) &&
 
        check_branch hgrepo default bump
@@ -364,17 +407,18 @@ test_expect_success 'remote update bookmark diverge' '
 
        (
        cd hgrepo &&
-       echo "bump bookmark" > content &&
+       echo "bump bookmark" >content &&
        hg commit -m "bump bookmark"
        ) &&
 
        (
        cd gitrepo &&
        git checkout --quiet diverge &&
-       echo diverge > content &&
+       echo diverge >content &&
        git commit -a -m diverge &&
-       test_expect_code 1 git push 2> error &&
-       grep "^ ! \[rejected\] *diverge -> diverge (non-fast-forward)$" error
+       check_push 1 <<-\EOF
+       diverge:fetch-first
+       EOF
        ) &&
 
        check_bookmark hgrepo diverge "bump bookmark"
@@ -387,7 +431,7 @@ test_expect_success 'remote new bookmark multiple branch head' '
        git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
        git checkout --quiet -b feature-c HEAD^ &&
-       echo feature-c > content &&
+       echo feature-c >content &&
        git commit -a -m feature-c &&
        git push --quiet origin feature-c
        ) &&
@@ -402,20 +446,20 @@ setup_big_push () {
        (
        hg init hgrepo &&
        cd hgrepo &&
-       echo zero > content &&
+       echo zero >content &&
        hg add content &&
        hg commit -m zero &&
        hg bookmark bad_bmark1 &&
-       echo one > content &&
+       echo one >content &&
        hg commit -m one &&
        hg bookmark bad_bmark2 &&
        hg bookmark good_bmark &&
        hg bookmark -i good_bmark &&
        hg -q branch good_branch &&
-       echo "good branch" > content &&
+       echo "good branch" >content &&
        hg commit -m "good branch" &&
        hg -q branch bad_branch &&
-       echo "bad branch" > content &&
+       echo "bad branch" >content &&
        hg commit -m "bad branch"
        ) &&
 
@@ -423,40 +467,40 @@ setup_big_push () {
 
        (
        cd gitrepo &&
-       echo two > content &&
+       echo two >content &&
        git commit -q -a -m two &&
 
        git checkout -q good_bmark &&
-       echo three > content &&
+       echo three >content &&
        git commit -q -a -m three &&
 
        git checkout -q bad_bmark1 &&
        git reset --hard HEAD^ &&
-       echo four > content &&
+       echo four >content &&
        git commit -q -a -m four &&
 
        git checkout -q bad_bmark2 &&
        git reset --hard HEAD^ &&
-       echo five > content &&
+       echo five >content &&
        git commit -q -a -m five &&
 
        git checkout -q -b new_bmark master &&
-       echo six > content &&
+       echo six >content &&
        git commit -q -a -m six &&
 
        git checkout -q branches/good_branch &&
-       echo seven > content &&
+       echo seven >content &&
        git commit -q -a -m seven &&
-       echo eight > content &&
+       echo eight >content &&
        git commit -q -a -m eight &&
 
        git checkout -q branches/bad_branch &&
        git reset --hard HEAD^ &&
-       echo nine > content &&
+       echo nine >content &&
        git commit -q -a -m nine &&
 
        git checkout -q -b branches/new_branch master &&
-       echo ten > content &&
+       echo ten >content &&
        git commit -q -a -m ten
        )
 }
@@ -468,19 +512,149 @@ test_expect_success 'remote big push' '
 
        (
        cd gitrepo &&
-       test_expect_code 1 git push origin master \
-               good_bmark bad_bmark1 bad_bmark2 new_bmark \
-               branches/good_branch branches/bad_branch \
-               branches/new_branch 2> error &&
-
-       grep "^   [a-f0-9]*\.\.[a-f0-9]* *master -> master$" error &&
-       grep "^   [a-f0-9]*\.\.[a-f0-9]* *good_bmark -> good_bmark$" error &&
-       grep "^ \* \[new branch\] *new_bmark -> new_bmark$" error &&
-       grep "^ ! \[rejected\] *bad_bmark2 -> bad_bmark2 (non-fast-forward)$" error &&
-       grep "^ ! \[rejected\] *bad_bmark1 -> bad_bmark1 (non-fast-forward)$" error &&
-       grep "^   [a-f0-9]*\.\.[a-f0-9]* *branches/good_branch -> branches/good_branch$" error &&
-       grep "^ ! \[rejected\] *branches/bad_branch -> branches/bad_branch (non-fast-forward)$" error &&
-       grep "^ \* \[new branch\] *branches/new_branch -> branches/new_branch$" error
+
+       check_push 1 --all <<-\EOF
+       master
+       good_bmark
+       branches/good_branch
+       new_bmark:new
+       branches/new_branch:new
+       bad_bmark1:non-fast-forward
+       bad_bmark2:non-fast-forward
+       branches/bad_branch:non-fast-forward
+       EOF
+       ) &&
+
+       check_branch hgrepo default one &&
+       check_branch hgrepo good_branch "good branch" &&
+       check_branch hgrepo bad_branch "bad branch" &&
+       check_branch hgrepo new_branch '' &&
+       check_bookmark hgrepo good_bmark one &&
+       check_bookmark hgrepo bad_bmark1 one &&
+       check_bookmark hgrepo bad_bmark2 one &&
+       check_bookmark hgrepo new_bmark ''
+'
+
+test_expect_success 'remote big push fetch first' '
+       test_when_finished "rm -rf hgrepo gitrepo*" &&
+
+       (
+       hg init hgrepo &&
+       cd hgrepo &&
+       echo zero >content &&
+       hg add content &&
+       hg commit -m zero &&
+       hg bookmark bad_bmark &&
+       hg bookmark good_bmark &&
+       hg bookmark -i good_bmark &&
+       hg -q branch good_branch &&
+       echo "good branch" >content &&
+       hg commit -m "good branch" &&
+       hg -q branch bad_branch &&
+       echo "bad branch" >content &&
+       hg commit -m "bad branch"
+       ) &&
+
+       git clone "hg::hgrepo" gitrepo &&
+
+       (
+       cd hgrepo &&
+       hg bookmark -f bad_bmark &&
+       echo update_bmark >content &&
+       hg commit -m "update bmark"
+       ) &&
+
+       (
+       cd gitrepo &&
+       echo two >content &&
+       git commit -q -a -m two &&
+
+       git checkout -q good_bmark &&
+       echo three >content &&
+       git commit -q -a -m three &&
+
+       git checkout -q bad_bmark &&
+       echo four >content &&
+       git commit -q -a -m four &&
+
+       git checkout -q branches/bad_branch &&
+       echo five >content &&
+       git commit -q -a -m five &&
+
+       check_push 1 --all <<-\EOF &&
+       master
+       good_bmark
+       bad_bmark:fetch-first
+       branches/bad_branch:festch-first
+       EOF
+
+       git fetch &&
+
+       check_push 1 --all <<-\EOF
+       master
+       good_bmark
+       bad_bmark:non-fast-forward
+       branches/bad_branch:non-fast-forward
+       EOF
+       )
+'
+
+test_expect_failure 'remote big push force' '
+       test_when_finished "rm -rf hgrepo gitrepo*" &&
+
+       setup_big_push
+
+       (
+       cd gitrepo &&
+
+       check_push 0 --force --all <<-\EOF
+       master
+       good_bmark
+       branches/good_branch
+       new_bmark:new
+       branches/new_branch:new
+       bad_bmark1:forced-update
+       bad_bmark2:forced-update
+       branches/bad_branch:forced-update
+       EOF
+       ) &&
+
+       check_branch hgrepo default six &&
+       check_branch hgrepo good_branch eight &&
+       check_branch hgrepo bad_branch nine &&
+       check_branch hgrepo new_branch ten &&
+       check_bookmark hgrepo good_bmark three &&
+       check_bookmark hgrepo bad_bmark1 four &&
+       check_bookmark hgrepo bad_bmark2 five &&
+       check_bookmark hgrepo new_bmark six
+'
+
+test_expect_failure 'remote big push dry-run' '
+       test_when_finished "rm -rf hgrepo gitrepo*" &&
+
+       setup_big_push
+
+       (
+       cd gitrepo &&
+
+       check_push 1 --dry-run --all <<-\EOF &&
+       master
+       good_bmark
+       branches/good_branch
+       new_bmark:new
+       branches/new_branch:new
+       bad_bmark1:non-fast-forward
+       bad_bmark2:non-fast-forward
+       branches/bad_branch:non-fast-forward
+       EOF
+
+       check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-\EOF
+       master
+       good_bmark
+       branches/good_branch
+       new_bmark:new
+       branches/new_branch:new
+       EOF
        ) &&
 
        check_branch hgrepo default one &&
@@ -499,10 +673,10 @@ test_expect_success 'remote double failed push' '
        (
        hg init hgrepo &&
        cd hgrepo &&
-       echo zero > content &&
+       echo zero >content &&
        hg add content &&
        hg commit -m zero &&
-       echo one > content &&
+       echo one >content &&
        hg commit -m one
        ) &&
 
@@ -510,7 +684,7 @@ test_expect_success 'remote double failed push' '
        git clone "hg::hgrepo" gitrepo &&
        cd gitrepo &&
        git reset --hard HEAD^ &&
-       echo two > content &&
+       echo two >content &&
        git commit -a -m two &&
        test_expect_code 1 git push &&
        test_expect_code 1 git push