2010-03-29 18:48:29 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2010 Sverre Rabbelier
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test remote-helper import and export commands'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
if ! test_have_prereq PYTHON ; then
|
|
|
|
skip_all='skipping git-remote-hg tests, python not available'
|
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
|
|
|
"$PYTHON_PATH" -c '
|
2010-06-02 02:13:40 +02:00
|
|
|
import sys
|
2010-06-10 02:24:54 +02:00
|
|
|
if sys.hexversion < 0x02040000:
|
2010-06-02 02:13:40 +02:00
|
|
|
sys.exit(1)
|
2011-07-16 15:03:23 +02:00
|
|
|
' || {
|
|
|
|
skip_all='skipping git-remote-hg tests, python version < 2.4'
|
|
|
|
test_done
|
|
|
|
}
|
2010-04-12 16:24:28 +02:00
|
|
|
|
2011-07-16 15:03:22 +02:00
|
|
|
compare_refs() {
|
|
|
|
git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
|
|
|
|
git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'setup repository' '
|
2010-03-29 18:48:29 +02:00
|
|
|
git init --bare server/.git &&
|
|
|
|
git clone server public &&
|
|
|
|
(cd public &&
|
|
|
|
echo content >file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -m one &&
|
|
|
|
git push origin master)
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'cloning from local repo' '
|
2010-03-29 18:48:29 +02:00
|
|
|
git clone "testgit::${PWD}/server" localclone &&
|
|
|
|
test_cmp public/file localclone/file
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'cloning from remote repo' '
|
2010-03-29 18:48:29 +02:00
|
|
|
git clone "testgit::file://${PWD}/server" clone &&
|
|
|
|
test_cmp public/file clone/file
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'create new commit on remote' '
|
2010-03-29 18:48:29 +02:00
|
|
|
(cd public &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m two &&
|
|
|
|
git push)
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'pulling from local repo' '
|
2010-03-29 18:48:29 +02:00
|
|
|
(cd localclone && git pull) &&
|
|
|
|
test_cmp public/file localclone/file
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'pulling from remote remote' '
|
2010-03-29 18:48:29 +02:00
|
|
|
(cd clone && git pull) &&
|
|
|
|
test_cmp public/file clone/file
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'pushing to local repo' '
|
2010-03-29 18:48:29 +02:00
|
|
|
(cd localclone &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m three &&
|
|
|
|
git push) &&
|
2011-07-16 15:03:22 +02:00
|
|
|
compare_refs localclone HEAD server HEAD
|
2010-03-29 18:48:29 +02:00
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'synch with changes from localclone' '
|
2010-03-29 18:48:29 +02:00
|
|
|
(cd clone &&
|
|
|
|
git pull)
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:23 +02:00
|
|
|
test_expect_success 'pushing remote local repo' '
|
2010-03-29 18:48:29 +02:00
|
|
|
(cd clone &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m four &&
|
|
|
|
git push) &&
|
2011-07-16 15:03:22 +02:00
|
|
|
compare_refs clone HEAD server HEAD
|
2010-03-29 18:48:29 +02:00
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:25 +02:00
|
|
|
test_expect_success 'fetch new branch' '
|
2011-07-16 15:03:24 +02:00
|
|
|
(cd public &&
|
|
|
|
git checkout -b new &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m five &&
|
|
|
|
git push origin new
|
|
|
|
) &&
|
|
|
|
(cd localclone &&
|
|
|
|
git fetch origin new
|
|
|
|
) &&
|
|
|
|
compare_refs public HEAD localclone FETCH_HEAD
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:38 +02:00
|
|
|
test_expect_success 'fetch multiple branches' '
|
2011-07-16 15:03:24 +02:00
|
|
|
(cd localclone &&
|
|
|
|
git fetch
|
|
|
|
) &&
|
|
|
|
compare_refs server master localclone refs/remotes/origin/master &&
|
|
|
|
compare_refs server new localclone refs/remotes/origin/new
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:26 +02:00
|
|
|
test_expect_success 'push when remote has extra refs' '
|
2011-07-16 15:03:24 +02:00
|
|
|
(cd clone &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m six &&
|
|
|
|
git push
|
|
|
|
) &&
|
|
|
|
compare_refs clone master server master
|
|
|
|
'
|
|
|
|
|
2011-07-16 15:03:27 +02:00
|
|
|
test_expect_success 'push new branch by name' '
|
2011-07-16 15:03:24 +02:00
|
|
|
(cd clone &&
|
|
|
|
git checkout -b new-name &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m seven &&
|
|
|
|
git push origin new-name
|
|
|
|
) &&
|
|
|
|
compare_refs clone HEAD server refs/heads/new-name
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_failure 'push new branch with old:new refspec' '
|
|
|
|
(cd clone &&
|
|
|
|
git push origin new-name:new-refspec
|
|
|
|
) &&
|
|
|
|
compare_refs clone HEAD server refs/heads/new-refspec
|
|
|
|
'
|
|
|
|
|
2010-03-29 18:48:29 +02:00
|
|
|
test_done
|