Mercurial > hg-git

changeset 529:7edcbdd2ef2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
author David M. Carr <david@carrclan.us>
date Thu, 13 Sep 2012 20:49:45 -0400
parents e48a3f30b73c
children 1ec00e2805fb
files tests/test-conflict-1.t tests/test-conflict-2.t tests/test-convergedmerge.t tests/test-empty-working-tree.t tests/test-encoding.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-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-outgoing.t tests/test-pull-after-strip.t tests/test-pull.t tests/test-push.t tests/test-tree-decomposition.t
diffstat 22 files changed, 78 insertions(+), 281 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-conflict-1.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-conflict-1.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -57,24 +54,17 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo/
 
-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
 
   $ cd hgrepo1
   $ hg bookmark -r tip master
-  $ hg push -r master git://localhost/gitrepo
-  pushing to git://localhost/gitrepo
+  $ hg push -r master ../gitrepo
+  pushing to ../gitrepo
   exporting hg objects to git
   creating and sending data
   $ cd ..
 
-  $ hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
+  $ hg clone gitrepo hgrepo2 | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo2
--- a/tests/test-conflict-2.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-conflict-2.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -57,24 +54,17 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo/
 
-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
 
   $ cd hgrepo1
   $ hg bookmark -r tip master
-  $ hg push -r master git://localhost/gitrepo
-  pushing to git://localhost/gitrepo
+  $ hg push -r master ../gitrepo
+  pushing to ../gitrepo
   exporting hg objects to git
   creating and sending data
   $ cd ..
 
-  $ hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
+  $ hg clone gitrepo hgrepo2 | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo2
--- a/tests/test-convergedmerge.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-convergedmerge.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -58,24 +55,17 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo/
 
-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
 
   $ cd hgrepo1
   $ hg bookmark -r4 master
-  $ hg push -r master git://localhost/gitrepo
-  pushing to git://localhost/gitrepo
+  $ hg push -r master ../gitrepo
+  pushing to ../gitrepo
   exporting hg objects to git
   creating and sending data
   $ cd ..
 
-  $ hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
+  $ hg clone gitrepo hgrepo2 | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo2
--- a/tests/test-empty-working-tree.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-empty-working-tree.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
 
@@ -30,16 +27,8 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo2/
 
-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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo
@@ -48,8 +37,8 @@
 
   $ hg gclear
   clearing out the git cache data
-  $ hg push git://localhost/gitrepo2
-  pushing to git://localhost/gitrepo2
+  $ hg push ../gitrepo2
+  pushing to ../gitrepo2
   exporting hg objects to git
   creating and sending data
 
--- a/tests/test-encoding.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-encoding.t	Thu Sep 13 20:49:45 2012 -0400
@@ -6,9 +6,6 @@
 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
@@ -53,16 +50,8 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo2/
 
-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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo
@@ -130,8 +119,8 @@
 
   $ hg gclear
   clearing out the git cache data
-  $ hg push git://localhost/gitrepo2
-  pushing to git://localhost/gitrepo2
+  $ hg push ../gitrepo2
+  pushing to ../gitrepo2
   exporting hg objects to git
   creating and sending data
 
--- a/tests/test-file-removal.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-file-removal.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -58,16 +55,8 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo2/
 
-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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo
@@ -117,8 +106,8 @@
 
   $ hg gclear
   clearing out the git cache data
-  $ hg push git://localhost/gitrepo2
-  pushing to git://localhost/gitrepo2
+  $ hg push ../gitrepo2
+  pushing to ../gitrepo2
   exporting hg objects to git
   creating and sending data
 
--- a/tests/test-git-clone.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-git-clone.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
--- a/tests/test-git-submodules.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-git-submodules.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
--- a/tests/test-git-tags.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-git-tags.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -49,16 +46,8 @@
   $ commit -m 'add beta'
   $ tag -a -m 'added tag beta' 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 \
-  >  --enable=receive-pack
-
-  $ hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -81,7 +70,7 @@
   $ echo beta-fix >> beta
   $ hg commit -m 'fix for beta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:3b7fd1b3
--- a/tests/test-git-workflow.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-git-workflow.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
--- a/tests/test-hg-author.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-hg-author.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -44,16 +41,8 @@
   $ 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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -64,7 +53,7 @@
   $ hg add beta
   $ hgcommit -u "test" -m 'add beta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:cffa0e8d
@@ -72,7 +61,7 @@
   $ echo gamma >> beta
   $ hgcommit -u "test <test@example.com> (comment)" -m 'modify beta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:2b9ec6a4
@@ -81,7 +70,7 @@
   $ hg add gamma
   $ hgcommit -u "<test@example.com>" -m 'add gamma'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:fee30180
@@ -90,7 +79,7 @@
   $ hg add delta
   $ hgcommit -u "name<test@example.com>" -m 'add delta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:d1659250
@@ -99,7 +88,7 @@
   $ hg add epsilon
   $ hgcommit -u "name <test@example.com" -m 'add epsilon'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:ee985f12
@@ -108,7 +97,7 @@
   $ hg add zeta
   $ hgcommit -u " test " -m 'add zeta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:d21e26b4
@@ -117,7 +106,7 @@
   $ hg add eta
   $ hgcommit -u "test < test@example.com >" -m 'add eta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:8c878c97
@@ -126,7 +115,7 @@
   $ hg add theta
   $ hgcommit -u "test >test@example.com>" -m 'add theta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:1e03e913
@@ -182,7 +171,7 @@
   
 
   $ cd ..
-  $ hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
+  $ hg clone gitrepo hgrepo2 | grep -v '^updating'
   importing git objects into hg
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo2
--- a/tests/test-hg-branch.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-hg-branch.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -48,16 +45,8 @@
   $ 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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -67,7 +56,7 @@
   $ hg mv alpha beta
   $ hgcommit -m 'rename alpha to beta'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:05c2bcbe
@@ -76,7 +65,7 @@
   marked working directory as branch gamma
   $ hgcommit -m 'started branch gamma'
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/master => GIT:296802ef
@@ -103,7 +92,7 @@
   
 
   $ cd ..
-  $ hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
+  $ hg clone gitrepo hgrepo2 | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo2
--- a/tests/test-hg-tags.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-hg-tags.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -44,16 +41,8 @@
   $ 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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -62,7 +51,7 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hgtag alpha
   $ hg push
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/tags/alpha => GIT:7eeab2ea
@@ -92,7 +81,7 @@
   alpha
 
   $ cd ..
-  $ hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
+  $ hg clone gitrepo hgrepo2 | grep -v '^updating'
   importing git objects into hg
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo2
--- a/tests/test-incoming.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-incoming.t	Thu Sep 13 20:49:45 2012 -0400
@@ -8,9 +8,6 @@
   $ python -c 'from mercurial import util ; assert \
   >  util.version() != "unknown" and util.version() > "1.7"' || 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
@@ -46,22 +43,14 @@
   $ git add alpha
   $ commit -m "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 \
-  >  --enable=receive-pack
-
-  $ hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
+  $ hg clone 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 incoming | grep -v 'no changes found' | grep -v 'bookmark:'
-  comparing with git://localhost/gitrepo
+  comparing with $TESTTMP/gitrepo
 
   $ cd ../gitrepo
   $ echo beta > beta
@@ -70,7 +59,7 @@
 
   $ cd ../hgrepo
   $ hg incoming | grep -v 'no changes found' | grep -v 'bookmark:'
-  comparing with git://localhost/gitrepo
+  comparing with $TESTTMP/gitrepo
   changeset:   1:9497a4ee62e1
   user:        test <test@example.org>
   date:        Mon Jan 01 00:00:11 2007 +0000
@@ -92,7 +81,7 @@
 
   $ cd ../hgrepo
   $ hg incoming -p | grep -v 'no changes found' | grep -v 'bookmark:'
-  comparing with git://localhost/gitrepo
+  comparing with $TESTTMP/gitrepo
   changeset:   1:9497a4ee62e1
   user:        test <test@example.org>
   date:        Mon Jan 01 00:00:11 2007 +0000
@@ -133,14 +122,14 @@
   $ echo % incoming -r
   % incoming -r
   $ hg incoming -r master | grep -v 'no changes found' | grep -v 'bookmark:'
-  comparing with git://localhost/gitrepo
+  comparing with $TESTTMP/gitrepo
   changeset:   1:9497a4ee62e1
   user:        test <test@example.org>
   date:        Mon Jan 01 00:00:11 2007 +0000
   summary:     add beta
   
   $ hg incoming -r b1 | grep -v 'no changes found' | grep -v 'bookmark:'
-  comparing with git://localhost/gitrepo
+  comparing with $TESTTMP/gitrepo
   changeset:   1:9865e289be73
   tag:         t1
   user:        test <test@example.org>
@@ -153,7 +142,7 @@
   summary:     add d/gamma line 2
   
   $ hg incoming -r t1 | grep -v 'no changes found' | grep -v 'bookmark:'
-  comparing with git://localhost/gitrepo
+  comparing with $TESTTMP/gitrepo
   changeset:   1:9865e289be73
   tag:         t1
   user:        test <test@example.org>
@@ -164,11 +153,11 @@
   $ echo % nothing incoming after pull
   % nothing incoming after pull
   $ hg pull
-  pulling from git://localhost/gitrepo
+  pulling from $TESTTMP/gitrepo
   importing git objects into hg
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg incoming | grep -v 'no changes found' | grep -v 'bookmark:'
-  comparing with git://localhost/gitrepo
+  comparing with $TESTTMP/gitrepo
 
   $ echo 'done'
   done
--- a/tests/test-keywords.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-keywords.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
 
--- a/tests/test-merge.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-merge.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -60,16 +57,8 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo2/
 
-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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo
@@ -78,8 +67,8 @@
   % clear the cache to be sure it is regenerated correctly
   $ hg gclear
   clearing out the git cache data
-  $ hg push git://localhost/gitrepo2
-  pushing to git://localhost/gitrepo2
+  $ hg push ../gitrepo2
+  pushing to ../gitrepo2
   exporting hg objects to git
   creating and sending data
 
--- a/tests/test-octopus.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-octopus.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -70,16 +67,8 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo2/
 
-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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo
@@ -105,8 +94,8 @@
 
   $ hg gclear
   clearing out the git cache data
-  $ hg push git://localhost/gitrepo2
-  pushing to git://localhost/gitrepo2
+  $ hg push ../gitrepo2
+  pushing to ../gitrepo2
   exporting hg objects to git
   creating and sending data
 
--- a/tests/test-outgoing.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-outgoing.t	Thu Sep 13 20:49:45 2012 -0400
@@ -1,9 +1,6 @@
 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
@@ -39,16 +36,8 @@
   $ git add alpha
   $ commit -m "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 \
-  >  --enable=receive-pack
-
-  $ hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -65,7 +54,7 @@
   $ hg book -r 1 beta
 
   $ hg outgoing | sed 's/bookmark:    /tag:         /' | grep -v 'searching for changes'
-  comparing with git://localhost/gitrepo
+  comparing with */gitrepo (glob)
   exporting hg objects to git
   changeset:   1:0564f526fb0f
   tag:         beta
@@ -81,7 +70,7 @@
   summary:     add gamma
   
   $ hg outgoing -r beta | sed 's/bookmark:    /tag:         /' | grep -v 'searching for changes'
-  comparing with git://localhost/gitrepo
+  comparing with */gitrepo (glob)
   changeset:   1:0564f526fb0f
   tag:         beta
   user:        test
@@ -89,7 +78,7 @@
   summary:     add beta
   
   $ hg outgoing -r master | sed 's/bookmark:    /tag:         /' | grep -v 'searching for changes'
-  comparing with git://localhost/gitrepo
+  comparing with */gitrepo (glob)
   changeset:   1:0564f526fb0f
   tag:         beta
   user:        test
@@ -122,17 +111,17 @@
   $ echo % this will fail # maybe we should try to make it work
   % this will fail
   $ hg outgoing
-  comparing with git://localhost/gitrepo
+  comparing with */gitrepo (glob)
   abort: refs/heads/master changed on the server, please pull and merge before pushing
   [255]
   $ echo % let\'s pull and try again
   % let's pull and try again
   $ hg pull
-  pulling from git://localhost/gitrepo
+  pulling from */gitrepo (glob)
   importing git objects into hg
   (run 'hg update' to get a working copy)
   $ hg outgoing | sed 's/bookmark:    /tag:         /' | grep -v 'searching for changes'
-  comparing with git://localhost/gitrepo
+  comparing with */gitrepo (glob)
   changeset:   1:0564f526fb0f
   tag:         beta
   user:        test
@@ -146,7 +135,7 @@
   summary:     add gamma
   
   $ hg outgoing -r beta | sed 's/bookmark:    /tag:         /' | grep -v 'searching for changes'
-  comparing with git://localhost/gitrepo
+  comparing with */gitrepo (glob)
   changeset:   1:0564f526fb0f
   tag:         beta
   user:        test
@@ -154,7 +143,7 @@
   summary:     add beta
   
   $ hg outgoing -r master | sed 's/bookmark:    /tag:         /' | grep -v 'searching for changes'
-  comparing with git://localhost/gitrepo
+  comparing with */gitrepo (glob)
   changeset:   1:0564f526fb0f
   tag:         beta
   user:        test
--- a/tests/test-pull-after-strip.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-pull-after-strip.t	Thu Sep 13 20:49:45 2012 -0400
@@ -15,9 +15,6 @@
 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
-
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
@@ -59,15 +56,9 @@
 
 
   $ cd ..
-  $ git daemon --base-path="$(pwd)"\
-  >  --listen=localhost\
-  >  --export-all\
-  >  --pid-file="$DAEMON_PIDS" \
-  >  --detach --reuseaddr
-
   $ echo % clone a tag
   % clone a tag
-  $ hg clone -r alpha git://localhost/gitrepo hgrepo-a | grep -v '^updating'
+  $ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo-a
@@ -84,7 +75,7 @@
   $ cd ..
   $ echo % clone a branch
   % clone a branch
-  $ hg clone -r beta git://localhost/gitrepo hgrepo-b | grep -v '^updating'
+  $ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating'
   importing git objects into hg
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo-b
@@ -115,7 +106,7 @@
   $ hg strip tip 2>&1 | grep -v saving | grep -v backup
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg pull -r beta
-  pulling from git://localhost/gitrepo
+  pulling from $TESTTMP/gitrepo
   importing git objects into hg
   abort: you appear to have run strip - please run hg git-cleanup
   [255]
@@ -124,7 +115,7 @@
   $ echo % pull works after \'hg git-cleanup\'
   % pull works after 'hg git-cleanup'
   $ hg pull -r beta
-  pulling from git://localhost/gitrepo
+  pulling from $TESTTMP/gitrepo
   importing git objects into hg
   (run 'hg update' to get a working copy)
   $ hg log --graph | egrep -v ': *(beta|master)'
--- a/tests/test-pull.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-pull.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -45,15 +42,9 @@
 
 
   $ cd ..
-  $ git daemon --base-path="$(pwd)"\
-  >  --listen=localhost\
-  >  --export-all\
-  >  --pid-file="$DAEMON_PIDS" \
-  >  --detach --reuseaddr
-
   $ echo % clone a tag
   % clone a tag
-  $ hg clone -r alpha git://localhost/gitrepo hgrepo-a | grep -v '^updating'
+  $ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo-a
@@ -70,7 +61,7 @@
   $ cd ..
   $ echo % clone a branch
   % clone a branch
-  $ hg clone -r beta git://localhost/gitrepo hgrepo-b | grep -v '^updating'
+  $ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating'
   importing git objects into hg
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo-b
--- a/tests/test-push.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-push.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
@@ -44,16 +41,8 @@
   $ git checkout -b not-master 2>&1 | sed s/\'/\"/g
   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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -69,7 +58,7 @@
 
   $ hg book -r 1 beta
   $ hg push -r beta
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   exporting hg objects to git
   creating and sending data
       default::refs/heads/beta => GIT:cffa0e8d
@@ -100,7 +89,7 @@
   $ echo % this should fail
   % this should fail
   $ hg push -r master
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   creating and sending data
   abort: refs/heads/master changed on the server, please pull and merge before pushing
   [255]
@@ -108,13 +97,13 @@
   $ echo % ... even with -f
   % ... even with -f
   $ hg push -fr master
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   creating and sending data
   abort: refs/heads/master changed on the server, please pull and merge before pushing
   [255]
 
   $ hg pull
-  pulling from git://localhost/gitrepo
+  pulling from $TESTTMP/gitrepo
   importing git objects into hg
   (run 'hg update' to get a working copy)
 TODO shouldn't need to do this since we're (in theory) pushing master explicitly,
@@ -141,7 +130,7 @@
   $ echo % this should also fail
   % this should also fail
   $ hg push -r master
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   creating and sending data
   abort: pushing refs/heads/master overwrites 72f56395749d
   [255]
@@ -149,7 +138,7 @@
   $ echo % ... but succeed with -f
   % ... but succeed with -f
   $ hg push -fr master
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   creating and sending data
       default::refs/heads/master => GIT:cc119202
 
@@ -158,7 +147,7 @@
 The exit code for this was broken in Mercurial (incorrectly returning 0) until
 issue3228 was fixed in 2.1
   $ hg push -r master && false
-  pushing to git://localhost/gitrepo
+  pushing to $TESTTMP/gitrepo
   creating and sending data
   no changes found
   [1]
--- a/tests/test-tree-decomposition.t	Thu Sep 13 20:49:42 2012 -0400
+++ b/tests/test-tree-decomposition.t	Thu Sep 13 20:49:45 2012 -0400
@@ -4,9 +4,6 @@
 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
 
@@ -53,16 +50,8 @@
   $ git init --bare
   Initialized empty Git repository in $TESTTMP/gitrepo2/
 
-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'
+  $ hg clone gitrepo hgrepo | grep -v '^updating'
   importing git objects into hg
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hgrepo
@@ -76,8 +65,8 @@
 
   $ hg gclear
   clearing out the git cache data
-  $ hg push git://localhost/gitrepo2
-  pushing to git://localhost/gitrepo2
+  $ hg push ../gitrepo2
+  pushing to ../gitrepo2
   exporting hg objects to git
   creating and sending data