Mercurial > hg-git
view tests/test-hg-branch.t @ 512:4473b3c1f2da
tests: unify test-push
author | David M. Carr <david@carrclan.us> |
---|---|
date | Mon, 10 Sep 2012 00:27:45 -0400 |
parents | 140253b31ba9 |
children | bc7b18c2e5ef |
line wrap: on
line source
# 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 $TESTDIR))/hggit" >> $HGRCPATH $ echo 'hgext.graphlog =' >> $HGRCPATH $ echo 'hgext.bookmarks =' >> $HGRCPATH $ cat >> $HGRCPATH <<EOF > > [bookmarks] > track.current = True > EOF $ 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 TODO stop using this when we're 1.5 only $ filterhash="sed s/71414c4e3c6f/a31e374801c9/;s/698615204564/d93a72262a83/" $ filterhash="$filterhash;s/d93a72262a83/05aed681ccb3/" $ 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` > } $ hgcommit() > { > HGDATE="2007-01-01 00:00:$count +0000" > hg commit -d "$HGDATE" "$@" >/dev/null 2>/dev/null || echo "hg commit error" > count=`expr $count + 1` > } $ mkdir gitrepo $ cd gitrepo $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')" Initialized empty Git repository in gitrepo/.git/ $ echo alpha > alpha $ git add alpha $ commit -m "add alpha" $ git checkout -b not-master Switched to a new branch 'not-master' dulwich does not presently support local git repos, workaround $ cd .. $ git daemon --base-path="$(pwd)"\ > --listen=localhost\ > --export-all\ > --pid-file="$DAEMON_PIDS" \ > --detach --reuseaddr \ > --enable=receive-pack $ hg clone git://localhost/gitrepo hgrepo | grep -v '^updating' importing git objects into hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo $ hg co master 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg mv alpha beta $ hgcommit -m 'rename alpha to beta' $ hg push pushing to git://localhost/gitrepo exporting hg objects to git creating and sending data default::refs/heads/master => GIT:05c2bcbe $ hg branch gamma | grep -v 'permanent and global' marked working directory as branch gamma $ hgcommit -m 'started branch gamma' $ hg push pushing to git://localhost/gitrepo exporting hg objects to git creating and sending data default::refs/heads/master => GIT:296802ef $ hg log --graph | $filterhash | egrep -v ': *(not-master|master)' @ changeset: 2:05aed681ccb3 | branch: gamma | tag: default/master | tag: tip | user: test | date: Mon Jan 01 00:00:12 2007 +0000 | summary: started branch gamma | o changeset: 1:a31e374801c9 | user: test | date: Mon Jan 01 00:00:11 2007 +0000 | summary: rename alpha to beta | o changeset: 0:3442585be8a6 tag: default/not-master user: test <test@example.org> date: Mon Jan 01 00:00:10 2007 +0000 summary: add alpha $ cd .. $ hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating' importing git objects into hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo2 $ hg log --graph | $filterhash | egrep -v ': *(not-master|master)' o changeset: 2:05aed681ccb3 | branch: gamma | tag: default/master | tag: tip | user: test | date: Mon Jan 01 00:00:12 2007 +0000 | summary: started branch gamma | @ changeset: 1:a31e374801c9 | user: test | date: Mon Jan 01 00:00:11 2007 +0000 | summary: rename alpha to beta | o changeset: 0:3442585be8a6 tag: default/not-master user: test <test@example.org> date: Mon Jan 01 00:00:10 2007 +0000 summary: add alpha $ cd ..