sapling/tests/test-merge
2009-12-26 13:31:24 -06:00

82 lines
2.1 KiB
Bash
Executable File

#!/bin/sh
# Fails for some reason, need to investigate
# "$TESTDIR/hghave" git || exit 80
# bail if the user does not have dulwich
python -c 'import dulwich, dulwich.repo' || exit 80
# bail early if the user is already running git-daemon
echo hi | nc localhost 9418 2>/dev/null && exit 80
echo "[extensions]" >> $HGRCPATH
echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH
echo 'hgext.graphlog =' >> $HGRCPATH
echo 'hgext.bookmarks =' >> $HGRCPATH
GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
count=10
commit()
{
GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
count=`expr $count + 1`
}
mkdir gitrepo
cd gitrepo
git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
echo alpha > alpha
git add alpha
commit -m 'add alpha'
git checkout -b beta 2>&1 | sed s/\'/\"/g
echo beta > beta
git add beta
commit -m 'add beta'
git checkout master 2>&1 | sed s/\'/\"/g
echo gamma > gamma
git add gamma
commit -m 'add gamma'
# clean merge
git merge beta
cd ..
mkdir gitrepo2
cd gitrepo2
git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
# dulwich does not presently support local git repos, workaround
cd ..
git daemon --base-path="$(pwd)"\
--listen=localhost\
--export-all \
--pid-file=gitdaemon.pid \
--detach --reuseaddr \
--enable=receive-pack
hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
cd hgrepo
echo % clear the cache to be sure it is regenerated correctly
hg gclear
hg push git://localhost/gitrepo2
cd ..
cd gitrepo2
echo % git log in repo pushed from hg
git log master | sed 's/\.\.\.//g'
git log beta | sed 's/\.\.\.//g'
cd ..
kill `cat gitdaemon.pid`