view tests/test-octopus @ 252:3e0eb85a83a7

Merge test fixes.
author Augie Fackler <durin42@gmail.com>
date Fri, 25 Sep 2009 22:44:05 -0400
parents ea0728d8cdc2 ff2d4f541ae9
children 8b9fc1b1cc40
line wrap: on
line source

#!/bin/sh

# Fails for some reason, need to investigate
# "$TESTDIR/hghave" git || 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)))" >> $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 branch1 2>&1 | sed s/\'/\"/g
echo beta > beta
git add beta
commit -m 'add beta'

git checkout -b branch2 master 2>&1 | sed s/\'/\"/g
echo gamma > gamma
git add gamma
commit -m 'add gamma'

git checkout master 2>&1 | sed s/\'/\"/g
echo delta > delta
git add delta
commit -m 'add delta'

git merge branch1 branch2 | sed 's/\.{3}//'

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
cd hgrepo
hg log --graph

hg gclear
hg push git://localhost/gitrepo2

cd ../gitrepo2
git log | sed s/\\.\\.\\.//g

cd ..
kill `cat gitdaemon.pid`