# HG changeset patch # User Abderrahim Kitouni # Date 1245175083 -3600 # Node ID 1224d118ac92faa3dcca0a60d94167a45d0dcc60 # Parent 7bf98d3085f4f8e019f359a33d4ae3a37f4bf082 Update tests diff --git a/tests/test-empty-working-tree b/tests/test-empty-working-tree --- a/tests/test-empty-working-tree +++ b/tests/test-empty-working-tree @@ -4,7 +4,7 @@ # "$TESTDIR/hghave" git || exit 80 # bail early if the user is already running git-daemon -echo hi | nc localhost 9418 && exit 80 +echo hi | nc localhost 9418 2> /dev/null && exit 80 echo "[extensions]" >> $HGRCPATH echo "hggit=$(echo $(dirname $(dirname $0)))" >> $HGRCPATH @@ -31,7 +31,7 @@ --pid-file=gitdaemon.pid \ --detach --reuseaddr -hg gclone git://localhost/gitrepo hgrepo +hg clone git://localhost/gitrepo hgrepo cd hgrepo hg log -r tip --template 'files: {files}\n' diff --git a/tests/test-empty-working-tree.out b/tests/test-empty-working-tree.out --- a/tests/test-empty-working-tree.out +++ b/tests/test-empty-working-tree.out @@ -1,14 +1,15 @@ Initialized empty Git repository in gitrepo/.git/ -[master (root-commit) 6782568] empty -fetching from : origin -exporting git objects +Created initial commit 6782568: empty +fetching from : git://localhost/gitrepo +importing Hg objects into Git Counting objects: 2, done. Total 2 (delta 0), reused 0 (delta 0) importing Git objects into Hg +at: 0/1 +updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved files: clearing out the git cache data -exporting git objects +importing Hg objects into Git at: 0/1 -converting revision 0 diff --git a/tests/test-file-removal b/tests/test-file-removal --- a/tests/test-file-removal +++ b/tests/test-file-removal @@ -55,7 +55,7 @@ --pid-file=gitdaemon.pid \ --detach --reuseaddr -hg gclone git://localhost/gitrepo hgrepo +hg clone git://localhost/gitrepo hgrepo cd hgrepo hg log --graph diff --git a/tests/test-file-removal.out b/tests/test-file-removal.out --- a/tests/test-file-removal.out +++ b/tests/test-file-removal.out @@ -4,15 +4,18 @@ rm 'foo/bar' % final manifest in git is just beta beta -fetching from : origin -exporting git objects +fetching from : git://localhost/gitrepo +importing Hg objects into Git Counting objects: 14, done. Compressing objects: 12% (1/8) Compressing objects: 25% (2/8) Compressing objects: 37% (3/8) Compressing objects: 50% (4/8) Compressing objects: 62% (5/8) Compressing objects: 75% (6/8) Compressing objects: 87% (7/8) Compressing objects: 100% (8/8) Compressing objects: 100% (8/8), done. Total 14 (delta 1), reused 0 (delta 0) importing Git objects into Hg +at: 0/5 +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @ changeset: 4:ea41a3f0ed10 -| tag: origin/master +| tag: master +| tag: default/master | tag: tip | user: test | date: Mon Jan 01 00:00:14 2007 +0000 diff --git a/tests/test-git-clone b/tests/test-git-clone --- a/tests/test-git-clone +++ b/tests/test-git-clone @@ -45,7 +45,7 @@ --pid-file=gitdaemon.pid \ --detach --reuseaddr -hg gclone git://localhost/gitrepo hgrepo +hg clone git://localhost/gitrepo hgrepo cd hgrepo hg log --graph diff --git a/tests/test-git-clone.out b/tests/test-git-clone.out --- a/tests/test-git-clone.out +++ b/tests/test-git-clone.out @@ -1,14 +1,17 @@ Initialized empty Git repository in gitrepo/.git/ -fetching from : origin -exporting git objects +fetching from : git://localhost/gitrepo +importing Hg objects into Git Counting objects: 6, done. Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressing objects: 100% (3/3) Compressing objects: 100% (3/3), done. Total 6 (delta 0), reused 0 (delta 0) importing Git objects into Hg +at: 0/2 +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @ changeset: 1:7bcd915dc873 -| tag: origin/master +| tag: master +| tag: default/master | tag: tip | user: test | date: Mon Jan 01 00:00:11 2007 +0000 @@ -20,4 +23,4 @@ summary: add alpha % we should have some bookmarks - * origin/master 1:7bcd915dc873 + * master 1:7bcd915dc873 diff --git a/tests/test-sane-without-bookmarks b/tests/test-sane-without-bookmarks --- a/tests/test-sane-without-bookmarks +++ b/tests/test-sane-without-bookmarks @@ -44,7 +44,7 @@ --pid-file=gitdaemon.pid \ --detach --reuseaddr -hg gclone git://localhost/gitrepo hgrepo +hg clone git://localhost/gitrepo hgrepo cd hgrepo hg log --graph diff --git a/tests/test-sane-without-bookmarks.out b/tests/test-sane-without-bookmarks.out --- a/tests/test-sane-without-bookmarks.out +++ b/tests/test-sane-without-bookmarks.out @@ -1,14 +1,17 @@ Initialized empty Git repository in gitrepo/.git/ -fetching from : origin -exporting git objects +fetching from : git://localhost/gitrepo +importing Hg objects into Git Counting objects: 6, done. Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressing objects: 100% (3/3) Compressing objects: 100% (3/3), done. Total 6 (delta 0), reused 0 (delta 0) importing Git objects into Hg +at: 0/2 creating bookmarks failed, do you have bookmarks enabled? +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @ changeset: 1:7bcd915dc873 +| tag: default/master | tag: tip | user: test | date: Mon Jan 01 00:00:11 2007 +0000 diff --git a/tests/test-tree-decomposition b/tests/test-tree-decomposition --- a/tests/test-tree-decomposition +++ b/tests/test-tree-decomposition @@ -4,7 +4,7 @@ # "$TESTDIR/hghave" git || exit 80 # bail early if the user is already running git-daemon -echo hi | nc localhost 9418 && exit 80 +echo hi | nc localhost 9418 2> /dev/null && exit 80 echo "[extensions]" >> $HGRCPATH echo "hggit=$(echo $(dirname $(dirname $0)))" >> $HGRCPATH @@ -47,7 +47,7 @@ --pid-file=gitdaemon.pid \ --detach --reuseaddr -hg gclone git://localhost/gitrepo hgrepo +hg clone git://localhost/gitrepo hgrepo cd hgrepo hg log -r tip --template 'adds: {file_adds}\ndels: {file_dels}\n' diff --git a/tests/test-tree-decomposition.out b/tests/test-tree-decomposition.out --- a/tests/test-tree-decomposition.out +++ b/tests/test-tree-decomposition.out @@ -1,18 +1,20 @@ Initialized empty Git repository in gitrepo/.git/ -[master (root-commit) 60fd61f] initial +Created initial commit 60fd61f: initial 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 d1/f1 create mode 100644 d1/f2 -[master a2e8665] rename +Created commit a2e8665: rename 1 files changed, 0 insertions(+), 0 deletions(-) rename {d1 => d2}/f2 (100%) -fetching from : origin -exporting git objects +fetching from : git://localhost/gitrepo +importing Hg objects into Git Counting objects: 8, done. Compressing objects: 25% (1/4) Compressing objects: 50% (2/4) Compressing objects: 75% (3/4) Compressing objects: 100% (4/4) Compressing objects: 100% (4/4), done. Total 8 (delta 0), reused 0 (delta 0) importing Git objects into Hg +at: 0/2 +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved adds: d2/f2 dels: d1/f2