Skip to content
Snippets Groups Projects
Commit 878ae1d1bd73 authored by David M. Carr's avatar David M. Carr
Browse files

tests: remove use of git-daemon in test-subrepos

This change was already applied to all the other tests.
parent 336c031a0484
No related branches found
No related tags found
No related merge requests found
...@@ -63,13 +63,5 @@ ...@@ -63,13 +63,5 @@
$ cd .. $ cd ..
$ echo $ echo
$ git daemon --base-path="$(pwd)"\
> --listen=localhost\
> --export-all\
> --pid-file="$DAEMON_PIDS" \
> --detach --reuseaddr \
> --enable=receive-pack
$ echo % Ensure gitlinks are transformed to .hgsubstate on hg pull from git $ echo % Ensure gitlinks are transformed to .hgsubstate on hg pull from git
% Ensure gitlinks are transformed to .hgsubstate on hg pull from git % Ensure gitlinks are transformed to .hgsubstate on hg pull from git
...@@ -74,5 +66,5 @@ ...@@ -74,5 +66,5 @@
$ echo % Ensure gitlinks are transformed to .hgsubstate on hg pull from git $ echo % Ensure gitlinks are transformed to .hgsubstate on hg pull from git
% Ensure gitlinks are transformed to .hgsubstate on hg pull from git % Ensure gitlinks are transformed to .hgsubstate on hg pull from git
$ hg clone git://localhost/gitrepo1 hgrepo $ hg clone gitrepo1 hgrepo
importing git objects into hg importing git objects into hg
updating to branch default updating to branch default
...@@ -77,7 +69,7 @@ ...@@ -77,7 +69,7 @@
importing git objects into hg importing git objects into hg
updating to branch default updating to branch default
cloning subrepo subrepo1 from git://localhost/gitsubrepo cloning subrepo subrepo1 from $TESTTMP/gitsubrepo
cloning subrepo xyz/subrepo2 from git://localhost/gitsubrepo cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hgrepo $ cd hgrepo
$ hg bookmarks -f -r default master $ hg bookmarks -f -r default master
...@@ -111,7 +103,7 @@ ...@@ -111,7 +103,7 @@
$ cd hgrepo $ cd hgrepo
$ cd xyz/subrepo2 $ cd xyz/subrepo2
$ git pull | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' $ git pull | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /'
From git://localhost/gitsubrepo From $TESTTMP/gitsubrepo
56f0304..aabf7cd master -> origin/master 56f0304..aabf7cd master -> origin/master
Updating 56f0304..aabf7cd Updating 56f0304..aabf7cd
Fast-forward Fast-forward
...@@ -122,7 +114,7 @@ ...@@ -122,7 +114,7 @@
$ echo xxx >> alpha $ echo xxx >> alpha
$ hg commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true $ hg commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true
$ hg push $ hg push
pushing to git://localhost/gitrepo1 pushing to $TESTTMP/gitrepo1
exporting hg objects to git exporting hg objects to git
creating and sending data creating and sending data
default::refs/heads/master => GIT:4663c492 default::refs/heads/master => GIT:4663c492
...@@ -155,7 +147,7 @@ ...@@ -155,7 +147,7 @@
$ gitcommit -m "Test3. Prepare .hgsub and .hgsubstate sources" $ gitcommit -m "Test3. Prepare .hgsub and .hgsubstate sources"
$ cd ../hgrepo $ cd ../hgrepo
$ hg pull $ hg pull
pulling from git://localhost/gitrepo1 pulling from $TESTTMP/gitrepo1
importing git objects into hg importing git objects into hg
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg checkout -C | sed "s_$(dirname $(pwd))_TEMPLOCATION_" $ hg checkout -C | sed "s_$(dirname $(pwd))_TEMPLOCATION_"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment