Mercurial > hg > hg-git

changeset 498:ab8099aaa447

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-empty-working-tree
author David M. Carr <david@carrclan.us>
date Mon, 10 Sep 2012 00:26:43 -0400
parents 9f061212bcf2
children 4b64fc97ec7b
files tests/test-conflict-1.t tests/test-conflict-2.t tests/test-convergedmerge.t tests/test-empty-working-tree tests/test-empty-working-tree.out tests/test-empty-working-tree.t tests/test-help.t tests/test-keywords.t
diffstat 2 files changed, 61 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
deleted file mode 100644
--- a/tests/test-empty-working-tree.out
+++ /dev/null
@@ -1,16 +0,0 @@
-Initialized empty Git repository in gitrepo/.git/
-
-Initialized empty Git repository in gitrepo2/
-
-importing git objects into hg
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files: 
-clearing out the git cache data
-pushing to git://localhost/gitrepo2
-exporting hg objects to git
-creating and sending data
-commit 678256865a8c85ae925bf834369264193c88f8de
-Author: test <test@example.org>
-Date:   Mon Jan 1 00:00:00 2007 +0000
-
-    empty
rename from tests/test-empty-working-tree
rename to tests/test-empty-working-tree.t
--- a/tests/test-empty-working-tree
+++ b/tests/test-empty-working-tree.t
@@ -1,59 +1,73 @@
-#!/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 early if the user is already running git-daemon
+  $ ! (echo hi | nc localhost 9418 2>/dev/null) || 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.bookmarks =' >> $HGRCPATH
 
-echo "[extensions]" >> $HGRCPATH
-echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH
-echo 'hgext.bookmarks =' >> $HGRCPATH
-
-cat >> $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
+  > 
+  > [bookmarks]
+  > track.current = True
+  > 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
 
-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
+  $ mkdir gitrepo
+  $ cd gitrepo
+  $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+  Initialized empty Git repository in gitrepo/.git/
+  
+
+  $ git commit --allow-empty -m empty >/dev/null 2>/dev/null || echo "git commit error"
 
-mkdir gitrepo
-cd gitrepo
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+  $ cd ..
+  $ mkdir gitrepo2
+  $ cd gitrepo2
+  $ git init --bare | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+  Initialized empty Git repository in gitrepo2/
+  
 
-git commit --allow-empty -m empty >/dev/null 2>/dev/null || echo "git commit error"
-
-cd ..
-mkdir gitrepo2
-cd gitrepo2
-git init --bare | 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="$DAEMON_PIDS" \
+  >  --detach --reuseaddr \
+  >  --enable=receive-pack
 
-# 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
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd hgrepo
+  $ hg log -r tip --template 'files: {files}\n'
+  files: 
 
-hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
-cd hgrepo
-hg log -r tip --template 'files: {files}\n'
+  $ hg gclear
+  clearing out the git cache data
+  $ hg push git://localhost/gitrepo2
+  pushing to git://localhost/gitrepo2
+  exporting hg objects to git
+  creating and sending data
 
-hg gclear
-hg push git://localhost/gitrepo2
+  $ cd ../gitrepo2
+  $ git log --pretty=medium
+  commit 678256865a8c85ae925bf834369264193c88f8de
+  Author: test <test@example.org>
+  Date:   Mon Jan 1 00:00:00 2007 +0000
+  
+      empty
 
-cd ../gitrepo2
-git log --pretty=medium
-
-cd ..
+  $ cd ..