mirror of
https://github.com/mnauw/git-remote-hg.git
synced 2025-11-12 06:05:39 +01:00
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>
This commit is contained in:
@@ -22,7 +22,7 @@ fi
|
|||||||
|
|
||||||
# clone to a git repo
|
# clone to a git repo
|
||||||
git_clone () {
|
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 init $2 &&
|
||||||
hg -R $2 bookmark -i master &&
|
hg -R $2 bookmark -i master &&
|
||||||
cd $1 &&
|
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
|
cd $2
|
||||||
old=$(git symbolic-ref --short HEAD)
|
old=$(git symbolic-ref --short HEAD)
|
||||||
git checkout -q -b tmp &&
|
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 checkout -q $old &&
|
||||||
git branch -q -D tmp 2> /dev/null || true
|
git branch -q -D tmp 2> /dev/null || true
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ fi
|
|||||||
|
|
||||||
# clone to a git repo with git
|
# clone to a git repo with git
|
||||||
git_clone_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 init $2 &&
|
||||||
hg -R $2 bookmark -i master &&
|
hg -R $2 bookmark -i master &&
|
||||||
cd $1 &&
|
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
|
cd $2
|
||||||
old=$(git symbolic-ref --short HEAD)
|
old=$(git symbolic-ref --short HEAD)
|
||||||
git checkout -q -b tmp &&
|
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 checkout -q $old &&
|
||||||
git branch -q -D tmp 2> /dev/null || true
|
git branch -q -D tmp 2> /dev/null || true
|
||||||
)
|
)
|
||||||
|
|||||||
14
test-hg.sh
14
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 &&
|
check gitrepo next next &&
|
||||||
|
|
||||||
(cd hgrepo && hg checkout default) &&
|
(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 &&
|
cd gitrepo &&
|
||||||
git checkout --quiet devel &&
|
git checkout --quiet devel &&
|
||||||
echo devel > content &&
|
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 &&
|
git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
|
||||||
|
|
||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
|
|||||||
Reference in New Issue
Block a user