Mercurial > hg > hg-git

changeset 514:35c61d98e5da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-sane-without-bookmarks
author David M. Carr <david@carrclan.us>
date Mon, 10 Sep 2012 00:27:57 -0400
parents d298abb841ac
children 69fac0c00830
files tests/test-conflict-1.t tests/test-conflict-2.t tests/test-convergedmerge.t tests/test-empty-working-tree.t tests/test-file-removal.t tests/test-git-clone.t tests/test-git-submodules.t tests/test-git-tags.t tests/test-git-workflow.t tests/test-help.t tests/test-hg-author.t tests/test-hg-branch.t tests/test-hg-tags.t tests/test-incoming.t tests/test-keywords.t tests/test-merge.t tests/test-octopus.t tests/test-pull-after-strip.t tests/test-pull.t tests/test-push-r.t tests/test-push.t tests/test-sane-without-bookmarks tests/test-sane-without-bookmarks.out tests/test-sane-without-bookmarks.t
diffstat 2 files changed, 64 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
deleted file mode 100644
--- a/tests/test-sane-without-bookmarks.out
+++ /dev/null
@@ -1,17 +0,0 @@
-Initialized empty Git repository in gitrepo/.git/
-
-creating bookmarks failed, do you have bookmarks enabled?
-importing git objects into hg
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-@  changeset:   1:7bcd915dc873
-|  tag:         default/master
-|  tag:         tip
-|  user:        test <test@example.org>
-|  date:        Mon Jan 01 00:00:11 2007 +0000
-|  summary:     add beta
-|
-o  changeset:   0:3442585be8a6
-   user:        test <test@example.org>
-   date:        Mon Jan 01 00:00:10 2007 +0000
-   summary:     add alpha
-
rename from tests/test-sane-without-bookmarks
rename to tests/test-sane-without-bookmarks.t
--- a/tests/test-sane-without-bookmarks
+++ b/tests/test-sane-without-bookmarks.t
@@ -1,57 +1,72 @@
-#!/bin/sh
+# Fails for some reason, need to investigate
+#   $ "$TESTDIR/hghave" git || exit 80
 
-# 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 if the user does not have dulwich
-python -c 'import dulwich, dulwich.repo' || exit 80
+bail if hgext.bookmarks does not exist, which means hg >= 1.8
+  $ python -c 'import hgext.bookmarks' || exit 80
 
-# bail if hgext.bookmarks does not exist, which means hg >= 1.8
-python -c 'import hgext.bookmarks' || 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
 
-# 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
+  $ 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
 
-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`
+  > }
 
-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))/', '')"
+  Initialized empty Git repository in gitrepo/.git/
+  
+  $ echo alpha > alpha
+  $ git add alpha
+  $ commit -m 'add alpha'
+  $ echo beta > beta
+  $ git add beta
+  $ commit -m 'add beta'
+
+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
 
-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'
-echo beta > beta
-git add beta
-commit -m 'add beta'
+  $ hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
+  creating bookmarks failed, do you have bookmarks enabled?
+  importing git objects into hg
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd hgrepo
+  $ hg log --graph | grep -v ': *master'
+  @  changeset:   1:7bcd915dc873
+  |  tag:         default/master
+  |  tag:         tip
+  |  user:        test <test@example.org>
+  |  date:        Mon Jan 01 00:00:11 2007 +0000
+  |  summary:     add beta
+  |
+  o  changeset:   0:3442585be8a6
+     user:        test <test@example.org>
+     date:        Mon Jan 01 00:00:10 2007 +0000
+     summary:     add alpha
+  
 
-# 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
-
-hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
-cd hgrepo
-hg log --graph | grep -v ': *master'
-
-cd ..
+  $ cd ..