remote-helpers: test: simplify remote URLs

No need to specify $PWD any more.

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-bzr.sh b/contrib/remote-helpers/test-bzr.sh
index b54313e69eee6e0f1c840eade1e639d27beeba2b..f215b26bac9f65d81ff1b6ad440b2df40d1ef922 100755 (executable)
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -41,7 +41,7 @@ test_expect_success 'cloning' '
        bzr commit -m one
        ) &&
 
        bzr commit -m one
        ) &&
 

-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&

        check gitrepo one master
 '
 
        check gitrepo one master
 '
 


@@ -216,7 +216,7 @@ test_expect_success 'fetch utf-8 filenames' '
        ) &&
 
        (
        ) &&
 
        (

-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&

        cd gitrepo &&
        git -c core.quotepath=false ls-files > ../actual
        ) &&
        cd gitrepo &&
        git -c core.quotepath=false ls-files > ../actual
        ) &&


@@ -242,7 +242,7 @@ test_expect_success 'push utf-8 filenames' '
        ) &&
 
        (
        ) &&
 
        (

-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&

        cd gitrepo &&
 
        echo test >> "ærø" &&
        cd gitrepo &&
 
        echo test >> "ærø" &&


@@ -268,7 +268,7 @@ test_expect_success 'pushing a merge' '
        bzr commit -m one
        ) &&
 
        bzr commit -m one
        ) &&
 

-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&

 
        (
        cd bzrrepo &&
 
        (
        cd bzrrepo &&


@@ -319,7 +319,7 @@ test_expect_success 'proper bzr repo' '
        ) &&
 
        (
        ) &&
 
        (

-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&

        cd gitrepo &&
        git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
        ) &&
        cd gitrepo &&
        git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
        ) &&


@@ -342,7 +342,7 @@ test_expect_success 'strip' '
        bzr commit -m two
        ) &&
 
        bzr commit -m two
        ) &&
 

-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&

 
        (
        cd bzrrepo &&
 
        (
        cd bzrrepo &&

diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
index 676b1ab47820b29f6596429de0616bfb305f6c9c..1aadf35eb22ded0a78d6f99d9c61deb1f401ba33 100755 (executable)
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh
@@ -22,7 +22,7 @@ fi
 
 # clone to a git repo
 git_clone () {
 
 # clone to a git repo
 git_clone () {

-       git clone -q "hg::$PWD/$1" $2
+       git clone -q "hg::$1" $2

 }
 
 # clone to an hg repo
 }
 
 # clone to an hg repo


@@ -31,7 +31,7 @@ hg_clone () {
        hg init $2 &&
        hg -R $2 bookmark -i master &&
        cd $1 &&
        hg init $2 &&
        hg -R $2 bookmark -i master &&
        cd $1 &&

-       git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
+       git push -q "hg::../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'

        ) &&
 
        (cd $2 && hg -q update)
        ) &&
 
        (cd $2 && hg -q update)


@@ -43,7 +43,7 @@ hg_push () {
        cd $2
        old=$(git symbolic-ref --short HEAD)
        git checkout -q -b tmp &&
        cd $2
        old=$(git symbolic-ref --short HEAD)
        git checkout -q -b tmp &&

-       git fetch -q "hg::$PWD/../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
+       git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&

        git checkout -q $old &&
        git branch -q -D tmp 2> /dev/null || true
        )
        git checkout -q $old &&
        git branch -q -D tmp 2> /dev/null || true
        )

diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh
index 041041ddb14cc40ab8f4dd50521afb47affcccc5..c2e7316385e05c74a804699a1a1a3f996943e252 100755 (executable)
--- a/contrib/remote-helpers/test-hg-hg-git.sh
+++ b/contrib/remote-helpers/test-hg-hg-git.sh
@@ -27,7 +27,7 @@ fi
 
 # clone to a git repo with git
 git_clone_git () {
 
 # clone to a git repo with git
 git_clone_git () {

-       git clone -q "hg::$PWD/$1" $2
+       git clone -q "hg::$1" $2

 }
 
 # clone to an hg repo with git
 }
 
 # clone to an hg repo with git


@@ -36,7 +36,7 @@ hg_clone_git () {
        hg init $2 &&
        hg -R $2 bookmark -i master &&
        cd $1 &&
        hg init $2 &&
        hg -R $2 bookmark -i master &&
        cd $1 &&

-       git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
+       git push -q "hg::../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'

        ) &&
 
        (cd $2 && hg -q update)
        ) &&
 
        (cd $2 && hg -q update)


@@ -63,7 +63,7 @@ hg_push_git () {
        cd $2
        old=$(git symbolic-ref --short HEAD)
        git checkout -q -b tmp &&
        cd $2
        old=$(git symbolic-ref --short HEAD)
        git checkout -q -b tmp &&

-       git fetch -q "hg::$PWD/../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
+       git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&

        git checkout -q $old &&
        git branch -q -D tmp 2> /dev/null || true
        )
        git checkout -q $old &&
        git branch -q -D tmp 2> /dev/null || true
        )

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index f986db0ff009b88d6d3f06d32f6216e42958c96c..c54adb6fee27c1c7be0ea764f7cb73309adfbc30 100755 (executable)
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -53,7 +53,7 @@ test_expect_success 'cloning' '
        hg commit -m zero
        ) &&
 
        hg commit -m zero
        ) &&
 

-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&

        check gitrepo zero master
 '
 
        check gitrepo zero master
 '
 


@@ -67,12 +67,12 @@ test_expect_success 'cloning with branches' '
        hg commit -m next
        ) &&
 
        hg commit -m next
        ) &&
 

-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&

        check gitrepo next next &&
 
        (cd hgrepo && hg checkout default) &&
 
        check gitrepo next next &&
 
        (cd hgrepo && hg checkout default) &&
 

-       git clone "hg::$PWD/hgrepo" gitrepo2 &&
+       git clone "hg::hgrepo" gitrepo2 &&

        check gitrepo2 zero master
 '
 
        check gitrepo2 zero master
 '
 


@@ -86,7 +86,7 @@ test_expect_success 'cloning with bookmarks' '
        hg commit -m feature-a
        ) &&
 
        hg commit -m feature-a
        ) &&
 

-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&

        check gitrepo feature-a feature-a
 '
 
        check gitrepo feature-a feature-a
 '
 


@@ -98,7 +98,7 @@ test_expect_success 'cloning with detached head' '
        hg update -r 0
        ) &&
 
        hg update -r 0
        ) &&
 

-       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git clone "hg::hgrepo" gitrepo &&

        check gitrepo zero master
 '
 
        check gitrepo zero master
 '
 


@@ -111,7 +111,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 &&
        cd gitrepo &&
        git checkout --quiet devel &&
        echo devel > content &&


@@ -155,7 +155,7 @@ test_expect_success 'authors' '
        author_test kappa "test@example.com" "Unknown <test@example.com>"
        ) &&
 
        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
        git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
 
        test_cmp expected actual